gentoo resync : 11.05.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-05-11 16:02:49 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-05-11 16:02:49 +0100
commit: 88ebe56470c37b02a044e1091cad6b2df0f3be8f (patch)
tree: d80b2d9337c01c4a0fe11a2ef9691fc3153ed6d3
parent: 4645b6f17f0da81e9fe84081fb126a37102ba153 (diff)
2929 files changed, 26353 insertions, 29507 deletions
diff --git a/Manifest b/Manifest
index ecc26f129ccb..9603922cd101 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29009 BLAKE2B f912409e16b31c0013998b5f80f97d6b24bb27bf47f8f1bddfa8f5e5964ade6657a37b3e269fd9e647e3108e963d8b4f8e5fa7c6faacb51f08f6b2c2e5b00fef SHA512 0fd1a4d6e3924298f7cc899393b25f33ffa7adf8255e5722edde3021d8644b9496f1e8c5c52ee146f04ea701776f329714876cc0be9f4e5f5cf4927d4791a9ae
-TIMESTAMP 2018-05-08T12:08:27Z
+MANIFEST Manifest.files.gz 28928 BLAKE2B c494741afe45f534560f8fefd8810218601b81e8be5dcdbb1c3a8c0f3f2e67fb79b7e840d6a7f9f601ccdc0cf1fde5957d2718f045669f3022ec3d783943c3e9 SHA512 5c2ca553b768395dfc626ba5bcaeed34f5522381e43a24c4bcca16eff1a3fe03197ccb1a445ecfb242911b5ec92d893fdb5cb7d4129b34095c74026a21a0f7a6
+TIMESTAMP 2018-05-11T14:08:27Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrxkztfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlr1o9tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAoFQ/+Je8IvjtqeWmz5MSsl8yU6xuHQSwrEZeKYULuc8vDeejKlPNS+AFxnbB1
-jV1G3vkSHlYYZIAtoqMshbXcz1/kkOwOA1zgGa0IcITW96ouBhbrBCJSmhkvkYvV
-5yznakwXh6jTpEVSbP3mJhJC8pFAh6OSY9KpnKWujeomQXmnyVlL1G8hacHtvCDb
-8Os5eSjIu4SoTJS0Rhj6FXBeWuClapphuJIPqfMyxfK7SBU9DEJyHWEAv68CRCPF
-fKeEAd6bFWO8GM464/WEAeUyeNkyUBGGKVeGpFFonp94oNgs1kxlN/eWGp82HAP+
-tPrNOpjY3mcFakl2uVV2tV8shrpdH1gbBjwF/ilFtMG5Q2Is0+GraOW4gLS2mkww
-4CugcnKaKEco+ItT+UdgCO2Sm1HwqEdzXl7dgLrl6EKcNAUrkyGnKvrXGhNVoa1U
-oh7KLQgSkacZWH4zEqL6kHpBTF5HZTbHedah4ivOmrbX4iZ3YFeDMGxjgs5rUwNH
-9F0XtlVFmgxSmi4ZbRXdB7INvNRSqUPu0/6YYLuUq87cSU6Tb00wYwkcrhbdWdZU
-JRrHZBy8LRHT2DxloM/keJEgR6svzPnlccbSRkrx4LofUp9NW3NmWo/WOHkyBhBl
-ECCEONfooJCO88pUJNCBfqH4jTxl1UoJcjSeAsjzDu6v2ccXx8c=
-=GhQ/
+klBB6g/8DgvCsCObnuk+E3Qajfab7lAF9nY+jSq25f4Qm/tcbPi+RGKC8pnReQZK
+lNGQuq0yqP3Oii4TtUu2q7KF9tEBTWvsHIXvB7smAYn3zIyBw4DzbTpUwqt8FmTq
+PYkyZkEwzLbzKFUe2/lSUwFeOilXoc7NOCGit+qDev7xKDTRt0bPCWO2OM8TKFQL
+B8+RB1hIvTcEyW1ztN90dFohtTLBZoixkiayGxv4FS5wFQNHIUXLByuSz1IYAUId
+wy4vwOA0wzovo1UNW4Xq4Stgkr3ymH/1cwbumP2BSEnfWnLpNjl+Lifa5F8c20j/
+1YtpCUvJKWvPrDo4wa5DYZOljb47bN4Xh7jaDKdCIzbKF8RR3XACqhUzptDm5NM/
+7V43YqgkUyClqo7RJe6ee2U9bT6kfHGhpB+/Y6oCDrtJkLGlDIBt4g6rseIcxZO9
+Dc550OcqxBuoccQFxHvIs7Zns8/eBs1J0lbXVH9st06eAPCTr2yFVBYV3PYn88e6
+hj6xTKIFm4XkTooyCz+6frOnvAB1rdvsBjLMq8fEYo5jK8QsuWpkWDTkFi9UflgP
+565Lt94o28D1vxdXtlQ/Cz06rLys+/pVTYjBA1a8gjxySn52iJG9OIATO9f1pCHM
+CF86Xfic6IU1Qz09tk3MLUj/tz5WLwt3YjFymIfDIwWZ/eFZRXw=
+=OxgG
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3304ed03c979..4b0a270e0728 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f57121aa4c9c..8196ef68ab10 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index aaa0ef2fdfbd..ba33d5c579d2 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -2,7 +2,7 @@ DIST sudo-1.8.20p2.tar.gz 2930769 BLAKE2B 90338e7d436683f94a9e13e9f0da668f2bbbf2
 DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695
 DIST sudo-1.8.23.tar.gz 3150674 BLAKE2B 11b1c7bfa372005cda8baf651c4662f6fd15e94ca77f7705b23ca6573424796d5c1f8e47e2874c4b54017141d01a632885ac60c92346d932537048373cad0ede SHA512 a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342
 EBUILD sudo-1.8.20_p2.ebuild 5739 BLAKE2B bd58250f5cf45c9a6480152ac0ceb11b628c5c6e05ba663b9c277c8f082b48de4be179a437e43de2f8c81d191a98840757387e655b0c2a04d4aec2827188be0e SHA512 cce6c399221a53baba5ab12c83c833c3a350ded0ca0a7144fb46b34bccaf323368408f6b4c05b3b1d7cf01563d0f53ff241f15fd553f0cb64c3164bdea052ac6
-EBUILD sudo-1.8.22-r2.ebuild 5992 BLAKE2B b3f2ec002c07c333ef54316e7b529f4367c59c92db03f9c3889d8a16d2b0cfd7540360a518c29ea7ec5881c39ebadadd47aeb7c111d990c345eb3f9fba33705d SHA512 6f8dc6106231ba4758875105bc38b446b9a8ea71c61c44037d27f01536c667dbc997ec8748b18ccf20e0d01c1f301291af711c04a33f87ff172c969f8ba8da34
+EBUILD sudo-1.8.22-r2.ebuild 5990 BLAKE2B 3e9d5827271f71362f4e3a9664e6f22437764a49fd2c20c79d2e8c211058627bf288b885b65a8a3ca4768460074871d0269c13cddd186605f063bbffa7d39f50 SHA512 a165bdbca3ce48e969bfa9fc2d8d1768343fd3570735ab874237c0a0378fd0b3ec64820586d9040fe4ad19ae91ddad0a62e04626e3c4b38c336a44bce47b7690
 EBUILD sudo-1.8.23.ebuild 5962 BLAKE2B e65fc8e35531d64bd7ad8bc3954018164359513b54b2868f2215006a4dcc907d1355fec8c1b3327fae57f2642e72e99ed11709281a88579d68c53629bcf5841f SHA512 a83a23a13b892f661bfd467078e2b390d455d2e3228d60e1045a58091724c6939daa063549a66b669b8240d90cf69bb28812d5b9db91ffd34acf17bb005afa4c
 EBUILD sudo-9999.ebuild 6103 BLAKE2B 18b0a129996f223d607bb0cd7783729ac340e0e4ad8b0ebf4311598f6ca1766e892e981d895da63713ed5dcd574b54b72c0705862f481d8b70f0a1f691dd804b SHA512 256e303eac4f944d3845fd75481121f90036b8848eb201b83b5841edbb3b3850c67e7d1ecef63ca7b86d86cff0e8ccb37ab9f6dee72026ae8c0d08ea4b725f59
 MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
diff --git a/app-admin/sudo/sudo-1.8.22-r2.ebuild b/app-admin/sudo/sudo-1.8.22-r2.ebuild
index 2c2b755b3d11..5c8f882a27c0 100644
--- a/app-admin/sudo/sudo-1.8.22-r2.ebuild
+++ b/app-admin/sudo/sudo-1.8.22-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="ISC BSD"
 SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 fi
 IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
 
diff --git a/app-admin/sxid/Manifest b/app-admin/sxid/Manifest
index 92159ca1ded3..8f10c765f684 100644
--- a/app-admin/sxid/Manifest
+++ b/app-admin/sxid/Manifest
@@ -1,4 +1,4 @@
 DIST sxid-4.2.tar.gz 41827 BLAKE2B c436ffd1b05306508c0ab0e4236cb3968d4456ae0686357a3a2c2a587fdbdaf8e760d5ff8198188c23854b080a91a35fc27a9717ab28f6907deb887a7b455cea SHA512 ed2832a0ffa89a41eba39e116122878b830c46ee7bfb906652606cff61fe16bc28ab6e6b4a802cc2436d9b3a7bdd734a827f007e6f1ce14ca84a9015d3a37a69
 EBUILD sxid-4.2-r1.ebuild 739 BLAKE2B 73a6885a13d9fc488d24c88f2dd46e1837fa9cf2e1f26cb19bfd7255602cc0404d2a597f94852d7282d16829f05aca36ee15a25d1f344413b966eb74fa02e418 SHA512 cc0118b764ca45567a04920b8263b2f10596f18fa458b007b5648094b254307dd440cbe33b5e441496a1f0669e235d11fe732d6ea2e59e91f4a3c72e094cff3c
-EBUILD sxid-4.2-r2.ebuild 743 BLAKE2B 20616515b67bc2d1a2816db81b02fa39d8a90b8643f931d8aa7d37ff314ba1b734181e1de92eaaca74ca5faa13bde30286fb0c6d3a16cac3e3cc628f049b56e0 SHA512 9a2b80cfa3c5a03cc4717df6b2df7f114d043f7d40507d0d488675c812b01347f734131db4376498cab406f2ee2ebbcfc9dcd2896f3e35bb8e6c8ea6b7dbee93
+EBUILD sxid-4.2-r2.ebuild 742 BLAKE2B c7614bb1724fca040f2977c4e6df40e15c97f48319128859081d1529bf1fcb70434feaf24b7a20396bd8937476fdb3ff2ee2e82863c818ca7fea54af397133bb SHA512 eef8fc9083ccee3ddf0264510a50803a36a66d50c0ba482ffe2e69407756963cf01314be2e32a432297cbefb22be4a4e4261fce2edb88e269320924dbdd4138e
 MISC metadata.xml 239 BLAKE2B 2c20ec7073e95bd9e1cc847b1e1fa0e79e8f22177834ae4ec3c9f4f6599ef0b626fe6eb76aa8684fe5e6493278a508f3c48552d8184a1da955078848df42a1c6 SHA512 78b96763365234c0639c1b756aad62686435ddb7c52aaa88b2afe19c978eb7cf1e0f5d16ea1f7f394d77491fa6b0d978e42d208f4fa1255d1e265432c4642323
diff --git a/app-admin/sxid/sxid-4.2-r2.ebuild b/app-admin/sxid/sxid-4.2-r2.ebuild
index 2fc3745c93db..5351273bef83 100644
--- a/app-admin/sxid/sxid-4.2-r2.ebuild
+++ b/app-admin/sxid/sxid-4.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://linukz.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="virtual/mailx"
 
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 662623e5adc2..18c5742e9050 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,12 +1,8 @@
 AUX apache.webalizer 203 BLAKE2B fd92b85d0cd5a3bb0118ca3e47f616aa4f68cf3b954d1a8ad21ccc3cd229cc66e12e7f461497eb740c9a5ad5b34f8cf4c81d7e86e9725d6789568d15de10265c SHA512 19145c1d74322f2f6724bde7c5ef0c0111489566ba3ba8dcdeba38681332250e77e26652ccc2b6ff1a41f7dc7795c34a4c5e189cf92b24fe0ad544c4afac40b0
 AUX webalizer-language-list.txt 1520 BLAKE2B 303cffa208d2375c37b3f105a67d22cde6612219ddba20e816fb64ec4eee98b6dcbec0e534402587a108c805b0de3b67ad99d46103dae46f507b319f11ba117f SHA512 52abca2565a8d06d8bf538b8c168b32dbb065e655a4c849d6ff1e1299c4e84d6f9717b7e74ef730a9c68cd63f2d03232ae5c9d1ba391f68e3f1314444e41c29a
-DIST webalizer-2.23-05-RB29-patch.tar.gz 45853 BLAKE2B 0e5bbbb8d93e71d6f8101d3a54d53880a1c0e9f4f8d21333e8e7a45fa4a772800770396db8927265600c0657ef71c4ee11b19652548fc5cb6284b4fecfe1bed3 SHA512 967a5418e858adb5be8b64bac7edb52ac6eca8bce567269866f2ae7ac6e34c09d2d0ab1d7e7cfcbd92972cf5ea05ac2abaea2058e6fa9273e27cf10aacfb4759
-DIST webalizer-2.23-05-src.tar.bz2 308238 BLAKE2B 42aeb3650d912cbe0bfcb3894342e640359e57b094df9528696d4dd765b5d2f0c29450f99e6e9fb9d874438b707e83cc263715adf26faeee9d72403f5f97493f SHA512 4840c2ba25e34d5e276c724c311d2c2d7a0223dcbf6dec567960f56bc4cdfe4f6a1e412e3fcab53395d6357377f4f8d2b3bcc4b23c46a3ec6a895813a681cd4b
 DIST webalizer-2.23-08-RB30-patch.tar.gz 45723 BLAKE2B 510e984121cc5109e442184010edb0e2fbb7bb9738297c0689acd32e55a1720bdf7bcea3a21cc73aa8ecd0b9d0a8b1a7b336227003dee5abfff9d5288a5250d7 SHA512 142674cb7de6e1833ed9bf7587d5d3b1fce64eb95b7448392d0e8ec6e89dcd69cdb6900b75db9c283b19e5423392f76565b5ad279748da656ed2061fb180c949
 DIST webalizer-2.23-08-src.tar.bz2 308090 BLAKE2B 84f56b8b6a7e2b382040649ca8c6b6b7b57de92a09922253473f6cf920a4dd10a2c268b926c0cdd4fcf029dbbe39d629eecbd74cc42f62c018a00c3cc86c4f7d SHA512 23fe6e3ef1c85aa527ffafef16c31c13ad8e1f9feb774557c07a5c8fd6c67986b98180ef16d6cebe62d59c5f7ca214b8292e94ce8f195fa0541de9c5438fb9bd
 DIST webalizer-geodb-20140201.tgz 733070 BLAKE2B fd97dfd14e2fcbc6c97d6cb423c922d6bf7504f156fb61fb11319094a4d2e25fd8fa2623f419b57d06ef0762a507799cfd750a5e3a86a143aa1afcc790942cae SHA512 c31bbf39ab2a27712f83e7c1cf4297bc26850ed72e68bb4b47233b062055cf26931e859cdbc70dfa7737e17a3c05d4858b4e9c9c3a0492b0b285f92c0f992223
-DIST webalizer-geodb-latest.tgz 639447 BLAKE2B a4a604f8ead42c403ce750c9f373e8ffc4a7510aab6cfd43b88f39b93f5636460860b72fcfcb9468a5a06739b830149878c948e5b3dd0748e14ee9cbfb2be9d4 SHA512 0f32d1249902e17f37cd0e7680004262bbe5b4a34a00d882319258c6aed80503e89ed192d8365731ab507fa54560082ae16c7023d0bc2232350709106be24117
 DIST webalizer.conf.gz 8986 BLAKE2B 6cee5f96c31a189bf7ce75ec845081d9a2f0e547362d415c84f78f1ddaa8e3ffd327517968037ac1606a485d9cba740054bb9851065d0ea03739b5558c7ef6f9 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b
-EBUILD webalizer-2.23.05.ebuild 3813 BLAKE2B 73b3e795b6463598b432ed32a2cb9cb58c14824141c6edade11786c54bb52449cd13da01d68f930ece01376a8581c16e3779c394e3641ff9de2086a80e91ee35 SHA512 c81bdbb98168cb608c9eee163e71dbea85c487f16034fad1d772880f6b0b5350aa071fc5f3e870eaf49e8bfa5c6354c31c93866d8faaff9cec0843993afcde24
 EBUILD webalizer-2.23.08.ebuild 4222 BLAKE2B abf62b488d87de185333e3900fe995400416acca263ede382d5da791304d154d95d0651a4531d453fbcf9d674f5733585044ba428bf80705bc13c1573310067d SHA512 8267cb7a29cb7cb006a631b6e04cb01c701f14c602ede2a0ab0dd40da6d15edc70adf118a2fcc4561cc8db975c71642f9fb97e99dfaa44ee5957d8eade13f862
 MISC metadata.xml 434 BLAKE2B 72cde450aa4735601e14978c5bfc3be91f257907988e6017dc27f7aca8dad9b8586dc78943d69a10344d25d2435fb8394b5fe1239a0ea7ff2ae3ae2b26ba0eec SHA512 9d006c56a0019b4ea29e8f9f845ca9006ecdccf64b9e50c343420af4b3852b5c08f09a23d792c3d1454454f8a0696a0dbc4b36b4da2c6f0d4967f533ad3a3149
diff --git a/app-admin/webalizer/webalizer-2.23.05.ebuild b/app-admin/webalizer/webalizer-2.23.05.ebuild
deleted file mode 100644
index 5dbba1424e70..000000000000
--- a/app-admin/webalizer/webalizer-2.23.05.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# uses webapp.eclass to create directories with right permissions
-# probably slight overkill but works well
-
-EAPI="2"
-
-inherit versionator eutils webapp db-use
-
-WEBAPP_MANUAL_SLOT="yes"
-XTENDED_VER="RB29"
-XTENDED_URL="rb29"
-
-MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.webalizer.org/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
-	xtended? ( http://patrickfrei.ch/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
-	ftp://ftp.mrunix.net/pub/webalizer/webalizer-geodb-latest.tgz
-	mirror://gentoo/${PN}.conf.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86"
-IUSE="geoip nls xtended"
-SLOT="0"
-
-DEPEND=">=sys-libs/db-4.2
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.2
-	>=media-libs/gd-1.8.3[png]
-	dev-libs/geoip"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# USE=nls has no real meaning if LINGUAS isn't set
-	if use nls && [[ -z "${LINGUAS}" ]]; then
-		ewarn "you must set LINGUAS in /etc/portage/make.conf"
-		ewarn "if you want to USE=nls"
-		die "please either set LINGUAS or do not use nls"
-	fi
-}
-
-src_prepare() {
-	if use xtended; then
-		epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
-	fi
-}
-
-src_configure() {
-	# really dirty hack; necessary due to a really gross ./configure
-	# basically, it just sets the natural language the program uses
-	# unfortunatly, this program only allows for one lang, so only the first
-	# entry in LINGUAS is used
-	if use nls; then
-		local longlang="$(grep ^${LINGUAS:0:2} "${FILESDIR}"/webalizer-language-list.txt)"
-		local myconf="${myconf} --with-language=${longlang:3}"
-	else
-		local myconf="${myconf} --with-language=english"
-	fi
-
-	econf --enable-dns \
-		--with-db=$(db_includedir) \
-		--with-dblib=$(db_libname) \
-		${myconf} \
-		$(use_enable geoip) \
-		--with-geodb=/usr/share/webalizer/geodb \
-		|| die "econf failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dobin webalizer
-	dosym webalizer /usr/bin/webazolver
-	doman webalizer.1
-
-	insinto /etc
-	doins "${WORKDIR}"/${PN}.conf
-	dosed "s/apache/apache2/g" /etc/webalizer.conf
-
-	insinto /usr/share/webalizer/geodb
-	doins "${WORKDIR}"/GeoDB.dat
-
-	dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.webalizer
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog
-	elog "It is suggested that you restart apache before using webalizer"
-	elog "You may want to review /etc/webalizer.conf and ensure that"
-	elog "OutputDir is set correctly"
-	elog
-	elog "Then just type webalizer to generate your stats."
-	elog "You can also use cron to generate them e.g. every day."
-	elog "They can be accessed via http://localhost/webalizer"
-	elog
-	elog "A sample Apache config file has been installed into"
-	elog "/usr/share/doc/${PF}/apache.webalizer"
-	elog "Please edit and install it as necessary"
-	elog
-
-	if [[ ${#LINGUAS} -gt 2 ]] && use nls; then
-		ewarn
-		ewarn "You have more than one language in LINGUAS"
-		ewarn "Due to the limitations of this package, it was built"
-		ewarn "only with ${LINGUAS:0:2} support. If this is not what"
-		ewarn "you intended, please place the language you desire"
-		ewarn "_first_ in the list of LINGUAS in /etc/portage/make.conf"
-		ewarn
-	fi
-
-	if use xtended; then
-		ewarn
-		ewarn "If you are upgrading webalizer from USE=-xtended to USE=xtended"
-		ewarn "you will need to delete webalizer.current and process all previous"
-		ewarn "days in the same month using 'webalizer /path/to/access_log.1'."
-		ewarn "For more information about using XTENDED webalizer, see:"
-		ewarn
-		ewarn "    http://www.patrickfrei.ch/webalizer/rb15/INSTALL"
-		ewarn
-	fi
-
-	webapp_pkg_postinst
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index bc80eef64c19..bd7d99a84951 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 97f61b7662cb..da8c4b2ce764 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,7 +1,9 @@
+AUX CVE-2016-9296.patch 495 BLAKE2B 34aad92d8a22b05119242e57effb85648acaa0c0b89a68c8ff03faa8c455ba4e95185732c2f26a462728d872f268d4a716cb14a703c05a1cb157c23dcc24cb86 SHA512 7a7fddf4122c3f5d4632640149a94c285a18515f38510388709c2fb9ecd450f9f34ae2e5fe4926c1c68507567b0affa2c8e9194c732673171dd5ee625192b194
 AUX CVE-2017-17969.patch 804 BLAKE2B 1b3d12f6d81d3b3a934088020509435c07a8bfe5ab2003e7369aa9b775808711915b1a0ede48ab6b8b24f37b55f2b84eefff020c34ec171002d9d714bac96f57 SHA512 fb97f6cccedda5b53492afffd65e9933055ffb3dba1419799bb5bf069d066f1172424a7913e0661fbe5937d23c94c062499968ddd09b7310f5d2c8003274340a
 AUX CVE-2018-5996.patch 6427 BLAKE2B a60d4c51470d9a1ee58afc4ced5190dc589c78604dfd8cefdb5f4caca74d73f175722f777c4c13839951178b394c44b69577c8b5125f45581890dfaf1325d47d SHA512 7962a03430b94aec7c93d6dabee340f4f5915d728ba4df0dcaae483ab9c29115818e5e944572a3fd910addad8799c6a1e3911f6a0a02b661f804eea11c3a0f40
 AUX p7zip-16.02-darwin.patch 218 BLAKE2B 4e6b9f830ef9aff4d9db050163477a341353c4f16188ad2eeef3e248afabdc34d47d4c0708f174efa80e98906833b549b28d43af4585f2b1e34311e6f8c9944c SHA512 26ef30ce27fccdeae6388801e7a619225995c50394131ad5dd6fcf2236a40e92ad2d6dd2ea04c362fd660264decc6b616e5ee6ef83ff42c111e2b1a40f620c68
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
 EBUILD p7zip-16.02-r1.ebuild 4498 BLAKE2B e1376067188375ef82b1703531d7c673a54ce6901bc3af814d2928ca503b23484572781d27ef9ee66d388cfc3344d2e960c602ebd0e034ea6ab685a87c6ff773 SHA512 9a0ec08e5013933c43234e38574ac95d81b75b58992c021a2ba2679fc6d00d1ec4b79985d4555189c774f22def0125fa8a5e1e66a67de1daf84d1ef94720e3dc
 EBUILD p7zip-16.02-r2.ebuild 4571 BLAKE2B b2884ae0f3d8cc0e848d315f09d3cf1daa43650f03708b49eba873a351782d138e124dbb1dc146a2fbde22b3e37664bb29a8c39880ca96738c1d7b34fba1b18f SHA512 34dfb07df92b9fbee1961ef6cd379dac4a93f2bc865be49db86163984978a7366e64f83b5ec6c2a9a717acaa868bb1e42063bdf882dce11bd55e7bbabcd6293b
+EBUILD p7zip-16.02-r3.ebuild 4613 BLAKE2B 3cf1cb66ca0d3880ec44d57bf1c7586837368bc5fd762000a07873b8ef193ebdf5405856b17597cd85929afe804d16779c813764a80f07016e1f623eef1b3d52 SHA512 d8057408316ae76db82a7144b1dcc88f0dd52d66461443e441a73edf5b365076419f46047342e73d6b3b1b2c192b66410785492d7aa9bafa094772c16f381d6e
 MISC metadata.xml 393 BLAKE2B 6ab87f3e2f35dded47136efbf8f93c7a899a5918b4a8e3ab6658a427da8085e8eb0e6ce2aec09fd0ea5fb14909081600b79027878b7e5b8ef9d476def057e52f SHA512 50eb24c1e60e0be2c02d8054a5039c5e2b11ac82aea3f90c0a37c21e68b01135de88878b1079ec46eeb8d1f8ab52fb8c9f58f88a498feb38ae5743adb7519176
diff --git a/app-arch/p7zip/files/CVE-2016-9296.patch b/app-arch/p7zip/files/CVE-2016-9296.patch
new file mode 100644
index 000000000000..773f92a46e0e
--- /dev/null
+++ b/app-arch/p7zip/files/CVE-2016-9296.patch
@@ -0,0 +1,12 @@
+--- ./CPP/7zip/Archive/7z/7zIn.cpp.orig	2016-11-21 01:42:29.460901230 +0000
++++ ./CPP/7zip/Archive/7z/7zIn.cpp	2016-11-21 01:42:57.481197725 +0000
+@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS
+       if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
+         ThrowIncorrect();
+   }
+-  HeadersSize += folders.PackPositions[folders.NumPackStreams];
++  if (folders.PackPositions)
++      HeadersSize += folders.PackPositions[folders.NumPackStreams];
+   return S_OK;
+ }
+ 
diff --git a/app-arch/p7zip/p7zip-16.02-r3.ebuild b/app-arch/p7zip/p7zip-16.02-r3.ebuild
new file mode 100644
index 000000000000..394b319ac40e
--- /dev/null
+++ b/app-arch/p7zip/p7zip-16.02-r3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit toolchain-funcs wxwidgets
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="http://p7zip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
+
+LICENSE="LGPL-2.1 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+DOCS=( ChangeLog README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-darwin.patch
+	"${FILESDIR}"/CVE-2016-9296.patch
+	"${FILESDIR}"/CVE-2017-17969.patch
+	"${FILESDIR}"/CVE-2018-5996.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use pch; then
+		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+	fi
+
+	sed \
+		-e 's:-m32 ::g' \
+		-e 's:-m64 ::g' \
+		-e 's:-pipe::g' \
+		-e '/ALLFLAGS/s:-s ::' \
+		-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
+		-i makefile* || die
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed \
+			-e '/Rar/d' \
+			-e '/RAR/d' \
+			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
+		rm -rf CPP/7zip/Compress/Rar || die
+	fi
+
+	if use abi_x86_x32; then
+		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use amd64; then
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use x86; then
+		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU
+		# linker, it doesn't matter so much for bitwidth, for it doesn't
+		# do anything with it
+		cp -f makefile.macosx_llvm_64bits makefile.machine
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
+		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
+			CPP/Windows/DLL.cpp || die
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/makefile.list \
+			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
+	elif use x86-fbsd; then
+		# FreeBSD needs this special makefile, because it hasn't -ldl
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+	fi
+
+	if use static; then
+		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
+	fi
+
+	if use kde || use wxwidgets; then
+		need-wxwidgets unicode
+		einfo "Preparing dependency list"
+		emake depend
+	fi
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
+	if use kde || use wxwidgets; then
+		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
+#		emake -- 7zFM
+	fi
+}
+
+src_test() {
+	emake test test_7z test_7zr
+}
+
+src_install() {
+	# this wrappers can not be symlinks, p7zip should be called with full path
+	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
+	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
+	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+
+	if use kde || use wxwidgets; then
+		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
+#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
+
+#		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
+
+		dobin GUI/p7zipForFilemanager
+		exeinto /usr/$(get_libdir)/${PN}
+#		doexe bin/7z{G,FM}
+		doexe bin/7zG
+
+		insinto /usr/$(get_libdir)/${PN}
+		doins -r GUI/Lang
+		doins -r DOC/MANUAL
+
+		insinto /usr/share/icons/hicolor/16x16/apps/
+		newins GUI/p7zip_16_ok.png p7zip.png
+
+		if use kde; then
+			rm GUI/kde4/p7zip_compress.desktop || die
+			insinto /usr/share/kservices5/ServiceMenus
+			doins GUI/kde4/*.desktop
+			dodir /usr/share/kde4/services/ServiceMenus # drop these lines after konqueror:4/krusader:4 are gone
+			for item in "${ED}"usr/share/kservices5/ServiceMenus/*.desktop; do
+				item="$(basename ${item})"
+				dosym "/usr/share/kservices5/ServiceMenus/${item}" "/usr/share/kde4/services/ServiceMenus/${item}"
+			done
+		fi
+	fi
+
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
+	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
+	doexe bin/*$(get_modname)
+	if use rar; then
+		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		doexe bin/Codecs/*$(get_modname)
+	fi
+
+	doman man1/7z.1 man1/7za.1 man1/7zr.1
+
+	if use doc; then
+		dodoc DOC/*.txt
+		dohtml -r DOC/MANUAL/*
+	fi
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index b5f4a943c514..01f20513ea30 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index 09b8dac2eba4..cff00a88203e 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -3,4 +3,4 @@ DIST EasyRSA-3.0.1.tgz 40960 BLAKE2B 8f1be521da9c57abc911b771188bd6e3e0732fa0344
 DIST EasyRSA-3.0.3.tgz 40960 BLAKE2B 1ada3a467bda797d35204d5a03b94a750e339a7ec8a7806007eee4b6b5442e76a2472a404fb7e963fefc42385474a0197eeaec8fa27c2b737f7f4ff55b4e2878 SHA512 c8cdc31d67e63f9e8338095fa4534bb141d857a8a9f510bef1af32270b8421952e569253bc8b7a51ebf1b443a6ad5c7cd011b258d7c9f56426ecd3f2b710b6f9
 EBUILD easy-rsa-3.0.1-r1.ebuild 856 BLAKE2B 6cbb1e3eb67f38d9e4206bfd9350411af7a7da288c6b1bdfb66717586d84d1bfec1de66b8aa61c8be44c9175dd757982a6bbd21787c72e923b4fe2229ac26e44 SHA512 8be27d7faccabeb9468d4b914b690a95f11dd02225759e51042b8f54043253570fc2a06b2173aea31b2c33ebba879effffbba4d8cb95a6f51871b3d7760a11a9
 EBUILD easy-rsa-3.0.3.ebuild 862 BLAKE2B eb9eb0307d2cd4ea01e41b35a2af90d24b5a20e0eb72f9724150e4e800c8fed1f733db45349b2c1f4f2af50215e48e7148ec1564798a702e6cf24fa94249001f SHA512 2c030b2a4fc5ed9fc02de403560a0cec4ffae94ff18611b7942408c937e36544aeba5b6cb87b7db23734b3f2ea0b7f6f19699e789013761484a374bd093f5df0
-MISC metadata.xml 253 BLAKE2B 77778a46a838a950d226a651876027a32828e69adde792c1f3d7b484df4399624ac93a7e8e43db8d2c1a47929218fa7a6b56bfe9b363aef25925b751f062fddb SHA512 514b8f53c2debe0ff7fcc49e68347d148d5955114bb26f93d86deb9cffcb17f9081cce239beafd37ec47c43ec01743eb999b7cf2b5dc1708948567865d9d6531
+MISC metadata.xml 321 BLAKE2B 453742eb4f4eebfc23e6d9889fe78d2894c3f49bde81f56827c271dbf8281a2b6016205843a0aabd5ea574776785327a83b017389bcf41aeb5f5402c04e7a97b SHA512 e643d4681855376cdc17865fc1b4106a56861f7bc080ccf808a485594e3ca35fcfa72fcd2ad49af69275d569468c1684ebe784cb16e47cc528187bdeaba6a051
diff --git a/app-crypt/easy-rsa/metadata.xml b/app-crypt/easy-rsa/metadata.xml
index c51dccf760d3..c870b4c79275 100644
--- a/app-crypt/easy-rsa/metadata.xml
+++ b/app-crypt/easy-rsa/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">OpenVPN/easy-rsa</remote-id>
-  </upstream>
+<maintainer type="person">
+	<email>zlogene@gentoo.org</email>
+	<name>Mikle Kolyada</name>
+</maintainer>
+<upstream>
+	<remote-id type="github">OpenVPN/easy-rsa</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index fe10178757db..481559dd366b 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,9 +1,6 @@
 AUX CVE-2018-5729-5730.patch 11896 BLAKE2B 324bbd80acf4a2520909fc26f90f67cec06148ee0effecc43fbadd6c6445b57ee17eae57864c92a5ce0cdc3dbfb0540758910133195fd2078d334bc6e209a452 SHA512 b59ba6cb5d40cca6c8f539c028ba24c2fa6bd1750133545e912f519b91043d426cecf782209c373598fd895c6294e44fc2bc27af34c033ff367bdfb2cb4f91c4
 AUX kpropd.xinetd 194 BLAKE2B cfc40af2e75b0ce5a71e0dfdcfe076d13d996b25d2cb50d4282bc88d7b33b317a202d57df0bb4a2b47113f0d38cb508614e122e4a3bb7dfd2397e2daa3178396 SHA512 c9bbd13f2fadfd2a925bfae834ba61f227cd4386b4c4466b5227d93c792f4549778ef4d6e08353372df99804459277c71f61b41ec71f3afcc600d73c5705f72f
 AUX mit-krb5-1.12_warn_cflags.patch 448 BLAKE2B cd9793866173b394bab3497d19653ca3296924cc49aaf540499b149254265af1d995b4d7493b76185ce35d123e70827cb5fcb221efc6499b86a346cfad7478ab SHA512 42364d9cd8c0a6fd28ae661eeac4d0dd3f2001fe290bf9731ee99c2c786a6488805fc93057d59e201e2cef1e5280af4c170187aa5603f4cf542906abc0fccc2b
-AUX mit-krb5-1.14.2-redeclared-ttyname.patch 660 BLAKE2B 8fb59ad5ed7b0896272f4bf10e8e15a1c848047dbe6a7735930657422888530691f681949d72b4b0924a8983ec392282736eae57dd72c8548ee960fc85909c53 SHA512 90a2adedcdca4e2079daaa613e2d4f08e948ccfaf56aba19a08b4cbe2257a6a60dcfd5bbc4b19ca64f584759b1a374d1894729a423e636bfec1969a675a1628e
-AUX mit-krb5-1.14.4-disable-nls.patch 1247 BLAKE2B a24c425a21bed40c7b563658207f324d1dccade9b8aec4d4124e2a2d0007d81e314765d23fe3e4be2bf857fa67bf3da06aead99ffb21afe635bbb1d7bb2c89cf SHA512 5fecc719c5c8a1f5c971443d42561615b8fb8c6b99b735a633c7479f109cfb6852eee5179e267a1e2576e52faf2311395ddabdb47f749b573ead3ddd86714e2e
-AUX mit-krb5-1.15.2-fix-pkinit.patch 3196 BLAKE2B 6fdf17bb1ad096bc2745c3c908fbc913de3d4d7176c060cb51d911b256e82f67a73d9204044f5227c7d3d1cb1f76dbc31b2845738c4f97dd0a199990a9e09f0f SHA512 d7b3f33f25e610b24f2854892d75016dfa5b5e34fac24600df80b91194f5fe2e6dbc35ea3a9a772e0dcdf7659263a56230e767fe393d32796c61b3bd5bb2de69
 AUX mit-krb5-config_LDFLAGS.patch 466 BLAKE2B 2dd4f1cfc20bea229d08201d66e3de71472dccfa45dee9b260c51578187e706b864c0b4ff81c0c5a09fd29401c2abdbe334441ca075208299b02d5e1d49aff94 SHA512 9a1ca9b33e7708346eda78d199fdc51f0d7bd08d3d65ea15a19955a6155ab71b8ee0c8989859d6dff293a141f197ea19394a91b3b641181140a289b743e0f0e7
 AUX mit-krb5-libressl-version-check.patch 1123 BLAKE2B ca8bad504949c8dcbffe5f9906a38287a2483ffef8b0326cf361f7a07c44787aa0972a24a832aa4da9a1450fa41035bf216c55e1aafb8a890cc8d88f1e210e88 SHA512 cec03ab3577fd8f96f34e51e9380622b09ac5964687b2e8e45e066d16846a9add71c3fd44f6de305ee5c5be5a27a07e4758b6752afdd8a70149b3f191be609f8
 AUX mit-krb5kadmind.confd 76 BLAKE2B ca69357a77ddaf67e2f9c104b17d49af5da9891b13bd855f8b04d54bfb6ccf07ae8c5cb694f65a47646675c844c8f8c7224e8487081df678c73c554498259516 SHA512 dbf968800959f0463899031e823f003e9ece90132f452ebf03df08caf0e6a6e6ca2cfdee91491d269cfa24bef19e72dd33c7d818a4bb13ef85edfb6f0e8299f3
@@ -17,11 +14,9 @@ AUX mit-krb5kpropd.initd-r2 608 BLAKE2B 9737f5ff711b8e30444c14ca871e01f2c45e9aec
 AUX mit-krb5kpropd.service 128 BLAKE2B 31d002c16987bd6fc42e22e64dd9bd1f9db36655dd5170a4f9f16c6a889a4303a4dc276aca09b3a213a1de3e6ab759c66790141708ec95c4393bbbe79e8fb16f SHA512 b7419d1c728eda86fbab2fbf83794ae754e3cdaec7dcdc12c2105e3a75f9903c25fe8fee48f57acf6f0a8c62d27f7934fae81c0cbd67b997541aef7060a4de46
 AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad2a60beebe83bd766d42261bd44c712df14608a1e5e922715780a6c4aa8ad294c34ba4e8fc336a24d038fd3 SHA512 4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
-DIST krb5-1.15.2.tar.gz 9380755 BLAKE2B 3f5d00a70bf44ef077872bde282e4753e82acb70632e136b8f9f8d3a192e3e7b692840803e5a3f67ddb202d53631767ea9eb8b7615d45a3479389a01a6390ac4 SHA512 e5814bb66384b13637c37918df694c6b9933c29c2d952da0ed0dcd2e623b269060b4c16b6c02162039dadebdab99ff1085e37e7621ae4748dafb036424e612c2
+DIST krb5-1.16.1.tar.gz 9477480 BLAKE2B 16bdd7d6d03ddbd4b070663c3a7a3d2331d54e8590b24f1dc162be2531bfbbbd65878d426a160c65ffc1ba4751f16bbbd177a8a91c01002fde0e886cc1bd91b9 SHA512 fa4ec14a4ffe690861e2dd7ea39d7698af2058ce181bb733ea891f80279f4dde4bb891adec5ccb0eaddf737306e6ceb1fe3744a2946e6189a7d7d2dd3bc5ba84
 DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3bac1678c3f3ece3905f27feda5a23d28b3c13ebd64d1760726888c759fb19da82ad960c6f84a433b753873 SHA512 7e162467b95dad2b6aaa11686d08a00f1cc4eb08247fca8f0e5a8bcaa5f9f7b42cdf00db69c5c6111bdf9eb8063d53cef3bb207ce5d6a287615ca10b710153f9
-EBUILD mit-krb5-1.15.2-r1.ebuild 3783 BLAKE2B 159b71b8d361cdd970ead9c9aab178d0f2b8c892d0fc03c8ead5fabeac0a4b9b672033654af6bd42cb9aac42109cf6ebaf2d1bf7c78e194e0e6b2bb94a998a2b SHA512 6f47bb8fffdfcc356de32b7f7b80d14b2643492a6b72da63b8ddb4dd357ba7fc2362d1943b98ff2e353fc6a922c45489007799e397f88d393b7377a2a0ace8ab
-EBUILD mit-krb5-1.15.2.ebuild 3726 BLAKE2B 866f73ca347e333ba75383ed43552621adb018d2352f2b22b8ac343375b45365a0374fdfb8339376c2ba6826e8399dd46e7c7dc548bbb06d41c5c9a5197ddaed SHA512 6dbd81a886c77afaf389a151e2d681897581a521a7d0141af402c6149a03c5be149bc304ade71f2f30d94a37a90a9171432d3d902b92be3ba5297232bb03f166
-EBUILD mit-krb5-1.16-r1.ebuild 4125 BLAKE2B 59e0014116ffdb9eb53ea720f3cbd7f71e994122ded056db738c1048d5c341ed3d67215417de38be6ab63cf1f5e186c616083cf361bbae08a77e808a0e70cfa6 SHA512 33fbd340575089a810e4fd361fa1680da97d296d8aa27450c237ca0aaade3cde530720910394fef5a35539ac77b9143dc0ee0898173d54c38c1d1ef7d30f8bbb
 EBUILD mit-krb5-1.16-r2.ebuild 4216 BLAKE2B 549275049118fa581d9ed872b7b2d8ed48f959771bfbe745e20c5c80c6678a4c7c3209d0316464816f80ca81ea51d3b9da5c380debccc03e797c975070233a9b SHA512 2cd3e5edf102c2a46af87d9ce4f26714b8fc9e765b24126c35440a8724863fb661e243910f05c7aee83d7d32e91cc2c1ebad8ed73167147ecbe49b47a6a0e6ae
+EBUILD mit-krb5-1.16.1.ebuild 4172 BLAKE2B 4b120ec5bb2d750c6d76c1f6fda2cd21aedbfe771eb234e4d7b392868b6e9d9bcef4b6897df456d8ae30b9cc96a8b83636028d854cb2646172c4f0c27ecc0087 SHA512 af0736e57376a42e44e4a2d97587386590c5a3c5de56485b6db2016494b2bc392ba4bf573462576de5a909fd963da8095d349eaa5866f3ec3ffd427224650eb3
 EBUILD mit-krb5-1.16.ebuild 4060 BLAKE2B c271a048c52a7e940737827bf6c6639b333520be6f631edab5a6a7c901ed4a7378a994f247418c5bb131141b75de71c8d42dc9ab0135cbdab5ad68c6e51006fe SHA512 95d2149d2861b5c7ef3f6e9d026100c37814c7b87bb9e2879985c5ee50847bc894b4f73ec0ee9de8d3b2cd717b30541c382d011aa7408618ccd23a3d7556719f
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch b/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch
deleted file mode 100644
index a76cd3a7f843..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fixes the redeclaration of ttyname which was preventing
-enabling clang fortify.
-
-The error was;
-
-main.c:858:15: error: redeclaration of 'ttyname' must have the 'overloadable' attribute
-    char *p, *ttyname();
-              ^
-/build/samus/usr/include/unistd.h:784:14: note: previous overload of function is here
-extern char *ttyname (int __fd) __THROW __CLANG_NO_MANGLE (ttyname);
-
-https://github.com/krb5/krb5/pull/568
-
-Patch by Zentaro Kavanagh <zentaro@google.com>
-
---- clients/ksu/main.c
-+++ clients/ksu/main.c
-@@ -855,7 +855,7 @@
- 
- static char * ontty()
- {
--    char *p, *ttyname();
-+    char *p;
-     static char buf[MAXPATHLEN + 5];
-     int result;
- 
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.14.4-disable-nls.patch b/app-crypt/mit-krb5/files/mit-krb5-1.14.4-disable-nls.patch
deleted file mode 100644
index 63cb0fc0c55f..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.14.4-disable-nls.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Adds support for --(enable|disable)-nls configure option.
-
-This enables\disables the generation of language files and
-sets the ENABLE_NLS define appropriately.
-
-Default value is enabled to preserve current behavior.
-
-Patch by Zentaro Kavanagh <zentaro@google.com>
-https://crbug.com/654842
-
-https://github.com/krb5/krb5/pull/584
-
---- src/configure.in
-+++ src/configure.in
-@@ -118,15 +118,22 @@
- ])
- AC_SUBST(LIBUTIL)
- 
--AC_CHECK_HEADER(libintl.h, [
--	AC_SEARCH_LIBS(dgettext, intl, [
--		AC_DEFINE(ENABLE_NLS, 1,
--			[Define if translation functions should be used.])])])
--
--AC_CHECK_PROG(MSGFMT,msgfmt,msgfmt)
-+# Determine if NLS is desired and supported.
- po=
--if test x"$MSGFMT" != x; then
--	po=po
-+AC_ARG_ENABLE([nls],
-+AC_HELP_STRING([--disable-nls],
-+               [Disable Native Language Support(NLS).]), ,
-+               enableval=yes)
-+if test "$enableval" = yes ; then
-+        AC_CHECK_HEADER(libintl.h, [
-+                AC_SEARCH_LIBS(dgettext, intl, [
-+                        AC_DEFINE(ENABLE_NLS, 1,
-+                                [Define if translation functions should be used.])])])
-+
-+        AC_CHECK_PROG(MSGFMT,msgfmt,msgfmt)
-+        if test x"$MSGFMT" != x; then
-+                po=po
-+        fi
- fi
- AC_SUBST(po)
- 
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.15.2-fix-pkinit.patch b/app-crypt/mit-krb5/files/mit-krb5-1.15.2-fix-pkinit.patch
deleted file mode 100644
index 4f721d4d9616..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.15.2-fix-pkinit.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-index 74fffbf321..4b86a6f302 100644
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-@@ -5145,33 +5145,29 @@ crypto_retieve_X509_key_usage(krb5_context context,
-     return retval;
- }
- 
--/*
-- * Return a string format of an X509_NAME in buf where
-- * size is an in/out parameter.  On input it is the size
-- * of the buffer, and on output it is the actual length
-- * of the name.
-- * If buf is NULL, returns the length req'd to hold name
-- */
--static char *
--X509_NAME_oneline_ex(X509_NAME * a,
--                     char *buf,
--                     unsigned int *size,
--                     unsigned long flag)
-+static krb5_error_code
-+rfc2253_name(X509_NAME *name, char **str_out)
- {
--    BIO *out = NULL;
-+    BIO *b = NULL;
-+    char *str;
- 
--    out = BIO_new(BIO_s_mem ());
--    if (X509_NAME_print_ex(out, a, 0, flag) > 0) {
--        if (buf != NULL && (*size) >  (unsigned int) BIO_number_written(out)) {
--            memset(buf, 0, *size);
--            BIO_read(out, buf, (int) BIO_number_written(out));
--        }
--        else {
--            *size = BIO_number_written(out);
--        }
--    }
--    BIO_free(out);
--    return (buf);
-+    *str_out = NULL;
-+    b = BIO_new(BIO_s_mem());
-+    if (b == NULL)
-+        return ENOMEM;
-+    if (X509_NAME_print_ex(b, name, 0, XN_FLAG_SEP_COMMA_PLUS) < 0)
-+        goto error;
-+    str = calloc(BIO_number_written(b) + 1, 1);
-+    if (str == NULL)
-+        goto error;
-+    BIO_read(b, str, BIO_number_written(b));
-+    BIO_free(b);
-+    *str_out = str;
-+    return 0;
-+
-+error:
-+    BIO_free(b);
-+    return ENOMEM;
- }
- 
- /*
-@@ -5187,8 +5183,6 @@ crypto_cert_get_matching_data(krb5_context context,
-     krb5_principal *pkinit_sans =NULL, *upn_sans = NULL;
-     struct _pkinit_cert_data *cd = (struct _pkinit_cert_data *)ch;
-     unsigned int i, j;
--    char buf[DN_BUF_LEN];
--    unsigned int bufsize = sizeof(buf);
- 
-     if (cd == NULL || cd->magic != CERT_MAGIC)
-         return EINVAL;
-@@ -5201,23 +5195,14 @@ crypto_cert_get_matching_data(krb5_context context,
- 
-     md->ch = ch;
- 
--    /* get the subject name (in rfc2253 format) */
--    X509_NAME_oneline_ex(X509_get_subject_name(cd->cred->cert),
--                         buf, &bufsize, XN_FLAG_SEP_COMMA_PLUS);
--    md->subject_dn = strdup(buf);
--    if (md->subject_dn == NULL) {
--        retval = ENOMEM;
-+    retval = rfc2253_name(X509_get_subject_name(cd->cred->cert),
-+                          &md->subject_dn);
-+    if (retval)
-         goto cleanup;
--    }
--
--    /* get the issuer name (in rfc2253 format) */
--    X509_NAME_oneline_ex(X509_get_issuer_name(cd->cred->cert),
--                         buf, &bufsize, XN_FLAG_SEP_COMMA_PLUS);
--    md->issuer_dn = strdup(buf);
--    if (md->issuer_dn == NULL) {
--        retval = ENOMEM;
-+    retval = rfc2253_name(X509_get_issuer_name(cd->cred->cert),
-+                          &md->issuer_dn);
-+    if (retval)
-         goto cleanup;
--    }
- 
-     /* get the san data */
-     retval = crypto_retrieve_X509_sans(context, cd->plgctx, cd->reqctx,
diff --git a/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild
deleted file mode 100644
index 3f1ef7523d9f..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 versionator
-
-MY_P="${P/mit-}"
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
-IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
-
-CDEPEND="
-	!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	pkinit? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	virtual/yacc
-	doc? ( virtual/latex-base )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/tcl:0
-		dev-util/dejagnu
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
-	eapply -p0 "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
-	eapply "${FILESDIR}/${PN}-1.14.4-disable-nls.patch"
-	eapply -p2 "${FILESDIR}/${PN}-1.15.2-fix-pkinit.patch"
-
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	use keyutils || export ac_cv_header_keyutils_h=no
-	ECONF_SOURCE=${S} \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
deleted file mode 100644
index 9b63538a0b31..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 versionator
-
-MY_P="${P/mit-}"
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
-
-CDEPEND="
-	!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	pkinit? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	virtual/yacc
-	doc? ( virtual/latex-base )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/tcl:0
-		dev-util/dejagnu
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
-	eapply -p0 "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
-	eapply "${FILESDIR}/${PN}-1.14.4-disable-nls.patch"
-
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	use keyutils || export ac_cv_header_keyutils_h=no
-	ECONF_SOURCE=${S} \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild
deleted file mode 100644
index 94966e19df3a..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd versionator
-
-MY_P="${P/mit-}"
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
-
-# Test suite require network access
-RESTRICT="test"
-
-CDEPEND="
-	!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	pkinit? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	virtual/yacc
-	doc? ( virtual/latex-base )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/tcl:0
-		dev-util/dejagnu
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
-	eapply "${FILESDIR}/${PN}-libressl-version-check.patch"
-	
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	use keyutils || export ac_cv_header_keyutils_h=no
-	ECONF_SOURCE=${S} \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16.1.ebuild
new file mode 100644
index 000000000000..6e6edde5000f
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.16.1.ebuild
@@ -0,0 +1,153 @@
+# 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 multilib-minimal python-any-r1 systemd versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite require network access
+RESTRICT="test"
+
+CDEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	virtual/yacc
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+	eapply "${FILESDIR}/${PN}-libressl-version-check.patch"
+
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use keyutils || export ac_cv_header_keyutils_h=no
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index ca807d81c40a..d37106411975 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,5 +1,5 @@
 DIST p11-kit-0.23.2.tar.gz 1022733 BLAKE2B 09d1e1c9c9cc9bd330923f6aa37026b6f3b67fd728e4fdf2c692f0eaa1a27b1a045c263ba66d57063b8a03f8dc1ccd4d20bf5f255fc6e21d8ea600696f45d9ea SHA512 b665d89f0d752a41b01ec53e29c801c4fdcaf3f21fce524984b10acef0477ad5dbac085edd35ffb747423d0e1e09660b8d29501c979cf54937d3b9d2561cf18f
 DIST p11-kit-0.23.9.tar.gz 1091561 BLAKE2B 9ad061e703f8a7bcf677d974316adc3c96c34765bcee9834e65850b16fd7afa6ab2ffade18a65b99b85ec1af877d74938cf9369797f914d622c15e218801351a SHA512 6a8a569483763d3ffacadf669b8ba9b9be38a77dd8dc366ca0cb91c44753517fa1879d4422e4e8dfbcac594565727839a619566a170c0f94f8e112f18b0086ed
 EBUILD p11-kit-0.23.2.ebuild 1311 BLAKE2B 6f255091c7997b46f069719d8b9c20258ea36cd44bd06907d2620686714c6b8a5e4f68d9bfd5487ea5f6b0a5166af1bcdd3c9b4d3cbbb23641954cc882208491 SHA512 f953eb10926bdee9eb715cfa4333eea30e238f46795caec23cf495f573fd33fd464705de86c9ab9af55eb98d4652c6204dfce578abc854af44343ece85f3c70c
-EBUILD p11-kit-0.23.9.ebuild 1983 BLAKE2B d1bf500c58a8e9b9155507505e42351f406e5e4d6299b7342593b4d00b1f68cc3f377479d24b3e6da4210930c3d0d2e53fd618636073703c1399228f9df00566 SHA512 96d8fa649ee50d939f815cf766a0046432c0dda75d4ef5b827b953fbd9d88d8360b1286a24459b6e8c4bfef5e2c8902aca7c9ba26638ffd21937c7c73b3191f9
+EBUILD p11-kit-0.23.9.ebuild 1982 BLAKE2B 12d3e64b9c5211271bfc6a8f2def055e7cdcff658ca21f878cba37d4bf927bf766027c44946eecd7cd7e3a0961c63140b70b68d9b9bbf04fb8ec4b5170f01dfb SHA512 c2bc6ecec23aa018102013931ae5ea116d60b5682e8739716c07b794545c9ed2e813ec8b544b60c08553e7eecfde1d72d71fc2096dc80658a4575ca9f142be9f
 MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
diff --git a/app-crypt/p11-kit/p11-kit-0.23.9.ebuild b/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
index 501ce2928350..62bc6419cd69 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 039cb9d1eac5..bbaf32b83409 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/myspell-es/Manifest b/app-dicts/myspell-es/Manifest
index 472048a6e0d0..876eee1bc58c 100644
--- a/app-dicts/myspell-es/Manifest
+++ b/app-dicts/myspell-es/Manifest
@@ -1,23 +1,47 @@
 DIST es_ANY-0.7.oxt 1415886 BLAKE2B d7a74ba997abe1ffc2b59f6d8ffb12b652b2ce540f6e5ec8ac60e363a1e07e7b72bee030a24739a93626de45c700fddaec35d1112a20a33756717283d4ee892c SHA512 ea4e015bbaa86865537b0079b71160881abb78f651757aee784e032374f8cc96f2296b0f83081bd2543d35a246a2deca384ddd8a28a37f26b82d306b19ace3cd
+DIST es_ANY-2.3.oxt 1460673 BLAKE2B b7865fae1c555e99518e3f0f5b668742176cec6807753d50587edbd70aa0b88be3c70fd33f7fae0490827c084ef0e176bce41d71e982dc938aabc74aa327d683 SHA512 2131ec088aa4c46e4236b974f77f3a80299f816d3b493816b17eea5a4b7c7b5631efbb15fa3a2bec804db7e6723e02b5a894614c7966626662a5f778676dcb6c
 DIST es_AR-0.7.oxt 1437556 BLAKE2B a6f888d67c147f02c758c7c9f8949cfbcabcd03559b16bff0d409960adfca7f40527935dd106dd179f55efc65bf41713ebbb50fd330427e5313abf9424ef7941 SHA512 2c996a92cd3aba6edb979641025e45362d8079061423296430eaef113354f14defdfeb1e23c1d0b8a8157fdc914f07e7fde8c51560091a389e242a5b68552088
+DIST es_AR-2.3.oxt 1414045 BLAKE2B 52b898d26fc384a579147e0d20f34e0591ab7a4f13feb35a92cd070a9aa3f972f971ffd8025ea4a438570100300e163af4ed4cd80ff108ad1d31ec62089a1062 SHA512 c28217ebb49bd94b808787953440ab9702b3d46e0faa43e39f25e9dfbad915e4310be6fcaeb7ac16775bde5ea73641db79a53908dd11e9d16321c041afd4925f
 DIST es_BO-0.7.oxt 1435774 BLAKE2B c5907b14b157c1a48e29eb0d794112adf1578d73cd2bb7351164c793ab58da46387106b9a1b58be4024347701ba1c72f7b3fefa8ea3e2e984a06ebf2c309e26e SHA512 04549045546444c84f623552f6264d17ffe4cadd77f81b8e2828978f6172e275b203eb83aec1dfac17acbf3466cc3562d825071116de6af8c52510feaa7fc9de
+DIST es_BO-2.3.oxt 1411131 BLAKE2B 95510383e378a28d26bd4f58d479b1f419f6636e66f73562cb376b8422388b2c0a4c2cf8cc58f48d11dd55acf680498c9bbb0ac412bf3cf9ce9a63ddf8109ffe SHA512 ee15be0b8e96ffd2eff6c3adca60db9cf9e4a1eb9c6af3da29c3874283153b00c4c843313853c0bdcc277602fbb95c8d3e8abe15e25596e92804499e5f083590
 DIST es_CL-0.7.oxt 1436928 BLAKE2B ef1596c311a761cfb87c099ef54a88f89c3fcd755036268329bbc8d9d01de46c73d7890ccb376d3acbb2c838394c0f48cf8afe48811b8af95d4cf44855073f38 SHA512 13ff5459f83e06aba63e248fcd024aaa49afd38a65ff04ffca5a833e3f8a828cd3dde60629e8eb377ee6bdc86c5e686fa65867f2223b1f0861a9dc74fb020263
+DIST es_CL-2.3.oxt 1412287 BLAKE2B 14435cd7ae8700b0134c9e0b504c8fdb15c26a2f393167117294414243a98281f7d0620b719ab2fadfbb95bbc04fc618fc849b27de1a2010056e74207a2982b4 SHA512 824a38e7d508c1b3aafc7f9fd0173b9d752ec5edb9d07c40b2affca693a73f73aff5f816b45e901b67efd365dc34ed86e15af6c118173d8b1d5f39eb277d5bc2
 DIST es_CO-0.7.oxt 1437795 BLAKE2B 6da274fed6c1a272ae63b434698f2b9843428ece9edd9bef558489f5c88d8247e5b861b4933802a57fc10406b639c2559b024384702051eb1bd169c1c1c3879b SHA512 b071add498b9c60bb1db94dda7e2896ab109165d65142b4ac539e88434d9880b7b5d437769cc0475ce432f45b1832d648bed7925adc9cf4e678e183f5cdb5374
+DIST es_CO-2.3.oxt 1430059 BLAKE2B ff9999eb44326a53b16f02d3f63aa3bdd6f2df56f94dca6a3962a18b3161b889146746e6437cd39ce800314d78bfab41c6967dbcb837e17219490490371d9791 SHA512 3a709100eb6cb15b5f1bb20447372dbc67bd27536fd6515b9b1f35447d1b5bffdea0f0b9aee42ba43f81d5c4f5b5c857749ee86c60dd9590bd48df3c688a446a
 DIST es_CR-0.7.oxt 1434858 BLAKE2B 5e3c7e9d19da1fae59e7a2cafa55dc956ffb324e0447edc6ded94f3d304b1be72b3fe17ace1a586c0d364fa49ae4ec52ca16a27044e266db9ce9e0a0f0dd829e SHA512 1ed3dc04e5bf187fa2ed4a4f8326537760541ef38d60abc33d729961eeac75e206e7e50dfe3e85bf0053e42a7307779f2508a16b04df5e4ab2752091182b2a68
+DIST es_CR-2.3.oxt 1409988 BLAKE2B 8064c0c89b25cad263076bb307881c4ff13d694081c903c111f7312b0bef824c3687b0cbe6453f7c67977082c0f793379632d300dacea31b3d70deb63efa1772 SHA512 a6c2b65f0975e554dd35465113b21a0b3821ed51028c68f52b2a72ae6b2796e43b0e7f21b1aff7491186d614d1b997a9483371a93e3a77bf12bf81efaa5429cf
 DIST es_CU-0.7.oxt 1435506 BLAKE2B 0d23267162aad97ad8098c203c3946ae322f9eb15a99072874a138bf0aa06d751ab25eb69ab8c821214595dd9bb37b5a72179c61ac637e15dfca08e4dab3809c SHA512 b60fa3d092512e43610695b507e4e2c09065bf9a2c50971c9a8074bf93896e19d512847aab9190b2215da4481e514ce7fe23a851d27eafc24704bc7a3f4756a3
+DIST es_CU-2.3.oxt 1410740 BLAKE2B 73c6e7f3b80069e447d9d583df95f9269f8907674ac2011448e3699476810c70df80cad30360b2d64b7c71885bef3105e2f2dc7f6614c580f537a4258a7183ff SHA512 a6098f7521521e84373d143c423265e8c87e7e7b8ef328d16e4a9da40ef54b5417d19e86539753c541814cb040c7cffec07d7d020715b9f68409e3312a37f155
 DIST es_DO-0.7.oxt 1434782 BLAKE2B 225c30dfb78a1cae05aa50e157d9ea8a380310ed6b45ab2f5face2d1c466eac7af6ef88b00b501f5af138147a575a6044802bf25500838975c1ede4b5adf4054 SHA512 621be08835598664de6a6f1e865c1293ee62d0581d429bdc6675991838483d9bfd9be38d08cdbeab8d03ad7709f20dc2af38ad054718fd6e2b74913bfac1f5b6
+DIST es_DO-2.3.oxt 1409943 BLAKE2B 34b88b9202761f34d706a64c9243db2c8f29e63a8e7679319e60b77896a77df2ee292e7e123e738a266a5048934bf77b3e38d4ceeb2dd78bf4dcda7d6c6e69f8 SHA512 02bc65cd2d0cccf50bc3ef027356b759a6400531e809dda8d4bdb33e15b3b84d6a2274b6a38c0242c8c7e896a2b8515ca6607cdf2b09786140a9753867be952e
 DIST es_EC-0.7.oxt 1435564 BLAKE2B 7a8656255361a014324dc37fa9aa1e1336c207b3e0a28f88ce6b0064de0d3d8e98901c39ed9d5910f91c4c08a03b697fd7634a01b00f0b34cc7e2e8b6a314958 SHA512 30bf5b228ddc3afafd6e17e0ecaad10266f30bf1738a7d67472112bfb5f08cef29e681f63d3613a6fe71b0897b92a9bf9eafd90bf0d50f4f81697828fc6b00dc
+DIST es_EC-2.3.oxt 1410704 BLAKE2B 3cd523b8ea3a521aa0bd2bb585bfe6cc9447781c83f96ed20c807f1da1f9e7370606ac38acff8e24148799db6a666c1fd1b5edccd56d2e17c006cdb0537cc4a5 SHA512 5038d08e4b2f41d51a0deafd7948eb05de33b641e10fb1e7167badd823fa9dd7844c2e0617f0cf102f3818ef761fbae903b596f82d9576c288f33233f74e2362
 DIST es_ES-0.7.oxt 1438691 BLAKE2B fa0cb94cb3c36c024ca66e7d7314c21ca27d17b0d57241d44c7926c773a34c1b1809c540bfb3a71fe55e5f57c47700c024ead3205b43cff52de1e3cb88362ba5 SHA512 6eb23eac189d6e0586a69b2e68c6aadf5eeb6ed204d222a76bff955604c0d7f6c55fd5b195959a542357d943da73eb0390d60b38bb07eecf49e73df28f586f51
+DIST es_ES-2.3.oxt 1416213 BLAKE2B f68b9c18f40dab2b84a6bb2ac1f5d9d4b9c153cedc2b886423f86380c67c046908a4ae05e6a9e88ce669b92469c6b97bf3ec310855b3458e0929fc436fa70a95 SHA512 566f22be881024ff45b2a20b69ffb20abbe4fd144fbd18abfa292e17e0a2f73a18b7f0459a2f4ef8f50832b2ce6974830ffd7de5674378202124641978b8b5a8
 DIST es_GT-0.7.oxt 1434939 BLAKE2B 028397a1834a229ad1c888d03b6a6d700d2c8006a3c532c5be82cfd51d00aa1aaf06fc5091c90c2ab24cacbd21fbbbaa311ab7d4b46da844f25e0aea19ccdd4d SHA512 162e59309532e6cad7ad49866375970b3ad788a11ae6b63ac9c182da5aa50948139c0eb9f2e727909da4744a095099ab5bb18ee2f73b0e1c63921dad8dbca4ad
+DIST es_GT-2.3.oxt 1410064 BLAKE2B 7ff365cd68482578afd87ba6887279036bd9f7e434097cdf3dd9dbc04e1ee228c56894a527041bcee4d958f2ca734e3a67527bf68bfb6d2b651779d1efe864dd SHA512 1090e0ba07e026fdfce65fc4ad75fa4fb4c9ac13172a5acd94e4549b7347c482f0da0a180e7d057807c93170ac03e258e17d75e9b2455b3c6e2011aef6079c8b
 DIST es_HN-0.7.oxt 1435398 BLAKE2B eff8ce7278b6cd8b1306d3c777c4fbe988c31384e4bd31febc7941e0a2e1cdadb1838bc46477e275cf991825a2fa946b22cbd3ba53bbaf52755722479addeaae SHA512 3d8050c22d27a32b5ebc72862ed7066b3e58083c9cd6847824361d656ba4f8b122121509bfce303edf1b3b0a0e9cdd31671caac28662299879eb1cacc19d81b1
+DIST es_HN-2.3.oxt 1410551 BLAKE2B 2b62e149d8a73fb015b3e6d658796818409fe04d658b5c5081f45f89d054093cb4397fe3a0eb37d8847eecbe9832367b1807ce01ba523b4f7f5d6c702ac879c6 SHA512 4ba1f02228d436a4f4d907381841213ce3a42fadedd3cc916b665b506d1d112bb23aeb87f40147eaf619e919b9b06d58a8aead018edd3bb73593fc429bb07e02
 DIST es_MX-0.7.oxt 1435177 BLAKE2B b10c5d40dd3913b42b170adf38abd9cb10860610e395768191701c3754c42b8fd5df2bf8b52c69c172fe384d19df3fd7d2439c972d1fcfcc65ec5fb82c69b367 SHA512 6e560d630da72f627c0f5a603adc9bacb102edc106c9bd7ca831c7b4c808441cbf73eaa3f75c5953b89548d071a97e81fa57d5b2542e0be6c6d993d74b09020e
+DIST es_MX-2.3.oxt 1421023 BLAKE2B fc1c7fda66f66189af3098f36faf6b8f5e313931ee5d490be83c580bc7707fd0022bcec361707795071d262a4cdfe6eecdb2742d7baa5d2fd43fd9dba6b09b51 SHA512 10716a744e9889bc3baaad6163c1dad06e6756dbea95166866834480b562c0fa5abce01bd2d5e4b05f19e522e1726e073dd7afef3a9d8e6bfc0d2f4b28bd0a2c
 DIST es_NI-0.7.oxt 1435054 BLAKE2B b58bcabb0c5c033e6f5f9c27c69ffeaebc5dff0984fb447b273cf88cc93799807b48ab07f9a901815cca497fec8870de5c0ccebf1091ea264fbf6edb63d0bbe8 SHA512 e86e0748a04ed3ce74f4309764d08063c0e01b9f1568f1de7e08bd8c22cd2d0ba6a3dea3afa272d2d697644bed8e0fa19c7d7940fa87393de30fcdaee095e483
+DIST es_NI-2.3.oxt 1410217 BLAKE2B ed401084f3a025abcd812a6022786682f91e2cd02a34ee37af0313703eb3d634506f5300f9b50b44004b95ad6d5906f593b21322ae6b5239143acbd0855e0927 SHA512 598896a853d81d1424e4927df634ca0e40c0e774a62e0f29bc1105d63fc586362c10ccc26a5f3becbc134a7b041272670bf971ea5bedb121f37cda5c7ace56c8
 DIST es_PA-0.7.oxt 1434970 BLAKE2B d87cdf1db1dce6c1a23acf9c2fb37f1053393755940c0f379b9ac56bd3f1f4abf070f66042fb43c2f96773afd9e07376d9706a6fb4cd2dd2f2432bc8ff60814d SHA512 172898dbe6a9b6ebe767797e08952af50fa0148059f215f4662c215b0df1b6333dec6d81bd3c629a538a96cfc571ed4ad1337d6a9e6d7bb941ad0a609a8cf588
+DIST es_PA-2.3.oxt 1410102 BLAKE2B 59fd0f5d657a2b3bfc6e9b878ed2b75b8929998d6f1b2d050273e0a2847e80bcf055ac4800975441bef225dfc556e7eced368f3d69ca9619e5bed42078d70cd7 SHA512 d54856ddd5a7af78813f4fd15f49e790682a2fb699557dcdfafd4cc94ea1794b0d641eed7dbcac4c2f9360ae673f5c51654f0240bd9e9ea7260ce84819f85526
 DIST es_PE-0.7.oxt 1434282 BLAKE2B 824243d8351192a4c50c4d1729d9bc927adcb618376665e5ed00977e6079002db9f88f72fd3d74b80a2b2f2f07ea7ae605676b42e28efa6b4e91a42c5e98505f SHA512 60ad75c363fb3e5612bf8b423975aedd32b7738073e0e863c42de3be7d22bf3a050d3d09a5a8a6a65ad8e36fd7a516f1c6c3775f9ad76696657d9eb8a4e2336e
+DIST es_PE-2.3.oxt 1417405 BLAKE2B 4cc5894c8cb199fa08c7f46ef3a5505a64b79e27d004be1bee7119207732aaed5fd965ae1bb5e5d7c2044f0cc2bcaf417a889b973f7f202e9c296f113232f64f SHA512 f76cc2fa18cb509bead6a5fb27bdb9007e54806ed8d130568b33154ede14150dede81248ee46476d4bcbefc349c78d566dc15e7c58a7c12d7ccf0a1ac18fcdad
+DIST es_PH-2.3.oxt 1442511 BLAKE2B 718441cac52cdfa979bd65f5acfbecdd488d1e89b9002b89ccb6ac0c9bfd25a6f483fc29d3d413afb949e7a74d53859d66471b0b5f945cd0563cc6f941f7e25d SHA512 d041cb89e89b9509150fedcbc39a317ce0a42ac72811e689f73879c76db264573899fb40c16c314374911b167c1f47c573ff97ac83bc88c659377f81bba511ee
 DIST es_PR-0.7.oxt 1435436 BLAKE2B 1f9af2c0f24dca0ac94d256438210b9ba6a21000469b0a88d4077c977b049303b08cd26744a765af9f8b1e48104cd995a4cec5d69bbfa7be7e9c74147626e695 SHA512 002767cd23709a3b2dd2a2616642fbb1b1d674a21507ee21c830741e04234fc32b0fd6a8b762c24183d44d9f7a233c8304b580ff3d96b7c87b10f43393e3a604
+DIST es_PR-2.3.oxt 1410569 BLAKE2B 1c673d5602a5347529dab58562a00c96e4a4c7fd02f2cfbad50ef2cb4bab35f7121a030264a9db46dafe9faa6f8de23c9feaacacca576dc4575d9ff734e2bbfd SHA512 92e6d9f16bd63696d64b8ce214c3fc19721ad3a17b2b5f82a2bf38c5ca42f42a62d9c0a06e1668e5ee7ab076781ae794e9a9abd40a564d36faae367d0adf28ef
 DIST es_PY-0.7.oxt 1434869 BLAKE2B 88da4c119a88b7a0455075da6a0a972354a303c2ff86e91cd71da0a21cea12961554ea2da72aea71c72dc3dc7dc1dd45c7a1b089a86067ca1c4693a7b579403a SHA512 10d785338250506ebf8bf3a8cbb79413c817e4e25f9153b4b8af9c0a7a422079d5d2bb9411e4989ceb7503d0a65ce926352af242bfa0a3de9c23e3dc6ef889c0
+DIST es_PY-2.3.oxt 1409970 BLAKE2B ed133f59c0a50b7aa4ffb0dca3942e6f0b4917e65428933f831b15d5ebefc3a1fca3317b85da84c5f6d99f9868071060ec1bed237709560d0d5853f2fe4df02f SHA512 885af32d996aa88dcf2848b3edbd13043c6542cff78c0ed8bb52f764b73843f11abc6572a87890c69ec42a5a5baf8c20c131a080d8d7df6e9327d02cbbe38a33
 DIST es_SV-0.7.oxt 1435063 BLAKE2B 031f65260cae0d74cb1d7e6cf922a6134ebdb0a85f91633f3e37a4fc523a04ef49931a1267f39068e5ee2748c501f73b9c17d5d0edd20f0f881d04642973a1e7 SHA512 30baf8e0191b10f107914728f09c5d193264932f4a78ad7cf8ad55bad9e80ae9cc42802ea69e4b5cbd5ea5871a8fb45c04728b29d51e2d4f24a9e4c1f1a62d57
+DIST es_SV-2.3.oxt 1410203 BLAKE2B 1cf9d6715136b9a509a0ebce7be157b792446c4132b62b657cd3b5fffb1a227231794e9e802a8e0ea3e22c80f6e3dbb79fb25a01f818744f338bc04fef224979 SHA512 56c3ecbac7c2a5b9b8b6b848060a094934badc335d0f832f04b1b9a0ad262b2de5c75e1c05a05520f3a7b44791045635df3499d9fa37f812a2d7adc54321336f
+DIST es_US-2.3.oxt 1411395 BLAKE2B 350c53e62a49eee1b7c3c465ef4c7d7e1f846c524ce0e0e55244f3fd9be88fca50d0ff9a67db0959af074fb6e0fc4e596587063fcc16652a16ad13efd9b93be4 SHA512 eaae90c940c3c76616bd57a52f1c8f7d61be46bb4a54732befd06d292ecf99d6844f6ae02fea214647a9fb7f83c7ce12062608214c67a284ac07155c979c0093
 DIST es_UY-0.7.oxt 1435883 BLAKE2B 3880e74f3184887c5b73b10188e8bbad87501d9001a066b27e64fc5dde877b68d25eca5fcac9a16ad331bcc890633bc19b0e91f5c2576b13081c1212eef89102 SHA512 ed0cfb3c8d097e4c56f92e239c6f27e1e794baa2ab4b81fe6eaa03dce00716c303d8d3bff20e163723c8a885029b9ae3f9e10d232d5c94f344b1a36261b86f1e
+DIST es_UY-2.3.oxt 1411016 BLAKE2B 51dc5d52b13ea15432669c7bc518ecea0e9c26df0245449c8f17e9a4b3d5b4b14c87052827fc96c7780b21f6597c08c36551316d705d84dfaf90d7ec4c7aadbb SHA512 a6f19361afb5bea47ba823c69ad57577f311ba78c7e43dcc3216aece1e7baf84a8b4490f13c582d5b1f1f3fdb16b48850d1d7adc882f2d3b5b39af65caf86ac7
 DIST es_VE-0.7.oxt 1435033 BLAKE2B 4b0c3bf2d0b4aed3db2d2cd2a895692a9e3ffec16d0f91795f2f8f462f22783bd4240359670ce0f0e35383d0b0ff1f78c3be130134604de6c9b3515f63b599ca SHA512 e70ab6b64931dd0f572625564295844d471e68d0e6d38dba5e2c27646d5caf416a412f179e31ac647ace9fcc673a40727abd1375c1edd69d80246b4888380969
+DIST es_VE-2.3.oxt 1411856 BLAKE2B d746113298bce3db8c8c4d4ee8caf369f809ef73971612fc207470ba1ebfc67521235e855fa6243d2b6850184f273723c7d83a0b8d22293c3abd9fb550826ff2 SHA512 4d10b818e4d00f60f07f9f64d519b02f549298cfb1da6a344504cd8953fb54793607c662ff2f0505dfa9924e1d1ba45c1ef6d2d6bc4cf2d37d3d1bef99078569
 EBUILD myspell-es-0.7.ebuild 1237 BLAKE2B 8a567e251f9bda7d627937e7658e583a08f43f6a6c227fd04411b33d2ead5c9bd55ce59dc45bb1f562129041c3ac184e4345541cc9c664f4121e4a70436e38af SHA512 86867d2ed2f2d94db05b12ee42c7432f73f43371068fca4654845ee197fbdc2dabfb8b51479e3a6e1e2f6f4a44be05b37eeaa21fa2566876cf85c778e0bc4b83
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD myspell-es-2.3.ebuild 990 BLAKE2B d2b47ee6ebb36232ffc8b23c4cb4bba9c7fb73409dee3363b1de83d1660bb8df50718a11d3a37a6820bfdb04dc8512783622174f06e4209bebc766fc47f433c6 SHA512 33c29c593bf02119062ee03ecb6b787f09efb177a2474316c676fe2e2605aa1bcbcec788e12c47e1cfe174655e28a70d75a4482834ae915565c33d9003b6a171
+MISC metadata.xml 365 BLAKE2B 36efea9be90b8f961b59106b4b60a02fa787ed84f639c68101d093a825d10dfb7ec0e46a14bc47cf6d7b271e039f7c3d7103dcc2bafa60a4a69e185e8f9c8908 SHA512 728f0f7cc5ff04ddf7724efdabc86b7e767dfe5e4383a266547360f712a583664355ee5e528366d42300c2837fb5134cb4708c80dec10014bb9fb69929418e51
diff --git a/app-dicts/myspell-es/metadata.xml b/app-dicts/myspell-es/metadata.xml
index 6f49eba8f496..896f786eae07 100644
--- a/app-dicts/myspell-es/metadata.xml
+++ b/app-dicts/myspell-es/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>boris2.9@gmail.com</email>
+		<name>Boris Carvajal</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/myspell-es/myspell-es-2.3.ebuild b/app-dicts/myspell-es/myspell-es-2.3.ebuild
new file mode 100644
index 000000000000..93987efe68b5
--- /dev/null
+++ b/app-dicts/myspell-es/myspell-es-2.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MUTATIONS=(
+	"es_ANY" "es_AR" "es_BO" "es_CL" "es_CO" "es_CR" "es_CU" "es_DO" "es_EC"
+	"es_ES" "es_GT" "es_HN" "es_MX" "es_NI" "es_PA" "es_PE" "es_PH" "es_PR"
+	"es_PY" "es_SV" "es_US" "es_UY" "es_VE"
+)
+
+MYSPELL_DICT=( )
+MYSPELL_HYPH=(
+	"hyph_es_ANY.dic"
+)
+MYSPELL_THES=(
+	"th_es_ES_v2.dat"
+	"th_es_ES_v2.idx"
+)
+
+SRC_URI=""
+for i in "${MUTATIONS[@]}"; do
+	MYSPELL_DICT+=(
+		"${i}.dic"
+		"${i}.aff"
+	)
+	SRC_URI+=" https://github.com/sbosio/rla-es/releases/download/v${PV}/${i}.oxt -> ${i}-${PV}.oxt"
+done
+unset i MUTATIONS
+
+inherit myspell-r2
+
+DESCRIPTION="Spanish dictionaries for myspell/hunspell"
+HOMEPAGE="https://github.com/sbosio/rla-es"
+LICENSE="GPL-3 LGPL-3 MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+src_prepare() {
+	# remove license files
+	rm {GPL,LGPL,MPL}* || die
+	default
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 679e34503887..9a6f0628bf8b 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/gnuplot-mode/Manifest b/app-emacs/gnuplot-mode/Manifest
index e1efae547333..16b7aceb6266 100644
--- a/app-emacs/gnuplot-mode/Manifest
+++ b/app-emacs/gnuplot-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50gnuplot-mode-gentoo.el 347 BLAKE2B 6a72d3ac75c8ef7629b8c018f9652b924137f56feb7c1578d7d5b572846bb22b248ae569412e7d9f6969ce6daca4aa21debccac7b7d5b63c4c66b04959d72836 SHA512 eb342c60bee1a9e45a50373093207545b8b37888432b082afb7c4f0911eed08481379094ee5a73888a03a12898c3c41016c2d9161f92a1a7cf7be7f2010c1c83
 DIST gnuplot-mode-0.7.0.tar.gz 373475 BLAKE2B 6aa547b90922fa445de10825ae8f0c05249a335a1cc531118200bc49c4b62f610e07a7c5bd694a3c6bf6605b937a520a8008d67263d2e83cabf009fb855e7a97 SHA512 fdf04a3a32755892d422de8a535682ff44d1b635ecdc814738564376f5c7027a82c23807439835f2b7bf959f4f8b7a7d38d07a643f84ab2056ba187f3558e596
-EBUILD gnuplot-mode-0.7.0.ebuild 1001 BLAKE2B 68ab01795ac21618d6ac9fd42b1a2e1111c3938d4e52472a63dd6b3fd0dc97825b73c917c7beb3a5714983ae7c2d65adeb48d1396ef10806536ad8c545b99313 SHA512 84a0b4a56992b71de80146ede290aab97769c85c979557aaec243394d9ca460a33c757823032e36ce66546bfb379a91300d99998482e39827f002cbbd2af9d95
+EBUILD gnuplot-mode-0.7.0.ebuild 1002 BLAKE2B b6d2dc95275398ff12d94400fa30ad5b1a41757485bbad24c1b18b41ae94051af18b2e3d99c3905cb9d67feb115b3fa04a2bef57e37d1e8e35637d120f91c0ac SHA512 37f0ceae8aa23dac56e0064baf6498c1e0aee61ace0469f80d71051dc8a110a2e6c99796f71456ab18f2aeed030f783cc0e29434a4478e6fadf959768d5cd9a4
 MISC metadata.xml 345 BLAKE2B 3cf5d1b795525d5bba010aa5331451e01c96662e748b157d63a06ae96b6a1d955a2fb8a5eb549ed06330f61e01e5765850449b56933e137e59425ad2d4e3aea9 SHA512 842a05f202ddeef73dbd3bc63dd95ea85dac06dce89bbe1f568779a5a5a4821d8eb0a2209e3416a8ff9428bf3b2b73fabb74a20912066225038dc8db6e6c4901
diff --git a/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild b/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild
index 25a40ede0ecd..1a90fa983b9a 100644
--- a/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild
+++ b/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bruceravel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="doc? ( virtual/latex-base )"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 8ef347784e61..70db7330648e 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index b125365424fe..a45eb4919970 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,9 +1,7 @@
 AUX free42-2.0.10-fix-build-intel-lib.patch 618 BLAKE2B 9039cdf8c78ff198ea9a4927621f7e23f362fffbd537a0a988030713fe061398d2b7b2fc6120cda280249807d9aee448095b1f5cdfb824909d7d381650daafbd SHA512 192eb5e78c50ce52449c5b859369ab7258a98162c5d924ab8b8f3566f52be7a3c4aba95c3cafd60af82d5dcf1b1ad784cf3fe6bf432839baa1b4ca994ddf416b
 AUX free42-2.0.10-fix-makefile.patch 1670 BLAKE2B 6170b3a2a1f397ab10f1d36fe26f55e2c430066fbf7f292240ee359d38b670b68b9f17696f466e4f913af314662de8cffb13b211adbd0977cfa20b331fe52f8a SHA512 8b234cd643dd760b290c3d6054afa799371d249dc23eba889a168eed413037b6463e5f2b1219b9dd4c350d3338aff5adf27b2ea413d229b961ed40d8388c6617
-DIST free42-nologo-2.0.10.tgz 7389429 BLAKE2B a633a78ed5974e327aafa9d783c04bdcaa895940580c595c9c67ab0181ec7000efaa92021a485199268341f15f4c4bafe3964d4118c068e8abbfa2f358045b5a SHA512 4f03b9b206ef17e71295f0baac96ca26f34a00844cee6cad254f8ab798d3d0c724788200f3f207a3301f62eb0960707a23e6bcbb2ac924a78b0f0e1c78e70e6d
 DIST free42-nologo-2.0.17.tgz 7389996 BLAKE2B cc7c7bbe43eafc190fe0ce8921e032c2042290fe54a3153ba7568dae315de1356a9ee7f8ded4528788c677537138a5bd5556ad79dbd67ab8e41dd881a258312e SHA512 f73bfb2984fa4301c04d905fde6723583a57a1f663e012f965037067a7259961c0134fecb456118ec4b45956f7c8ccc16f0ec1db62e4cc705dc74ea563225872
 DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
-EBUILD free42-2.0.10.ebuild 1058 BLAKE2B 2aea0b1798c337318ea685808d0f2c44f78f7730fd5aebc107b90a42c4b1fa8a9924c34cbd2f1e494087fd5033f6071cf665c63e2289ad1a23568b2210595d1b SHA512 494fec4edfd65644cb55c53d31ab4789f2dd5cc051529fcbc8bc909eaa4a305ad02143b2c04745cdd11be1a0b7dececf2c595907ba883bbb39e7a1929b8f1539
 EBUILD free42-2.0.17.ebuild 1058 BLAKE2B 2aea0b1798c337318ea685808d0f2c44f78f7730fd5aebc107b90a42c4b1fa8a9924c34cbd2f1e494087fd5033f6071cf665c63e2289ad1a23568b2210595d1b SHA512 494fec4edfd65644cb55c53d31ab4789f2dd5cc051529fcbc8bc909eaa4a305ad02143b2c04745cdd11be1a0b7dececf2c595907ba883bbb39e7a1929b8f1539
 EBUILD free42-2.0.20.ebuild 950 BLAKE2B 9bc7e94b50e067507c33a467b99fd860c88b4d7cc7fddbd949a05b6584bd21f08657c22ff9c7d33cbf1ee5898d830c973d597db94dbd14e5895b1294e0c272c0 SHA512 c5e9ef21556bd9580f304f88c28c76a019cebafc340655152a02febc4e5ae87dbc9f8966e57b589e1e0020ae02166fc9e86fafecd74f3966b6672407c13482be
 MISC metadata.xml 540 BLAKE2B de6a28fadb4dba9dac7c9aadbbd0972cb9583c8b1aac154ed9247199287c060adbf5df8a0639b7e4ff218da84a5e1c19e855e2c11688124c76c1cc07fca1e393 SHA512 88a7488f445dc2233eecb68e9100751da821c45ddb6c60a18600dabe7278681a3625abd59ed7088bc526d0853529c98bb84fdd76796a5cdd4a5379bd6e17b7cb
diff --git a/app-emulation/free42/free42-2.0.10.ebuild b/app-emulation/free42/free42-2.0.10.ebuild
deleted file mode 100644
index 5d440a08b23e..000000000000
--- a/app-emulation/free42/free42-2.0.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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}/${PN}-2.0.10-fix-makefile.patch"
-	epatch "${FILESDIR}/${PN}-2.0.10-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/libdsk/Manifest b/app-emulation/libdsk/Manifest
index 63e16144d23f..ef3502370849 100644
--- a/app-emulation/libdsk/Manifest
+++ b/app-emulation/libdsk/Manifest
@@ -1,4 +1,4 @@
 AUX libdsk-1.5.8-include-sysmacros.patch 676 BLAKE2B 7617b02bac41a86e292009b7a651eb3bbc94b3409f8391c9345ce74558d9f526c7f1210c80e0d738d57a867f6cb3f6cb780ea6aa37a911eebc3a6be7671c78f4 SHA512 d4a38e7be2f3835c14c8d2be9dd4ae6cd75653efe65b0276e3f009895e35b257b0f819a711f1ac623dfe80d462676ac4eccfaf1ac68011db61e4992dde2450f5
 DIST libdsk-1.5.8.tar.gz 1212684 BLAKE2B 52a2687d8ade0378096215d362df21b6eb477b3304910bb98c56264fb05bec6ad2d2b7254dd132fe50e60d5179b4875a1a91088f8ed93f68886054bf1df060f4 SHA512 6bb332dcd58b88272130a950ed686852f66a1e97030aaa280db3bc65a7f82513d57055c2cc3e653e1e06843c453e46a52ce280b45b42c0bb671d1e0f6d7c9520
-EBUILD libdsk-1.5.8.ebuild 531 BLAKE2B 17517364097e44f51c6d052d88cc419e666325b6267d6275b08178bb6596c3bcc52e96d1a465215a5283a0ff7072792dc33c54132e8710565c0fae7d15e22112 SHA512 21680fc3205934cae2beadf503f9e8a5d6aecc446fcd6b10a6572a023d30f47f8bb12e7e11518e0531d51457e5d8cf482f1178a7b0e6dcd1da2460515b893351
+EBUILD libdsk-1.5.8.ebuild 530 BLAKE2B 4e12fc310a2811544f86d8e765ebcf1b8732a542f0797ee07d1757ac31e5222752b7a32edb136b23c3f9b513d3ef01b664b821a0c5bfb4b6b5bcda6181c9bfb1 SHA512 b3e8e84abe69c827d8ee0df45dcec1488a1fe0c39249b8bc073b2f617bf0b5b550ed70c0250cdb12d1c16976f9683e29c266f26425004b93588bf938f67b5d80
 MISC metadata.xml 250 BLAKE2B 4d107336753f39398ae054c9c143bd7a5528a3cecf12ac4f32ba37b2ed15ccefbbd4462239b98b5b239fc3fd2588ea313c2e68c06e889a16a16162af54348295 SHA512 edfbc7db743ecc341349b3ebd5c1367e100dd1999194001f6de526be5fbf340daf8ebb9a70b4b4b069178219c37a8c4e161afc2650997070dd3be113d091d077
diff --git a/app-emulation/libdsk/libdsk-1.5.8.ebuild b/app-emulation/libdsk/libdsk-1.5.8.ebuild
index f3f60beebc78..e09295e8440b 100644
--- a/app-emulation/libdsk/libdsk-1.5.8.ebuild
+++ b/app-emulation/libdsk/libdsk-1.5.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.seasip.info/Unix/LibDsk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc"
 
 src_prepare() {
diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest
index 448bf87b2c6b..3ee22499145e 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -2,9 +2,11 @@ DIST nemu-1.1.0.tar.gz 52456 BLAKE2B cc8d0619aaba914cd182714ac3b3c63add58d92ac8e
 DIST nemu-1.2.0.tar.gz 61953 BLAKE2B fa5c323b5d4808c812361ec49e1cb4d91f12f0da102a80868ec016d5284806d4fabb3dfdc100b43276bba71f03534b9c1703c2ef57c044e4ed36d7833506c64f SHA512 a91c31c4161369d42cb1b9e66c312db760b899c5f444a4d1d22cda39036a14b1a2c83e6fee5470282e13555771ce6704258da0ce6f76ae10343bb5f581eab514
 DIST nemu-1.3.0.tar.gz 70769 BLAKE2B 73108346c70f7ececd2b20cc91da323f2ecb40491400cd135825b44cfa7dbd3285b3a6de36d815c46d9655a7c23571084b321bc3deca5a6f564dae852b846120 SHA512 0ca74a3d0ef1f8032d74cecef71518c18b839dcab5deb2ec221aa47159bf40345517d1b8ec80bf1ff268b9b7dbcd90301ad3594583ddf75d517a23545db23c26
 DIST nemu-1.4.0.tar.gz 84398 BLAKE2B 46ed3dfa392e8be472047612f4131e80ae3675c30b975320dbd21672bb8c5b3fc74dc0c5d1c4a5397f04c4bd725902d3f9b7d10808cab10fc89bb8199568cc10 SHA512 262b2eb7ead79b644110ecd4ea1858ef8d9775f3076e4df9f9c83149c148baf2b6db4645395301fabbda07f1e9e5577fe4f56a7eee010433ce02aa298fcee1a5
+DIST nemu-1.4.1.tar.gz 82891 BLAKE2B 2f2d85631fbde50513b56e86deb87c7ab8bf5478473ad8c1d3a5e6f276ce2a6b476667129ef3ee872de825736d1765d30db8a393c0a8e8b4308b6b5788095334 SHA512 b96388e3cf5106a21f189b375cedcb23f885b0f24c3c9b0e54bb51c04299c061ce2890b9dd168deb0b3afc70effa132e673f1475e42278fc6a6d703f7071c398
 EBUILD nemu-1.1.0.ebuild 873 BLAKE2B e12690f1d1126c8dfd810b599e9b35e4ef8d01411609009761df056ae1c297f0ef0968f2e4a5e1a8ec6d905e0bbe168a3b8c2b8d478657f1a3b855512479374f SHA512 8639e85e33e4941e3425473e363c710d8e0cc1a09aed00d31c12a349065ba3be98392cfdb3fb2d82e1381caac17a07f6862733aed0215bff931e4dd33930a2b5
 EBUILD nemu-1.2.0.ebuild 873 BLAKE2B e12690f1d1126c8dfd810b599e9b35e4ef8d01411609009761df056ae1c297f0ef0968f2e4a5e1a8ec6d905e0bbe168a3b8c2b8d478657f1a3b855512479374f SHA512 8639e85e33e4941e3425473e363c710d8e0cc1a09aed00d31c12a349065ba3be98392cfdb3fb2d82e1381caac17a07f6862733aed0215bff931e4dd33930a2b5
 EBUILD nemu-1.3.0.ebuild 873 BLAKE2B e12690f1d1126c8dfd810b599e9b35e4ef8d01411609009761df056ae1c297f0ef0968f2e4a5e1a8ec6d905e0bbe168a3b8c2b8d478657f1a3b855512479374f SHA512 8639e85e33e4941e3425473e363c710d8e0cc1a09aed00d31c12a349065ba3be98392cfdb3fb2d82e1381caac17a07f6862733aed0215bff931e4dd33930a2b5
 EBUILD nemu-1.4.0.ebuild 1893 BLAKE2B 3adb826d01c70d26c25999091ed1e6fcf2a19bbf49e59553d413b0a2ec49a06178e3305df308c7fefc2af28cdb1892cc148a4ee7b14d2fdc63b0d3d0801e68f7 SHA512 ebf44232739c347797485731b839c3374043b539d254f04eb81c594542833c48e4722e0b64c0cac121314973dc76a15ac11c0bc56d2fd59ccbf80010870a9f99
+EBUILD nemu-1.4.1.ebuild 1677 BLAKE2B 86cda2a8ea881b7ad662a6a4cde1b167329d42343929556aeb2ed0df639a240e5775e92c6a866843691750a3efb7d1ede1e8d1c53a9ad956cdb1867b0879eaa9 SHA512 328d92af10ace6733a6cba58ede2bfe75fa464fc208fa81faf9a6c6e0d6e56ef7328dc4ec1e8295a6908fd9d438d0931dc84b59091e17d46c057d0e0dc48cb41
 EBUILD nemu-9999.ebuild 1916 BLAKE2B 232c49c84167c44c6fc3afd2e1b26cb6f820b53d345956c4d92058368f095206e3351ac431728a6f8847a88e53f09af7e39b5ff24874635b231b9a1ca6df7abc SHA512 87b016f6a485c921222428b96b11687cfb906118cfc398318b14f45ebd1c09aeb710b0cdea389a41e5936478e31645925599b32fe203fe07559debb54d7ed9b4
 MISC metadata.xml 499 BLAKE2B 2d190da58be258c1e5e997128bc65e9f928c9ec86e9be23d43cc881c92d9cd65e9cdee6db7afb92abf799aaa552ad5ddcf6dbdafd26d12c2521e8724f7f98471 SHA512 42e56aaad5eff7d180c6af0ef571f5fca4e101e934fc7506387456d89068ab8446e861dcd1124d85d962bf05b48a26833d0883b7c152c7214c79c324c18d236f
diff --git a/app-emulation/nemu/nemu-1.4.1.ebuild b/app-emulation/nemu/nemu-1.4.1.ebuild
new file mode 100644
index 000000000000..fad6abdf3786
--- /dev/null
+++ b/app-emulation/nemu/nemu-1.4.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils linux-info
+
+DESCRIPTION="ncurses interface for QEMU"
+HOMEPAGE="https://lib.void.so/nemu"
+SRC_URI="http://lib.void.so/src/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+vnc-client +ovf savevm debug"
+
+RDEPEND="
+	virtual/udev:=
+	dev-db/sqlite:3=
+	virtual/libusb:1
+	app-emulation/qemu[vnc,virtfs]
+	sys-libs/ncurses:0=[unicode]
+	ovf? (
+		dev-libs/libxml2
+		app-arch/libarchive
+	)
+	vnc-client? ( net-misc/tigervnc )"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext"
+
+src_configure() {
+	local mycmakeargs=(
+		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
+		-DNM_DEBUG=$(usex debug)
+		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
+		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel"
+		else
+			CONFIG_CHECK="~VETH ~MACVTAP"
+			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
+			ERROR_VETH+=" into your kernel or loaded as a module to use the"
+			ERROR_VETH+=" local network settings feature."
+			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
+
+			check_extra_config
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "For non-root usage execute script:"
+	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
+	elog "and add udev rule:"
+	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /lib/udev/rules.d"
+	if use savevm; then
+		elog ""
+		elog "QEMU must be patched with qemu-qmp-savevm-VERSION.patch"
+		elog "Get this patch from nEMU repository"
+	fi
+}
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 740aa288ac90..234771d07d31 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -1,6 +1,8 @@
 AUX vagrant.in-r1 1872 BLAKE2B 9a5f7f98d1aa0713b2e9777b8d4b5d01f7fc23068c7d920e5117150850547d8809d4d30ef8617e3316ab678bee7a73d3c7bccf732920baf469aea801f2bfced7 SHA512 0adb540aa4a8925de7cf5099357aa555c36ea9afc819ee9f24028e318c46ab9d41bcf4543eddeda70b8c1ba97c3742f0b6544c03e4c20f2ede41edc8938c48f5
 DIST vagrant-2.0.2.tar.gz 1177773 BLAKE2B 7624ce0bbc5f606bff89a0ef7d9d562f5caeea50b2b13744aef5e037f0b7861ccd2b6450f1686f4285027540b795539ef548ddadaf2f6c1476c87717078ebc7f SHA512 27e8157cf8a8d102a0ca328403410639bd4a9f7cb90d443f5be3ca912aeb6177208b26ba9751b49d98b5ba1e92f8bec74db0baca4cd22051d5ef6d3aca558f3a
 DIST vagrant-2.0.3.tar.gz 1181697 BLAKE2B fa33063b52e6b9c9a1212a8833ee70c1d45dc4d09f039882337e2571bac5fcb2c5cf5199c7a39ea539873cc445ec768946a12c0a8bb7b03f51e133d56388bf15 SHA512 c62366c2e2b190a19efeae3379573c9e534b296db68152f284f3d80e9fdff4260e246c40206076e222bda3cf8f4ecbd02656c65aa35c15606b8638d7a8fca200
-EBUILD vagrant-2.0.2.ebuild 2069 BLAKE2B dd0117d12c8884866ce4c882f30f684110f95e17a8a831550eb9da340c983f54c9d322227958e6211e853d1c6bc9e64754b9d9e670ced4b3cbf21c905874cd2f SHA512 5c4cf1e5616a5e44cb14863a65db05c728c0cbd78ee4733d68a76de566749f8818f25c5bfe0e4d039c3d3bb38482b2c1b102d8917012b037b6a1ae6a06433fe0
-EBUILD vagrant-2.0.3.ebuild 2069 BLAKE2B dd0117d12c8884866ce4c882f30f684110f95e17a8a831550eb9da340c983f54c9d322227958e6211e853d1c6bc9e64754b9d9e670ced4b3cbf21c905874cd2f SHA512 5c4cf1e5616a5e44cb14863a65db05c728c0cbd78ee4733d68a76de566749f8818f25c5bfe0e4d039c3d3bb38482b2c1b102d8917012b037b6a1ae6a06433fe0
-MISC metadata.xml 526 BLAKE2B a8d050fda7277001be0e472a1631c5d03620eae6d2adbd7fa985dfe478a137b444883587c37e2e8b1f6e6b55099573da1b4ec0a0d31863beb033eb17126d6d2f SHA512 a7b05fb9aa3c0e94bc5e3a32ed7da703dde28e254892e76575a6fe47ceef60c4134ee9f75dab48bcef72e98b1be32494d739e74e66f3aefab77fa4a5d55e346d
+DIST vagrant-2.1.1.tar.gz 1204711 BLAKE2B 88a6254091104eed702e07a4203a264b883869fb028b8d30fd51ddfc2053aec363683a2e73d1454ce92b705440920d5c80c0f967e4dc110bf425ce17973efccd SHA512 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5
+EBUILD vagrant-2.0.2.ebuild 2070 BLAKE2B c6f3f3662b50365fa21079b32141cbc39c2a584dc79e84e12f47453c12f8b82b1d5ff2bf6dfda06b51677e36e1b79dd4120bda4cfd07b29f209652966027f0f6 SHA512 a2f82e70982f30e02b9d924439e80da723163104ef723b887d78486140690e9f19fd170bd9a57c38c7cc7436728376839022c27c7d6c7c55ef682c2827e5dfa5
+EBUILD vagrant-2.0.3.ebuild 2070 BLAKE2B c6f3f3662b50365fa21079b32141cbc39c2a584dc79e84e12f47453c12f8b82b1d5ff2bf6dfda06b51677e36e1b79dd4120bda4cfd07b29f209652966027f0f6 SHA512 a2f82e70982f30e02b9d924439e80da723163104ef723b887d78486140690e9f19fd170bd9a57c38c7cc7436728376839022c27c7d6c7c55ef682c2827e5dfa5
+EBUILD vagrant-2.1.1.ebuild 2078 BLAKE2B 0ac87b9628bbda5055b8891a8f2e9b9e5b0d5a6cf30b8f5e392477d7f342c38e071f200e225ee8a1d3800380195fbba185b0c366cb0ff0db0d266cc4016e9d2c SHA512 178b8fd6cc0dbbfa79aa1ccf006710e7f6bf7db789b6b50d025b43f9799469401e357b43c9632191fda3958c1350722f7df0362a9ade9fcd88bc74482f7b219e
+MISC metadata.xml 526 BLAKE2B ccdcda8f6095d1efa5a66bd3ef549d1039c719a4aaaa89efa2e776f466e38602f636d0d538a235a29bf0a5ea581bde659d4a77b6b4231da4c51e06913269aaad SHA512 784f97e3a9e96beba6afb232c46e6c42fe318b471125e48926363d9aec430ff4d37d74c82d2ee4efd1e036f89de2fe37415121dbbdd050a56954ba12d666b328
diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml
index 43ec80380400..bc8d8897403b 100644
--- a/app-emulation/vagrant/metadata.xml
+++ b/app-emulation/vagrant/metadata.xml
@@ -15,6 +15,6 @@
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">mitchellh/vagrant</remote-id>
+		<remote-id type="github">hashicorp/vagrant</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/vagrant/vagrant-2.0.2.ebuild b/app-emulation/vagrant/vagrant-2.0.2.ebuild
index 09af0d9c7406..ff7a205039aa 100644
--- a/app-emulation/vagrant/vagrant-2.0.2.ebuild
+++ b/app-emulation/vagrant/vagrant-2.0.2.ebuild
@@ -12,8 +12,8 @@ RUBY_FAKEGEM_TASK_DOC=""
 inherit bash-completion-r1 ruby-fakegem
 
 DESCRIPTION="A tool for building and distributing development environments"
-HOMEPAGE="http://vagrantup.com/"
-SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://vagrantup.com/"
+SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -71,7 +71,7 @@ all_ruby_install() {
 	all_fakegem_install
 
 	# provide executable similar to upstream:
-	# https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
+	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
 	dobin "${PN}"
 
 	# directory for plugins.json
diff --git a/app-emulation/vagrant/vagrant-2.0.3.ebuild b/app-emulation/vagrant/vagrant-2.0.3.ebuild
index 09af0d9c7406..ff7a205039aa 100644
--- a/app-emulation/vagrant/vagrant-2.0.3.ebuild
+++ b/app-emulation/vagrant/vagrant-2.0.3.ebuild
@@ -12,8 +12,8 @@ RUBY_FAKEGEM_TASK_DOC=""
 inherit bash-completion-r1 ruby-fakegem
 
 DESCRIPTION="A tool for building and distributing development environments"
-HOMEPAGE="http://vagrantup.com/"
-SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://vagrantup.com/"
+SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -71,7 +71,7 @@ all_ruby_install() {
 	all_fakegem_install
 
 	# provide executable similar to upstream:
-	# https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
+	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
 	dobin "${PN}"
 
 	# directory for plugins.json
diff --git a/app-emulation/vagrant/vagrant-2.1.1.ebuild b/app-emulation/vagrant/vagrant-2.1.1.ebuild
new file mode 100644
index 000000000000..5778c6f947c5
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-2.1.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="A tool for building and distributing development environments"
+HOMEPAGE="https://vagrantup.com/"
+SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+virtualbox"
+RESTRICT="test"
+
+RDEPEND="${RDEPEND}
+	app-arch/libarchive
+	net-misc/curl
+	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
+
+ruby_add_rdepend "
+	>=dev-ruby/childprocess-0.6.0
+	>=dev-ruby/erubis-2.7.0
+	<dev-ruby/i18n-0.8.0:*
+	>=dev-ruby/listen-3.1.5
+	>=dev-ruby/hashicorp-checkpoint-0.1.5
+	>=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
+	>=dev-ruby/net-ssh-4.2.0:*
+	>=dev-ruby/net-sftp-2.1
+	>=dev-ruby/net-scp-1.2.0
+	|| ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 )
+	>=dev-ruby/nokogiri-1.7.1
+	<dev-ruby/mime-types-3:*
+"
+
+ruby_add_bdepend "
+	>=dev-ruby/rake-12.0.0
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# loosen dependencies
+	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
+		-e '/ruby_dep/s/<=/>=/' \
+		-i ${PN}.gemspec || die
+
+	# remove windows-specific gems
+	sed -e '/wdm\|win32-\|winrm/d' \
+		-i ${PN}.gemspec || die
+
+	# remove bsd-specific gems
+	sed -e '/rb-kqueue/d' \
+		-i ${PN}.gemspec || die
+
+	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in-r1" > "${PN}" || die
+}
+
+all_ruby_install() {
+	newbashcomp contrib/bash/completion.sh ${PN}
+	all_fakegem_install
+
+	# provide executable similar to upstream:
+	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
+	dobin "${PN}"
+
+	# directory for plugins.json
+	keepdir /var/lib/vagrant
+}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index c2a8b112174a..effb6a90f598 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,11 +1,9 @@
-DIST VBoxGuestAdditions_5.1.32.iso 59512832 BLAKE2B 73fcbb3d1db1056970a86e9c1c1efe1f8ddc3566c327df5bb8e14b22b827fc603dcba580a6db60c75f3dff00f268313ac196d49355e184395793363c6d16df68 SHA512 073b103308f7cab18ca096bbb863d8cdea8efd8aa4896b2ab2a6326f549f1cf6afb70ccb55baa1dab85485879e522584a9f91adb4434c5f8bd649e73dae65900
-DIST VBoxGuestAdditions_5.1.34.iso 59619328 BLAKE2B e8e7786a82785c4d58c2206c3ede4119c435c2884eba470128cd12ad968077eea7a7850fb05c20ef18ec01fb27919ae29a706d4b059203a7a55dba94f7680564 SHA512 e8c376a558991d603fbb6554969d27c510621bfd8f53542126f57c3604d68f6da7f7732361369b6144794575f40c22e0df0a9b2b4190d3462d80c035b7f0451f
 DIST VBoxGuestAdditions_5.1.36.iso 59596800 BLAKE2B c735a88f534b27f1f2f29d125d0fdf881285f64f7ea3f49a0bc9211af4f562562cc321983c222e6106459f3be14af94a3514765607d1cd8edf6e6352398cfe8c SHA512 08049007589f6bf56c84355b908355289f37eac8cb01d970e46ebe3b44b43ff406c37d0ddad245dd007447a00927a2d2312524e3ac99f8b6bad8695b403ca846
+DIST VBoxGuestAdditions_5.1.38.iso 59611136 BLAKE2B cde4ceb59159827304c99ab00fac4cd3598600c252e7b5a410a5be6ea50866ed2efae4ead9e5c4c1a1462b1cd6db973bd4b35b56d426934e80898837c536e778 SHA512 e082e6363e1e6fa8a7b6b6b4847e9f2ed17655b0ac143467553150f910d71e4dfff55686c38464dc60f77c57292610d13dc25ee5423877173467a86cfe232a3b
 DIST VBoxGuestAdditions_5.2.10.iso 57974784 BLAKE2B 3e56448d46cfdbb264a6c606d548a0db86d40cac1428263de7d7f6e35602dc485138ac3574eab6bba78cccabb7ccd65f8c67ed78938524bc408d9d305949154d SHA512 fd84d41b5953c379b1a14380cb4ec67a8edd42caa4ce11a39f4dc0af77b3bbceeb717d9b9b9d25fd8b2446c2b1aa3bd4393e4a5c661c20bd07059f561d17ad8d
-DIST VBoxGuestAdditions_5.2.8.iso 57972736 BLAKE2B 4f78b5faa8379777f88be98af1c6e023863395004d5326a698801141ed939edbb04f5109967179e8777bdfae39a77ffa724c9f08f54a14a8898a074512318816 SHA512 29d1bd00e6f5f5ceb7fa50719dde6e05b17111583a0ada16f47cd1e38e9302a3d5d4d7708cef9c8c3f9c4eb2d5ccc276c792700e0733cec2dc611ba1e5bed098
-EBUILD virtualbox-additions-5.1.32.ebuild 729 BLAKE2B f792450477b1a6b5689018926bce6a30608b288db6a9f546ea52bbc2dd463ba1c71c5dbe4a4970bce3a7dd3d92d6b9fa1e30ffc288f7a4597214021b6bacbde9 SHA512 3d90155e5c821b4831a31a154cbb7fcc31dd2b88637853b5dc8c3393158f555d1b6c3b5bff1856b363b12cd6e6ee039e08dec1aace2751ad618aa719dfef7074
-EBUILD virtualbox-additions-5.1.34.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db
-EBUILD virtualbox-additions-5.1.36-r1.ebuild 730 BLAKE2B f0369baed78b3a519d22c05c81878eba8ec0fc4cbf9ea10b8ff96e0f9636af8cac1137e8e0b9a98e98b966bdf577d330a5dcfbfd733b4b06600128b262b75cc7 SHA512 d80de0c72f17770c905376c25e01a5f59d684d73612f09a0eaee45b3c992158d59c068a347ba07e17b91a66f80d64c8dbfa8e861cf056197d99968b0f45579c6
+DIST VBoxGuestAdditions_5.2.12.iso 57976832 BLAKE2B 3b1485da265a9d7bd659e846ceb9e3e8f3463816f2f8157654704875e9b7a91d6f610cfa6285d9d54b06e87ca4f3e5d4600b26ac622b592c90c42bde0cc0f2ee SHA512 276b6348942bb82f68dacdc957590130281c5b3818d47c60238e00e1015682b5a44f28091163297ea052d327f916ed2e79bc32820f39f8b8e5dab5bd0fccbe77
+EBUILD virtualbox-additions-5.1.36-r1.ebuild 729 BLAKE2B f792450477b1a6b5689018926bce6a30608b288db6a9f546ea52bbc2dd463ba1c71c5dbe4a4970bce3a7dd3d92d6b9fa1e30ffc288f7a4597214021b6bacbde9 SHA512 3d90155e5c821b4831a31a154cbb7fcc31dd2b88637853b5dc8c3393158f555d1b6c3b5bff1856b363b12cd6e6ee039e08dec1aace2751ad618aa719dfef7074
+EBUILD virtualbox-additions-5.1.38.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db
 EBUILD virtualbox-additions-5.2.10-r1.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db
-EBUILD virtualbox-additions-5.2.8.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db
+EBUILD virtualbox-additions-5.2.12.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db
 MISC metadata.xml 343 BLAKE2B 9e18764cb3f6a1df7858366112557de847f14dd2d7415612da0ebe28895a92a7714d0295f3551ddc62711bf84d5be253ddda3146f6121d52c4f86c05a20ad835 SHA512 88eabdec952f2eee2490f23050b39127f500765f6f93adecb9cfdb62776d73e9dddcdb56756b41041ed4727375ffb0e5f729c219a7de5620344bbee10bbc06c9
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.32.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.32.ebuild
deleted file mode 100644
index dd3165781272..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.32.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.36-r1.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.36-r1.ebuild
index e309691df730..dd3165781272 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.36-r1.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.36-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.34.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.38.ebuild
index a28d6005cb4f..a28d6005cb4f 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.34.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.38.ebuild
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.8.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.12.ebuild
index a28d6005cb4f..a28d6005cb4f 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.8.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.12.ebuild
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index acd07f48b6dc..d01101f4213a 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -4,29 +4,24 @@ AUX vboxwebsrv-initd 674 BLAKE2B be1cb2574ff5e9e1efc6a137d18e67b2ecbe0e94b6a3a2d
 AUX virtualbox-bin-3-wrapper 2931 BLAKE2B bb8a72f749996b945d42a3d94ab895ee5b234bed907e6d1e055993f34a2459720bd8b0c56b61eae9c2e159e2b820d5117a6f9bed6ebfc3b327fa133c8f3aa812 SHA512 adb6ba2b3252b19b4c0331c10a025d05fd2399642530ba9aec2efa2dc8dbea4188a95806935532ad8229db29f0767c3098ef7646204f5e540e291ceb350b76ac
 AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a289ff56cd0d7638a0a3d47891e670e070be9f3bcc30d730982237fc9211d1a9bbdbf8429c7ca80d25fbcc1 SHA512 8086ef107aff0aa3e17f5fcb8ee5de4dd8a24cb119c3523e3e3a302819eb4258328adead1b6f40b96706539f4e1c43dbd5c055a16a304ac29f7f302ebf2e4c4c
 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.32-120294.tar.gz 19589163 BLAKE2B b35d9bb90216a77706fe5f0de624affaff4177d4b6e561f7c76003efd1a386a1f5b5f6b1c6b559cddde6ffb55ab5f7eba3e4c9b2135f31c09313b473ba6579e5 SHA512 c1e13fc59b9556f980bec02bb2860e717f752d42c3d810f70267e5c07898bb1aba9d3f3403fa5aa388478aa609397da49dcf10311836d68093101715a6ae200d
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.34-121010.tar.gz 19591849 BLAKE2B 573afe3624a3eace4272a067f472e32dbe344755814aefaa8d6685da0ff31e04faa7f6a22a58974938067fce3a0ea3d66a0c5d02db999105029cc7c5c8fea24b SHA512 4f05bc7abe989fbc0928aba259ad60b09f5b085859c0ddc3e24c052fdb4becb055795c8f0038fc4dd95be7b9954a3034afd499798bb58fe16522602cfe91e7fa
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.tar.gz 19605234 BLAKE2B 4b263b27b130e5b5d7917f15f0dc782f28f7708cc10e22028ee27b33be6541df5211c4fb36951a6b293d19b8933182097cd0575da8c1d00b6a96e747c1962762 SHA512 e11b294da83b4605c40132f2ea5f95f2820f901d2ed1d438c22c4cc9f779baa3112b9334036717d1593d5f9ec8374d7d7bc826012e2019ef0ba79bacb1deb7b8
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.tar.gz 19717251 BLAKE2B 90dcaa58284c6dc9101dbc8eb9ceda55d16c4a48fd58fb43c4a6b7d3d5c582c31930f6e773397ae9379e75771c88b40aad276436bb1d56a71a8e744353e04ec9 SHA512 ba44d53e06adababd0ac7c8a68ea025e1e7afd39fe648079bbb879e81130d45f00b944795cfd37f7f05c16d5a7723b85c49a8435c8399180af627dd3b3de00bc
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.10-122088.tar.gz 19482093 BLAKE2B ca02e9226b774340ecd31688f296304d7c963f20177d523058a1a2997cc287c59fc6e4df8bcc5024ec55cc7b79b1319f61bc9f3697cdb9c4c36423a77221cb82 SHA512 90e9d1c0235d14df9a305fa48102528b839c266abe18f97dcb945729cb9a0136cbf0686b69b82fcc76508cf7674c5b5dcb6563319af9ca0c294218802eaa9173
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.8-121009.tar.gz 19469421 BLAKE2B 81651876802ad767339f3984a26375118f01e4b99b4247398e0cea8d749905431b40945f8a72d0c7802b2743080f01d3044aafd21600c4927773994c5a114a1f SHA512 2b69e2acab91ce95e9807006c79862fc0d1d10fdd269bd9cdf8f11b6704821823b103c7a4a76ad99c10e0868bd397ffe0e72b2eb2aa4fc2bd81ff968c71c2280
-DIST VirtualBox-5.1.32-120294-Linux_amd64.run 88360402 BLAKE2B f548855260467be536f2e5ff95ae110636b1fa824a78058cf9318b21592d9643bd780691984ff803c7b0ec998f8e1720d81731fb26df42718cfe3c7b56ad09e4 SHA512 3b7e722ee231ad087b4d2419406e46b6b33a7947d6dcc8ecc0456f04925fb551810c5f27a54d9c99b0d729c1bb0d5d79d17bb8720291c8210ab88c15215244ec
-DIST VirtualBox-5.1.32-120294-Linux_x86.run 87387598 BLAKE2B 657842740d52f046c969196ca776e5572e3bfde55587575bdcc2a957863bb890a40954c9fa014e9184ee77e1e5a81388eadbc5fcfcd22a21c0485e25074bb900 SHA512 38cb01d89edb1fcb44940bdd94c69af824577ebc9fa30a5a2c7c837142fc70848326325b9ee131ad878a9dce71e10b9762854ef0aa66c9060c159abc40c89241
-DIST VirtualBox-5.1.34-121010-Linux_amd64.run 88309202 BLAKE2B 77b906e52f54926a3d6a41ec54de906b4beca3c7ae817d3db20a480352ba4804d28cc41d8b501e89893b4ba153e8c62c7d9d106acd771c35431a1c841e964cdb SHA512 28b0b9cd58e1deba8b008bd0a2f611400de426701d9256cad58527761cfaed52949bb817a7b2cc101e15f524c79a605972349d87b637b7497ada0816421ecf4c
-DIST VirtualBox-5.1.34-121010-Linux_x86.run 87377358 BLAKE2B 48a0011a8fe80604a660eeb833b5b406f19827d9e22a0ae1f7a1394951b554a3d141d2150640107ebbb3d381b783084b7f7a2c4265302727524b98ced947c756 SHA512 7866f35f315ad9207fe85e0cfdbff7e5fb19f55ec1bff07606cadf68a9f7f965169b7c95713599952db4c9ba346f0813169f944e0d69702c4f2c43f35ff6c61f
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.tar.gz 19590585 BLAKE2B 433ae630e55f2320d48c06d0fd5120528ee10c04f2e471da3a72fb98ae826b2909fa5fcd2a4ad7c875a1785d07c0a3dc9ec3001fa7d16903037731dbe1e24a75 SHA512 3e55cb2c8a5adfdac988b81804650aa35e66e052a946b371d61a92d459e5dbb83495f80423f22cfa2a4c2196cf94d1146ff5aed621985f27f2e5069c13f5daee
 DIST VirtualBox-5.1.36-122089-Linux_amd64.run 88329683 BLAKE2B 96e0296243056ebaecde4435fe68f82dacfc66a0d23b70365c7495112672b60be7682ef794851b68198d0d0f01ec84cb314f06b434726e5f75e47751771cbd3b SHA512 6c62c642da78561ec5130e18ebac24d52871b4c518ce507f1deb0a279c58dfc1b87c4afecf63236e7274da65d5d784575779ad39e17a4f8b1f05c29a3ca95d55
 DIST VirtualBox-5.1.36-122089-Linux_x86.run 87449039 BLAKE2B 826071838fdb7567ec7064eb6db216d9d695f3504b0c37b2db637df5757ece58b8c1c0b430cef1c1e6657bd9dc556c074891732cd4481243af72051f66ec6bec SHA512 c593483949a5389cddbe47fb3d07e7acc55868671d72ccd696e1c039ace24e7b88be9cf088c32b419c5f4ba76ceada6e388b63dbeac6376b13627543c472afe8
+DIST VirtualBox-5.1.38-122592-Linux_amd64.run 88329683 BLAKE2B 124b1a3d45b0aa213a63ccc225570158faa11adf51a9bc503c014a302ba6a9739e9b50780c93ca6b8704e4666f809b97d1548db74817020301f560252bf71182 SHA512 963ed0b5555bcc43a72dbf49d3d6d9a1a2b1118808ea601765ce102ce72a05439903247680d0b49df4d15cdca68b40a8c5a26df9340c24ed681c3353f2f8e072
+DIST VirtualBox-5.1.38-122592-Linux_x86.run 87449039 BLAKE2B a591a64422cd6e7bb292aaa0f35e5ed9a722b3d835800b2ce09814f2756f088e3a7adc0fc483f2a6ec36e265aeddf6ecfe1aa1bf60a78675696859bff1d0afb9 SHA512 41f9aebbb7c4ad6192cfef57ca956c5ec4b96c8547380abc3b56629c821094ccb28bac69645042e0ac22664db6c59aeff49ccc80d88e1eae5ffb95f55a467a07
 DIST VirtualBox-5.2.10-122088-Linux_amd64.run 88544723 BLAKE2B b460f2eb04854773a2cc908eed3e01bf3245f0273c94bb4a7a69b11b2e1506a8a4db81649e13ce94fa3771540cadf597f3c2d957fc873213ef734e6b4e1d932d SHA512 244dcb2c875d4d0bf37552a478074b052268973954e4ba81e2a82ebc8ffe40da74de484032a37f21291574a997ee67dd4057f75eef4d7ac77c4e0f0d7cfa12ce
 DIST VirtualBox-5.2.10-122088-Linux_x86.run 87684559 BLAKE2B 840efab030b66d561ada6bf999c076bdce0d064399e904f8ad0fffd3fbb72be1ed7131b77a4a79f56643d22e2029e9005b7e0d80ffdf941b4df2fee375ee3e81 SHA512 738b2d6810f056c0c6b7828e3f14746e2ed64d7169e7959f9022857a451476637ebcf628b5f6b3d4ab86ce9834fe87bf8f8c92dcb3fdd80a703ff5ec93adfc77
-DIST VirtualBox-5.2.8-121009-Linux_amd64.run 88493520 BLAKE2B 2986918bb2eda12447468fb642d3760d999d3af3e5595bf7260e94572f15a811655cd3f1348e1cf23a827011b1eebf84f07f13185f4eab3c353a957c58c105d4 SHA512 211f94910ef50a00b178482c0600be48ecddb48086846515b7705b111a36f81346efd4cbeb39255d85f3a0e778509e0dd7676e4c9bcbea49014988be8635910f
-DIST VirtualBox-5.2.8-121009-Linux_x86.run 87705037 BLAKE2B 8d6774d0be3a3e12cd258bb6799e6f3eb84a3cff670277c0b910671879014b513d1e2958ebf60f5aaa1ee4ef56be52cc0908b3cb5fa25fa78db77023fbbb3660 SHA512 ee75f64332a8d1df61b60a28661d7b7ef760c789dabca61b749f5cf33ffbe5ef09d64bde6da4255e659b1bf86d947eca8d18d697738e4de9f6b0b423ea647e9b
-DIST VirtualBoxSDK-5.1.32-120294.zip 9860157 BLAKE2B c9222bc865bdd70cc2ac516b27d1a1c91e0c05b04129a0c9793701ca8080c184ae2d8157bf687995c074aa03b8242e931164b03c5942e4d57589def16aa21b57 SHA512 aa2f0b647e177f95543c41beca64546a5d9b68f2081365ceb9a4494e500747de55fc71e899f31d65b96a9b5a1c8bfeaf8518ddb45791fb25e0ad992776c4c186
-DIST VirtualBoxSDK-5.1.34-121010.zip 9863604 BLAKE2B 63c7a28d509a910d4b63e7784a85a2cb125c6d5f6b6bf311c971235c706c4279266f40853f4c735ad41b483fd4febbf36bf9f07477e73675d39846b20e9105d7 SHA512 8a3931132e4eaffbcd82d64e9b34d6c2cce0c2971731b10af97f4e79e926baecd3ba3ead4b454512115e59c3f186d466ddbc9b13c83230f2b80743f5e0d0578c
+DIST VirtualBox-5.2.12-122591-Linux_amd64.run 88677843 BLAKE2B 3fd56527c106193ea0bb46ad51968c59d1bb6453282ddfc84b08227e0f5ed4af941bc11030edb3a0c2d0845d602c036e033a48af020b80ba225d626a3514d321 SHA512 682e42ef3bb65f0e31e08fda2c2a9ce8b555ae8978692b22e9855c1725e5fd3e3db126501df37849b546a5022480a319db12470d1fed44463f2e49144a6383ac
+DIST VirtualBox-5.2.12-122591-Linux_x86.run 87827919 BLAKE2B 7efc88298b8e96f0d45cfac3d4fd3b24ffc725f14e1ae822dace092abf6a460cbad4349b907c08998dcdacdfdb915a2de6e8ae8db4edb1842c29941faa6acdd8 SHA512 e6f6890baddef29db0c103569d5abe7bdfb597840e8c9b023ba041b85a7c3ba7bf45f983826266722b43fcca95b2e93bfdc944c25ffcf6f0e386794f22eb5e8a
 DIST VirtualBoxSDK-5.1.36-122089.zip 9864160 BLAKE2B 0db3d44c44f93a80607791f2ff5cbdf6aed2b324c207bb9bbc808b5cc836f01ade9c48ed3474c4f174a43b29969fe632b5ccd2b3ad0af197894d63887144bf0c SHA512 98f6e59a5e344bf23f6af6c0e791f28920940de907721981c99b66b8e7c20cb06a7e1211b2029a1279e583fb4ed456019005c2bf3a91b3d8b3fbd61e6e44c914
+DIST VirtualBoxSDK-5.1.38-122592.zip 9867112 BLAKE2B d3deeda2adafcb675370c7228f49a209e5f76986fc4c9ac5aa8ff2e809912f458c9cfc2d8f011404fb4bd7b45b80f0ff857dd85dd597d622971a2556c6b17bbf SHA512 e03fab6573e61f59fc4e017d8c6cfde08e734939efe6c2f8edc5e6e9da5a1d616012cae06d630a3e2a2b1d72775eb8f0a05eb230fa81321ec33ba1975ec34ce9
 DIST VirtualBoxSDK-5.2.10-122088.zip 10152815 BLAKE2B af856ffaeca244b2bfd14ef89ca10b4d607386c77aad3e8e0ce7a40291f6a74dfd12f3b33671d07a151e4bc75bbb05699a9845a3ae5ca7c16f4e1d3c49edcf9d SHA512 0e153b7b05fdc4ce18cf4dc7c110b0b9f05536df17f92b61417af9b497cdec5c2ad3ecd341bbdc43969d811b28f12dcdaaecd72bc5c33842cc1fdde25376c725
-DIST VirtualBoxSDK-5.2.8-121009.zip 10153749 BLAKE2B 0534f568f83d73f70f4192389e0f602bc4184d45a4a1aa82983692bf4e35fac0589eef21f5aa561c88c736aaa398986de0077dcdf3aa211df655788f5592b423 SHA512 386e38ee6e584ff8b0444b9285a67d259bb93f53d6e6b6e082cefd4121578da91ea56e2eb329b6848ff5476a14ad3055287b806cd25a21155aa6f708c58244a5
-EBUILD virtualbox-bin-5.1.32.120294.ebuild 8379 BLAKE2B 9f53e6e59c0ea3401ce96e247d0896642b2755df7188910ee09896b4dd780fd8474ee17f49be32417af8da25e73d00aa42a659a9f720dea671673090123c7cda SHA512 9ba2af13d6fe7f2b05c501ddda7eb8eb7900b101bdb6bc9150c570f0c1404f2ee238ac786626818f15b26eb46b1531b9710cea37432aa6fcd4eb93f834f4f2ab
-EBUILD virtualbox-bin-5.1.34.121010.ebuild 8381 BLAKE2B d31bb147d4495d803ddf8938c634fb599f765a5dee9a67301c14c12ff03e7c1c2215b804eb99d3cdcfdffefc02d56bfcb00adff3b652d8d77c50e61aeaa97999 SHA512 9593b0c466361c72198f033f3cab26eca13e4173e05f4b85bb3fc878996d421903f96d1756af9200522e7d142a63556320b1e8845305e8caee3cdbe4e914b7dc
-EBUILD virtualbox-bin-5.1.36.122089.ebuild 8382 BLAKE2B ca7c830630f2a252cba624638becffc9b4a0b178d0b7c50dbf60522308624bbc8df38abe8951c214d0b0a792167dce589648d20c3c329c0c90d44e2f2e4e9b62 SHA512 bd9a74cd5c3b95556eb8a7451a036bc25548cba2158eab5e64d049a592dfeff28fd47df72a6de582fb22eaaf208f538eca49133baad44becdad67434623a350a
+DIST VirtualBoxSDK-5.2.12-122591.zip 10153856 BLAKE2B ea4fdc39744e5fcc2edcdcf521c795b2669344cec4be2b7d9f08d1e0917c24b5c06721d76d81966c611ee41d220095aeb6bbab211a0e1b52e6479e0c9595d97a SHA512 6d7e3968c9edb00b88aa5118ec9c74ae85e04d788f49741b68506b07307c4dd2c8cb7bb307c76f9d2908bc47c7683257f39395008b0a03eff72a1e77567f0e77
+EBUILD virtualbox-bin-5.1.36.122089.ebuild 8381 BLAKE2B 16a4aed3c9ae0fe4621fd97d30ce46808ff7c56783dbc27e2a4c2e6a6a1f290506d71659ad98c4def219d75789ff6f7f66c8d79ff90d2285ca0e1fceec14635a SHA512 a5cd6523a8a08b64f7d60ebd00d56576c7dbb33dbde06dee28b56ae1a31648a3155b7a1f3c3a739e71fa824d427c33b74ccd31dc1fb3520256b759c0e79dd193
+EBUILD virtualbox-bin-5.1.38.122592.ebuild 8383 BLAKE2B 0f07fa4a3383dde55f6ee12bebcbc44da33f96c498dd58eacd8dc1fd19bded41f720be5400e2ad9dcd01d80752a9825f89b68ca610105362d1eeffd9e2395c85 SHA512 96ac84742f050251faf70537d768654a21dd9f918ec282ca229f5490071e9d0aa7dd3dda3121bf39534f0f1547b039f1f138a15b1d5fd4b85bf5d82d79df216b
 EBUILD virtualbox-bin-5.2.10.122088.ebuild 8383 BLAKE2B 0f07fa4a3383dde55f6ee12bebcbc44da33f96c498dd58eacd8dc1fd19bded41f720be5400e2ad9dcd01d80752a9825f89b68ca610105362d1eeffd9e2395c85 SHA512 96ac84742f050251faf70537d768654a21dd9f918ec282ca229f5490071e9d0aa7dd3dda3121bf39534f0f1547b039f1f138a15b1d5fd4b85bf5d82d79df216b
-EBUILD virtualbox-bin-5.2.8.121009.ebuild 8381 BLAKE2B d31bb147d4495d803ddf8938c634fb599f765a5dee9a67301c14c12ff03e7c1c2215b804eb99d3cdcfdffefc02d56bfcb00adff3b652d8d77c50e61aeaa97999 SHA512 9593b0c466361c72198f033f3cab26eca13e4173e05f4b85bb3fc878996d421903f96d1756af9200522e7d142a63556320b1e8845305e8caee3cdbe4e914b7dc
+EBUILD virtualbox-bin-5.2.12.122591.ebuild 8383 BLAKE2B 0f07fa4a3383dde55f6ee12bebcbc44da33f96c498dd58eacd8dc1fd19bded41f720be5400e2ad9dcd01d80752a9825f89b68ca610105362d1eeffd9e2395c85 SHA512 96ac84742f050251faf70537d768654a21dd9f918ec282ca229f5490071e9d0aa7dd3dda3121bf39534f0f1547b039f1f138a15b1d5fd4b85bf5d82d79df216b
 MISC metadata.xml 769 BLAKE2B 79832f104022a0c85b74fe12bc7a562d88830e25b82ec18626a6ecde48bf794a618de880812974a57882ac15f5cacd516e127780542b9fb514327e5706846bca SHA512 d4d7b28e05404c670993fb8798b5b5de23d3f446e12195665d9965214e59132996dcbe45a28965a9beef6e5156635d0a5a1799641a613c27dbb8b335d51f0dc8
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.32.120294.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.32.120294.ebuild
deleted file mode 100644
index c0b989d91810..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.32.120294.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
-MY_P="VirtualBox-${VBOX_PV}-Linux"
-# needed as sometimes the extpack gets another build ID
-EXTP_PV="${VBOX_PV}"
-EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
-EXTP_P="${EXTP_PN}-${EXTP_PV}"
-# needed as sometimes the SDK gets another build ID
-SDK_PV="${VBOX_PV}"
-SDK_P="VirtualBoxSDK-${SDK_PV}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-if [[ "${PV}" != *beta* ]] ; then
-	SRC_URI+="
-		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
-	IUSE+=" sdk"
-fi
-
-DEPEND="app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${MAIN_PV}
-	!headless? (
-		dev-libs/glib
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/libpng
-		media-libs/libsdl[X]
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		chm? ( dev-libs/expat )
-	)
-	dev-libs/libxml2
-	sys-fs/lvm2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S=${WORKDIR}
-
-QA_PREBUILT="opt/VirtualBox/*"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_P}.tar.gz
-	popd &>/dev/null || die
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-
-		# set up symlinks (bug #572012)
-		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
-
-		local size ico icofile
-		for size in 16 24 32 48 64 72 96 128 256 ; do
-			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
-			if [[ -f "virtualbox.png" ]] ; then
-				doicon -s ${size} virtualbox.png
-			fi
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="virtualbox-${ico}.png"
-				if [[ -f "${icofile}" ]] ; then
-					doicon -s ${size} ${icofile}
-				fi
-			done
-			popd &>/dev/null || die
-		done
-		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
-		insinto /usr/share/pixmaps
-		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		doins -r sdk
-	fi
-
-	if use additions; then
-		doins -r additions
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp
-		doins -r rdesktop-vrdp-keymaps
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
-	# The compile phase makes VBoxPython2_7.so.
-	# py3 support would presumably require a binary pre-compiled by py3.
-	use python && doins VBoxPython.so VBoxPython2_7.so
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-	fperms 4750 /opt/VirtualBox/VBoxNetNAT
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	local udevdir="$(get_udevdir)"
-	insinto ${udevdir}/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	sed "s@%UDEVDIR%@${udevdir}@" \
-		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
-	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	gnome2_icon_cache_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.34.121010.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.34.121010.ebuild
deleted file mode 100644
index 256314a1aed2..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.34.121010.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
-MY_P="VirtualBox-${VBOX_PV}-Linux"
-# needed as sometimes the extpack gets another build ID
-EXTP_PV="${VBOX_PV}"
-EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
-EXTP_P="${EXTP_PN}-${EXTP_PV}"
-# needed as sometimes the SDK gets another build ID
-SDK_PV="${VBOX_PV}"
-SDK_P="VirtualBoxSDK-${SDK_PV}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-if [[ "${PV}" != *beta* ]] ; then
-	SRC_URI+="
-		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
-	IUSE+=" sdk"
-fi
-
-DEPEND="app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${MAIN_PV}
-	!headless? (
-		dev-libs/glib
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/libpng
-		media-libs/libsdl[X]
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		chm? ( dev-libs/expat )
-	)
-	dev-libs/libxml2
-	sys-fs/lvm2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S=${WORKDIR}
-
-QA_PREBUILT="opt/VirtualBox/*"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_P}.tar.gz
-	popd &>/dev/null || die
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-
-		# set up symlinks (bug #572012)
-		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
-
-		local size ico icofile
-		for size in 16 24 32 48 64 72 96 128 256 ; do
-			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
-			if [[ -f "virtualbox.png" ]] ; then
-				doicon -s ${size} virtualbox.png
-			fi
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="virtualbox-${ico}.png"
-				if [[ -f "${icofile}" ]] ; then
-					doicon -s ${size} ${icofile}
-				fi
-			done
-			popd &>/dev/null || die
-		done
-		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
-		insinto /usr/share/pixmaps
-		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		doins -r sdk
-	fi
-
-	if use additions; then
-		doins -r additions
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp
-		doins -r rdesktop-vrdp-keymaps
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
-	# The compile phase makes VBoxPython2_7.so.
-	# py3 support would presumably require a binary pre-compiled by py3.
-	use python && doins VBoxPython.so VBoxPython2_7.so
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-	fperms 4750 /opt/VirtualBox/VBoxNetNAT
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	local udevdir="$(get_udevdir)"
-	insinto ${udevdir}/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	sed "s@%UDEVDIR%@${udevdir}@" \
-		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
-	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	gnome2_icon_cache_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.36.122089.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.36.122089.ebuild
index 6cb07665bde8..8a5b8148a15a 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.36.122089.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.36.122089.ebuild
@@ -34,7 +34,7 @@ SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_am
 
 LICENSE="GPL-2 PUEL"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.38.122592.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.38.122592.ebuild
new file mode 100644
index 000000000000..94de7dd7a102
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.38.122592.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator
+
+MAIN_PV="$(get_version_component_range 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(get_version_component_range 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+	IUSE+=" sdk"
+fi
+
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${MAIN_PV}
+	!headless? (
+		dev-libs/glib
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/libpng
+		media-libs/libsdl[X]
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		chm? ( dev-libs/expat )
+	)
+	dev-libs/libxml2
+	sys-fs/lvm2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/VirtualBox/*"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_P}.tar.gz
+	popd &>/dev/null || die
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+
+		# set up symlinks (bug #572012)
+		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+
+		local size ico icofile
+		for size in 16 24 32 48 64 72 96 128 256 ; do
+			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
+			if [[ -f "virtualbox.png" ]] ; then
+				doicon -s ${size} virtualbox.png
+			fi
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="virtualbox-${ico}.png"
+				if [[ -f "${icofile}" ]] ; then
+					doicon -s ${size} ${icofile}
+				fi
+			done
+			popd &>/dev/null || die
+		done
+		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
+		insinto /usr/share/pixmaps
+		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
+	# The compile phase makes VBoxPython2_7.so.
+	# py3 support would presumably require a binary pre-compiled by py3.
+	use python && doins VBoxPython.so VBoxPython2_7.so
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+	fperms 4750 /opt/VirtualBox/VBoxNetNAT
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
+
+		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	gnome2_icon_cache_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.12.122591.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.12.122591.ebuild
new file mode 100644
index 000000000000..94de7dd7a102
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.12.122591.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator
+
+MAIN_PV="$(get_version_component_range 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(get_version_component_range 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+	IUSE+=" sdk"
+fi
+
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${MAIN_PV}
+	!headless? (
+		dev-libs/glib
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/libpng
+		media-libs/libsdl[X]
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		chm? ( dev-libs/expat )
+	)
+	dev-libs/libxml2
+	sys-fs/lvm2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/VirtualBox/*"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_P}.tar.gz
+	popd &>/dev/null || die
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+
+		# set up symlinks (bug #572012)
+		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+
+		local size ico icofile
+		for size in 16 24 32 48 64 72 96 128 256 ; do
+			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
+			if [[ -f "virtualbox.png" ]] ; then
+				doicon -s ${size} virtualbox.png
+			fi
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="virtualbox-${ico}.png"
+				if [[ -f "${icofile}" ]] ; then
+					doicon -s ${size} ${icofile}
+				fi
+			done
+			popd &>/dev/null || die
+		done
+		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
+		insinto /usr/share/pixmaps
+		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
+	# The compile phase makes VBoxPython2_7.so.
+	# py3 support would presumably require a binary pre-compiled by py3.
+	use python && doins VBoxPython.so VBoxPython2_7.so
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+	fperms 4750 /opt/VirtualBox/VBoxNetNAT
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
+
+		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	gnome2_icon_cache_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.8.121009.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.8.121009.ebuild
deleted file mode 100644
index 256314a1aed2..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.8.121009.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
-MY_P="VirtualBox-${VBOX_PV}-Linux"
-# needed as sometimes the extpack gets another build ID
-EXTP_PV="${VBOX_PV}"
-EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
-EXTP_P="${EXTP_PN}-${EXTP_PV}"
-# needed as sometimes the SDK gets another build ID
-SDK_PV="${VBOX_PV}"
-SDK_P="VirtualBoxSDK-${SDK_PV}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-if [[ "${PV}" != *beta* ]] ; then
-	SRC_URI+="
-		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
-	IUSE+=" sdk"
-fi
-
-DEPEND="app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${MAIN_PV}
-	!headless? (
-		dev-libs/glib
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/libpng
-		media-libs/libsdl[X]
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		chm? ( dev-libs/expat )
-	)
-	dev-libs/libxml2
-	sys-fs/lvm2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S=${WORKDIR}
-
-QA_PREBUILT="opt/VirtualBox/*"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_P}.tar.gz
-	popd &>/dev/null || die
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-
-		# set up symlinks (bug #572012)
-		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
-
-		local size ico icofile
-		for size in 16 24 32 48 64 72 96 128 256 ; do
-			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
-			if [[ -f "virtualbox.png" ]] ; then
-				doicon -s ${size} virtualbox.png
-			fi
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="virtualbox-${ico}.png"
-				if [[ -f "${icofile}" ]] ; then
-					doicon -s ${size} ${icofile}
-				fi
-			done
-			popd &>/dev/null || die
-		done
-		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
-		insinto /usr/share/pixmaps
-		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		doins -r sdk
-	fi
-
-	if use additions; then
-		doins -r additions
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp
-		doins -r rdesktop-vrdp-keymaps
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
-	# The compile phase makes VBoxPython2_7.so.
-	# py3 support would presumably require a binary pre-compiled by py3.
-	use python && doins VBoxPython.so VBoxPython2_7.so
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-	fperms 4750 /opt/VirtualBox/VBoxNetNAT
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	local udevdir="$(get_udevdir)"
-	insinto ${udevdir}/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	sed "s@%UDEVDIR%@${udevdir}@" \
-		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
-	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	gnome2_icon_cache_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index c8f73c4b4547..7e56c222d0a9 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,11 +1,9 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.32-120294.tar.gz 19589163 BLAKE2B b35d9bb90216a77706fe5f0de624affaff4177d4b6e561f7c76003efd1a386a1f5b5f6b1c6b559cddde6ffb55ab5f7eba3e4c9b2135f31c09313b473ba6579e5 SHA512 c1e13fc59b9556f980bec02bb2860e717f752d42c3d810f70267e5c07898bb1aba9d3f3403fa5aa388478aa609397da49dcf10311836d68093101715a6ae200d
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.34-121010.tar.gz 19591849 BLAKE2B 573afe3624a3eace4272a067f472e32dbe344755814aefaa8d6685da0ff31e04faa7f6a22a58974938067fce3a0ea3d66a0c5d02db999105029cc7c5c8fea24b SHA512 4f05bc7abe989fbc0928aba259ad60b09f5b085859c0ddc3e24c052fdb4becb055795c8f0038fc4dd95be7b9954a3034afd499798bb58fe16522602cfe91e7fa
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.tar.gz 19605234 BLAKE2B 4b263b27b130e5b5d7917f15f0dc782f28f7708cc10e22028ee27b33be6541df5211c4fb36951a6b293d19b8933182097cd0575da8c1d00b6a96e747c1962762 SHA512 e11b294da83b4605c40132f2ea5f95f2820f901d2ed1d438c22c4cc9f779baa3112b9334036717d1593d5f9ec8374d7d7bc826012e2019ef0ba79bacb1deb7b8
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.tar.gz 19717251 BLAKE2B 90dcaa58284c6dc9101dbc8eb9ceda55d16c4a48fd58fb43c4a6b7d3d5c582c31930f6e773397ae9379e75771c88b40aad276436bb1d56a71a8e744353e04ec9 SHA512 ba44d53e06adababd0ac7c8a68ea025e1e7afd39fe648079bbb879e81130d45f00b944795cfd37f7f05c16d5a7723b85c49a8435c8399180af627dd3b3de00bc
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.10-122088.tar.gz 19482093 BLAKE2B ca02e9226b774340ecd31688f296304d7c963f20177d523058a1a2997cc287c59fc6e4df8bcc5024ec55cc7b79b1319f61bc9f3697cdb9c4c36423a77221cb82 SHA512 90e9d1c0235d14df9a305fa48102528b839c266abe18f97dcb945729cb9a0136cbf0686b69b82fcc76508cf7674c5b5dcb6563319af9ca0c294218802eaa9173
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.8-121009.tar.gz 19469421 BLAKE2B 81651876802ad767339f3984a26375118f01e4b99b4247398e0cea8d749905431b40945f8a72d0c7802b2743080f01d3044aafd21600c4927773994c5a114a1f SHA512 2b69e2acab91ce95e9807006c79862fc0d1d10fdd269bd9cdf8f11b6704821823b103c7a4a76ad99c10e0868bd397ffe0e72b2eb2aa4fc2bd81ff968c71c2280
-EBUILD virtualbox-extpack-oracle-5.1.32.120294.ebuild 1087 BLAKE2B 6c233d604a66c0abd454b537e5d374210a83e8a6a1cff28ab07d78af52fd94385f7eda46c9efa320b53f2deb2f6baf6d3581a0ab56bac91e841f074585d5d3c5 SHA512 ce18fe7011e3d6942d4718617d2d1218d19e50bc8fa80e03db4c78a2d16739a6dedee75de58bfaea6a28b45010cc26c8fda09d85ead4e69f229911c5a7f61e05
-EBUILD virtualbox-extpack-oracle-5.1.34.121010.ebuild 1089 BLAKE2B 89bfe2611b6f560d44f12abc203e9f3fabdd0ded2c9c6c6315509c989897b71acffa3fa0c33cdc3feb51ffcdcfe3a8daff0dedf13d2360a1f447328978f45673 SHA512 714732f55a0ed46ce33a89a0170247be72d06f0832ef0a0d5adc282a560111842d77898096fb768a63acb26e8e96962d0ede3555bc13aa6ad5985f611f3de8bb
-EBUILD virtualbox-extpack-oracle-5.1.36.122089.ebuild 1088 BLAKE2B 7d027b958111dcdfb406a3b9d7728fbf55cc1dad921a5e23369bde529691fa774c2ee2685c452e4f293afca3a63e53b4a21940a92ef0265e440c793f062dc726 SHA512 2aa971d5fdb40214b7095526af7baf480289ecaca29bde29548e6eed8bd7b8543fa11751890b81b20341af4272e646fd84467e3e56206fe2e2fbc3383cc1bd09
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.tar.gz 19590585 BLAKE2B 433ae630e55f2320d48c06d0fd5120528ee10c04f2e471da3a72fb98ae826b2909fa5fcd2a4ad7c875a1785d07c0a3dc9ec3001fa7d16903037731dbe1e24a75 SHA512 3e55cb2c8a5adfdac988b81804650aa35e66e052a946b371d61a92d459e5dbb83495f80423f22cfa2a4c2196cf94d1146ff5aed621985f27f2e5069c13f5daee
+EBUILD virtualbox-extpack-oracle-5.1.36.122089.ebuild 1087 BLAKE2B 6c233d604a66c0abd454b537e5d374210a83e8a6a1cff28ab07d78af52fd94385f7eda46c9efa320b53f2deb2f6baf6d3581a0ab56bac91e841f074585d5d3c5 SHA512 ce18fe7011e3d6942d4718617d2d1218d19e50bc8fa80e03db4c78a2d16739a6dedee75de58bfaea6a28b45010cc26c8fda09d85ead4e69f229911c5a7f61e05
+EBUILD virtualbox-extpack-oracle-5.1.38.122592.ebuild 1089 BLAKE2B 89bfe2611b6f560d44f12abc203e9f3fabdd0ded2c9c6c6315509c989897b71acffa3fa0c33cdc3feb51ffcdcfe3a8daff0dedf13d2360a1f447328978f45673 SHA512 714732f55a0ed46ce33a89a0170247be72d06f0832ef0a0d5adc282a560111842d77898096fb768a63acb26e8e96962d0ede3555bc13aa6ad5985f611f3de8bb
 EBUILD virtualbox-extpack-oracle-5.2.10.122088.ebuild 1089 BLAKE2B 89bfe2611b6f560d44f12abc203e9f3fabdd0ded2c9c6c6315509c989897b71acffa3fa0c33cdc3feb51ffcdcfe3a8daff0dedf13d2360a1f447328978f45673 SHA512 714732f55a0ed46ce33a89a0170247be72d06f0832ef0a0d5adc282a560111842d77898096fb768a63acb26e8e96962d0ede3555bc13aa6ad5985f611f3de8bb
-EBUILD virtualbox-extpack-oracle-5.2.8.121009.ebuild 1089 BLAKE2B 89bfe2611b6f560d44f12abc203e9f3fabdd0ded2c9c6c6315509c989897b71acffa3fa0c33cdc3feb51ffcdcfe3a8daff0dedf13d2360a1f447328978f45673 SHA512 714732f55a0ed46ce33a89a0170247be72d06f0832ef0a0d5adc282a560111842d77898096fb768a63acb26e8e96962d0ede3555bc13aa6ad5985f611f3de8bb
+EBUILD virtualbox-extpack-oracle-5.2.12.122591.ebuild 1089 BLAKE2B 89bfe2611b6f560d44f12abc203e9f3fabdd0ded2c9c6c6315509c989897b71acffa3fa0c33cdc3feb51ffcdcfe3a8daff0dedf13d2360a1f447328978f45673 SHA512 714732f55a0ed46ce33a89a0170247be72d06f0832ef0a0d5adc282a560111842d77898096fb768a63acb26e8e96962d0ede3555bc13aa6ad5985f611f3de8bb
 MISC metadata.xml 343 BLAKE2B 9e18764cb3f6a1df7858366112557de847f14dd2d7415612da0ebe28895a92a7714d0295f3551ddc62711bf84d5be253ddda3146f6121d52c4f86c05a20ad835 SHA512 88eabdec952f2eee2490f23050b39127f500765f6f93adecb9cfdb62776d73e9dddcdb56756b41041ed4727375ffb0e5f729c219a7de5620344bbee10bbc06c9
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.32.120294.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.32.120294.ebuild
deleted file mode 100644
index adb086974170..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.32.120294.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.36.122089.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.36.122089.ebuild
index 60f6ed51c632..adb086974170 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.36.122089.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.36.122089.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
 
 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.34.121010.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.38.122592.ebuild
index 7d7d5d2ea35c..7d7d5d2ea35c 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.34.121010.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.38.122592.ebuild
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.8.121009.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.12.122591.ebuild
index 7d7d5d2ea35c..7d7d5d2ea35c 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.8.121009.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.12.122591.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 1f70bef8b815..dc46fc938505 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -4,16 +4,14 @@ AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c0
 AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e5de2ada767a06341f9259a9e491660e796640dd4a251fbbf85f66786b8ec829357aa51546e502ca99452fa998ce20031637 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
-DIST VirtualBox-5.1.32.tar.bz2 117268301 BLAKE2B 336df054e3407d7e701d6719258cfcba9beec1439cbe94f137570cfcbdea02df3e34374ac36d3b4387c47ebafd17a0f05c2fb710eb4f140d8200117b505aba98 SHA512 052ac1672515a36c4138e2d52672a466d4c768f219f52eefe98e747a292ebebe04e7de35547eae6803654be5dc937b8e6f4d358a65fd4f49a8333eac8862d138
-DIST VirtualBox-5.1.34.tar.bz2 117291269 BLAKE2B 0eb9b3f778f2d677ac3635fa59dfa6861d0fec3c0331582e5961b78ab55b5ab26bbf286de05a3e87e8a64e2b54861613a8d2c93f70736a07c551dca834786abd SHA512 0f828e58d68678a0a94a39c12313425105f9255ca207d40dd04065d0072857cdc4fc886f944b852c3fb63fed04d70a3449aecd2aab9e27af7f13b506143a4b6f
 DIST VirtualBox-5.1.36.tar.bz2 117244376 BLAKE2B 141048f4fcbb3ce63d236a4127b4bce377e87876c23dc3ff6437b2c0cca5b468bc6a5737899b308bc1ff3252d4e61f7d053ff7574c33c85b56fdd986c31f2af3 SHA512 d1a9322c97c68cc9c21247c3df8ce2084911aded66a63adf5510f9e0f4558b1304dfe924a0c44243adc1ae8f7c45c47782e882baac1bfe995ea6c0a1370fcbd1
+DIST VirtualBox-5.1.38.tar.bz2 117345233 BLAKE2B 15ed86a1f6730c781a0b4b055dcccfb56ff9c829c90dc4d2aa96cc2bb5bcfa8e442bdd471a7c70c5520bef994592e8f1a5b46831df4039efb5358c2e0ab83413 SHA512 6cf8536c24aa3a6e889214ef6133eb18fdbe1e7c371323cad07aa63b0e1f4414ba13d5fa7b63c12dfefe60e2e544488ced107571f678a06eb094a3e19b377ea8
 DIST VirtualBox-5.2.10.tar.bz2 118575607 BLAKE2B 46360d63cf6d1b8744016cbb2c1eee1d57ebafc45f8b32782c7216fc547f24af4c7205b4e7c34d24cd7faf7e8ce4ea8373ad4a310040a6ef9b043a8ce2300f94 SHA512 1e6d5e5c6ce45d9a3864860819f6301c192c83be154c674cfb37c98506db88a8f70526ec05d115c53e40c4c91d243513f0a3196261c7dee244a18091b2e5717e
-DIST VirtualBox-5.2.8.tar.bz2 118500065 BLAKE2B 64d0cc0f928d224332f59e7966ee1bed8adcf097d27c577b6ecea5cbf203e170e38acca9f2371d6d7aa11f63b73e705b43a0516ccbe5993171f928406b8a3876 SHA512 49a3bd1c60d2c4cbd3799ece5fbfe15d9b6a00c5af9692478a1365a8eb4975228410e17dba24a388c0cf5387cb79fb7492feb4e6b2f531bc17322c3d61de7887
+DIST VirtualBox-5.2.12.tar.bz2 118612426 BLAKE2B 685c400ef82de14891d9cc42e94e8c0de270a57d6e69820d45cf7fda0ef32d78d4c2670b4a2b89003d58035ee50d648d7906e58d99a96d40c24ee2fa51a317c9 SHA512 083219501d0103d1060cd470cad5a29a348341abf92c1caccf10e7fcfcf0db163e95d6624614d327dda7500d638d3038634fa8a3c1c441a6ee8de9e4f51325d2
 DIST virtualbox-5.1.30-patches-02.tar.xz 2608 BLAKE2B 08b05a26622a7acec455f6d0dc72858f5f2758488e50d219f83c3d12606419d48e9d99302cde5a275929fe79af900c1b3ea3957fe9dfdaa952aaa0da9933291a SHA512 8a490f7cc44e40262fc47819736251c177adb635256794e9500f52729197c85211d5b0c0d000268089953a4c185872a8ba03c5d42df6b80f05eac8b81335320a
 DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2
-EBUILD virtualbox-guest-additions-5.1.32.ebuild 5995 BLAKE2B c34c1d3e312781ad4a4a390f12e4986ee197a690f5875f829bf3e87fa7a0741d5eb2c08f506d9a5b43590ea762eb26cf516db591a1b55a2f27e5c36f8fc313e8 SHA512 068ae5ecd8aa8e9f30f5272f1a1f58f8da92b78ee0f62784e335ebcbd63605b34d6654bbb35b16d4b4572bce75478827de217aeacc062bfdd7e206d7d38c7bb6
-EBUILD virtualbox-guest-additions-5.1.34.ebuild 5997 BLAKE2B bd1110242825d9eccfa7235ce8de8fafd720610652dee85169f9e14c4fa6c806619736ab8db2b4f8041aef0a7fe0c6fa8dcd7a49a488287d8b0677b099894494 SHA512 b28006deb4ebe0bb199296262dec479bafc5a02c239116f2e3da9cf8198aca5fbbb281f6679b8415d3a0ffb88e3e42de4f71b808b2f0c38203af66cdebb36683
-EBUILD virtualbox-guest-additions-5.1.36.ebuild 5996 BLAKE2B 68dd168d4701ba1ee7c2e9d4fc1808a0b334034a5d3cb91c06fc91aa7c57989a78d9d76742c3cbf8a9317e4234bc1253afb62b843ed352f2d1e4b76d178dcab2 SHA512 0eaa46c2680ef73838918b3981bf3f57a5785edffe0910df6c385e308e588183b2c31a674762078986b2a214797a93b3414a03aaa14eb3abb959ef25ba4f5189
+EBUILD virtualbox-guest-additions-5.1.36.ebuild 5995 BLAKE2B c34c1d3e312781ad4a4a390f12e4986ee197a690f5875f829bf3e87fa7a0741d5eb2c08f506d9a5b43590ea762eb26cf516db591a1b55a2f27e5c36f8fc313e8 SHA512 068ae5ecd8aa8e9f30f5272f1a1f58f8da92b78ee0f62784e335ebcbd63605b34d6654bbb35b16d4b4572bce75478827de217aeacc062bfdd7e206d7d38c7bb6
+EBUILD virtualbox-guest-additions-5.1.38.ebuild 5997 BLAKE2B bd1110242825d9eccfa7235ce8de8fafd720610652dee85169f9e14c4fa6c806619736ab8db2b4f8041aef0a7fe0c6fa8dcd7a49a488287d8b0677b099894494 SHA512 b28006deb4ebe0bb199296262dec479bafc5a02c239116f2e3da9cf8198aca5fbbb281f6679b8415d3a0ffb88e3e42de4f71b808b2f0c38203af66cdebb36683
 EBUILD virtualbox-guest-additions-5.2.10.ebuild 6099 BLAKE2B 4ef9d7f4206d4c584d505c503cebd317b92ee4b7611b015d91d1390f3b07f29de9c7d1059784a13524e3b033c05afd9589203f19f11b64f1c6f8ca8a21dd3334 SHA512 43964cbab6d17f7133f7387e13058d566f4c461ddb9ea315a4fe726783fd97ba7c4d3dc3e98b0189f31cf946ccf9fc8812c217fbf4cc75de38c5d28a91b54b63
-EBUILD virtualbox-guest-additions-5.2.8.ebuild 6099 BLAKE2B 4ef9d7f4206d4c584d505c503cebd317b92ee4b7611b015d91d1390f3b07f29de9c7d1059784a13524e3b033c05afd9589203f19f11b64f1c6f8ca8a21dd3334 SHA512 43964cbab6d17f7133f7387e13058d566f4c461ddb9ea315a4fe726783fd97ba7c4d3dc3e98b0189f31cf946ccf9fc8812c217fbf4cc75de38c5d28a91b54b63
+EBUILD virtualbox-guest-additions-5.2.12.ebuild 6099 BLAKE2B 4ef9d7f4206d4c584d505c503cebd317b92ee4b7611b015d91d1390f3b07f29de9c7d1059784a13524e3b033c05afd9589203f19f11b64f1c6f8ca8a21dd3334 SHA512 43964cbab6d17f7133f7387e13058d566f4c461ddb9ea315a4fe726783fd97ba7c4d3dc3e98b0189f31cf946ccf9fc8812c217fbf4cc75de38c5d28a91b54b63
 MISC metadata.xml 343 BLAKE2B 9e18764cb3f6a1df7858366112557de847f14dd2d7415612da0ebe28895a92a7714d0295f3551ddc62711bf84d5be253ddda3146f6121d52c4f86c05a20ad835 SHA512 88eabdec952f2eee2490f23050b39127f500765f6f93adecb9cfdb62776d73e9dddcdb56756b41041ed4727375ffb0e5f729c219a7de5620344bbee10bbc06c9
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild
deleted file mode 100644
index 3c8b9c6ca161..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils linux-mod systemd user toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE )
-	sys-apps/dbus
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	x11-base/xorg-proto"
-PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# stupid new header references...
-	for vboxheader in {product,revision,version}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" \
-	emake TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	insinto /usr/share/doc/${PF}
-	doins "${FILESDIR}"/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild
index 09123943ca80..3c8b9c6ca161 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 RDEPEND="X? ( x11-apps/xrandr
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.38.ebuild
index 97d4f9402e9b..97d4f9402e9b 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.38.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.12.ebuild
index 9a895f357c2a..9a895f357c2a 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.12.ebuild
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index b7ec52291306..00c08ee23031 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -3,14 +3,12 @@ AUX virtualbox-modules-4.1.4-pax-const.patch 1729 BLAKE2B 3cada201a2bfde671c073a
 AUX virtualbox-modules-5.1.30-udp.patch 1239 BLAKE2B d49d96894bae2fdedc2b8a825c849a99ad0cf36a92cc4d89881ce72a0b7ebd53174f39e298c119670654932b790113fe7fbc3a3bae552f2c597cad20a370141f SHA512 f22e6c8edc360e0f97b207ba9a046042ef1898c10c724d9519badef004858720040caef12bffa1ed0f07517ae2d0b831973a0e4ef8ffb239a26faf62706b0618
 AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8cea08a6dbe78f75dd89aa072ac2ac0d745e598e8195ef321eaee53d31bedf52013d94efc046863e65c9fac0d61a507b292b04c7fb9 SHA512 600fd557992efb1fb5db9db64914becd5a86f81a42d70bbc3823533df941881f2289a6ccf630adb8346419499dd48b84ed43c21d0aba183a780daa99fcafddbd
 AUX virtualbox.conf 38 BLAKE2B 853f2ba0ac1627100241e778fa6c35ff4fc86e8c9c753f8aa23cb053ffacf966c131c5630d1fafd481d7b057acc3e9d6f8f1a22766db5d1cf61fffa38de7c01b SHA512 b61936fff57426d31efa6928eadb572cafe40a65d3e31a0eecb53dc784ba9d0a9e0ad5e419df74418b977f89c17873240c38e2ada95949e5252d879110d6094a
-DIST vbox-kernel-module-src-5.1.32.tar.xz 626600 BLAKE2B eb3243d62d1a22f41f5ea2307b13a3f5ce17a19edcecb0340f94d34995e557b016195443a53edc9d68a313d064008e5af04c7fff28540ec513c6e9a5955e02e0 SHA512 10ead68e53ae6bd72e39b31d536fc36e0999fe506a6d7fd6a6f9e462d539213ad65deb56e2b926baa5cc4b16fb4071d89e105889e873fda0e4a1f20387a7cd39
-DIST vbox-kernel-module-src-5.1.34.tar.xz 627576 BLAKE2B c1bd2af511824e5a74c3b85b73b7bc1664dd3651db3c17bbcba06b5ef8d9ba11c1a5c92bf28f443fb17aee1d057310f20a62c1a4608ce84eb087de61cbe67c25 SHA512 6176036a22d316e15c6560c124cfce9e93c6508a78e189bbe8e431ccf006b74d5f34ea747c9ca307bbd90e0c6fa414056ae0b56a5aa8124c2263de3d0dbf97d1
 DIST vbox-kernel-module-src-5.1.36.tar.xz 628368 BLAKE2B 49a3dfc4ff573f793eefcfd9b645af6fa6fc63b54475921064be146d3d4bf4db61f48d82f62d65811597fa12b88331153f7491890527fde76f41426355552abb SHA512 c69739c72a5555fc3bca90186129fa4eeb5bd930c4396b416a8a88e6f84bcd9e7498a9bbc9381da648cf87d601d98249feac2e4de6d93d8b7aba46b22d3ec40f
+DIST vbox-kernel-module-src-5.1.38.tar.xz 628552 BLAKE2B 9faa4e837a48ac27be5c0183edcf2b39c08eeab210bd39811704a7a578a93b28f8b8ecf26a34483f2d135a8cb8817756120d7bef0b8de245c5a5e232cfebfff0 SHA512 36311c3ff947fa763db1fc0612c5a4c10ac3d586c3faab3a91e463723488510cedfc1a69696381158a167edfc86d7abf66c18b287ced75cbaba3f1797c4265a8
 DIST vbox-kernel-module-src-5.2.10.tar.xz 637080 BLAKE2B 303fd6191247df0560f161b12665b95f372de1a18755b937f7af8fecab6669337ccaf22f635219080953795cb9bc4c80bc21a8273e28b5cf8ba3ba9cf930e2cd SHA512 56e837f19a63856dbd57379dd78bf46b90ddeb3a60df9d18a46a6480c7021040b7674599fd0b48a9c3db241756539bfaa88becf6e42acf8725e2bc89e3879773
-DIST vbox-kernel-module-src-5.2.8.tar.xz 636172 BLAKE2B 0a0be16ee830dbf60e9bd8e0aa977ad020374d65c4ea19689bd20f7399da87633ac9ef57e2297963937e4d5eb82173a50beacd8ddd1b54943fe8d24fe723e3f4 SHA512 8875048d827ebbedec37864e219033305a228903b01d7ca22b371b02de9b23099d3bc76ddef4887b633f1215e73daa5db6e35c8d2e21f90200f439b15792d05f
-EBUILD virtualbox-modules-5.1.32.ebuild 1585 BLAKE2B 880c04c95561aec23bbb9c2324a5cec2b17bd9fc77555d595560a85c5e3df42383ef00ee8cd488caabcc205eedfb7da3ef6e549b84d3abd248e7fd2c1979a7eb SHA512 5b48e0068a2e4012549465b5989c7563e135c9db4671eca02bccf75277f2aaa9ed74d3f3d58642b92403611729f5d9a259d262a32ebc499cabc976deb2d617b3
-EBUILD virtualbox-modules-5.1.34.ebuild 1587 BLAKE2B 234cd56aff2a2cc66f52538709a09205aad5278748ba3ec8004622a34a18a9e2d241d87cc1f50f6dffcc6dc0073327581eebdadf5e77c494ce3402fb3c6cf123 SHA512 dbe458080d79628c642890477282ad14ece9a5e6ef3a67af2d8609d786e8dc732bcb1715e9b7f4e6b8f33e0405c10411911f73cc3076f0c72e23fb2077577583
-EBUILD virtualbox-modules-5.1.36.ebuild 1586 BLAKE2B 6e0c4be544d0e4d349fa86522698babad5b3b60c702807e28fa2ad606e2dae5620e761f7781e79a83921c49dc07f43d86081b10ffe4fad98bd8ec4d7540bc471 SHA512 61df3210f63be28d9b40287d7bb571301d9fd85da09c492acb7bfb45242fbd1824426b88b9fb9836eef2e9e7794446db8005a92ebb38a27b8b5b675c04e3d5ae
-EBUILD virtualbox-modules-5.2.10.ebuild 1349 BLAKE2B aedb499c747c2d989090144f652365ad550f578edb98d454c6e34e3efb3d86a780f12c2b09e382c685ce103ac94419432b83e163b64d68ade370898eb4dc2ed8 SHA512 8f377b5f4ab0f8c1ab98b93cfd00480a91033596ba59a604c9af00f857012f432c41a5b097b795182699ae9869eb9090b788dbdb2addbca1f0c0148cb6c09b55
-EBUILD virtualbox-modules-5.2.8.ebuild 1349 BLAKE2B aedb499c747c2d989090144f652365ad550f578edb98d454c6e34e3efb3d86a780f12c2b09e382c685ce103ac94419432b83e163b64d68ade370898eb4dc2ed8 SHA512 8f377b5f4ab0f8c1ab98b93cfd00480a91033596ba59a604c9af00f857012f432c41a5b097b795182699ae9869eb9090b788dbdb2addbca1f0c0148cb6c09b55
+DIST vbox-kernel-module-src-5.2.12.tar.xz 637292 BLAKE2B 31b54c8de560a30d228497f5a3f58f868ad09e18051f8fac2257200e324603c5fdfe127d530997f7dae728d13d93ced6321487f20571811352bfbbf1f9c6d646 SHA512 7408e8121bf278050728461d4f7ab4d4b6c502b24859573d4652a58d1058e9b12a4de4b582ce45f7d0b12bf369a7378107c2cab12a6e93b1b082a40d1f2e9712
+EBUILD virtualbox-modules-5.1.36.ebuild 1431 BLAKE2B 9ea7afbf141d43d3c6a22d5bb934bddb1c67a6afa69d65ac905df930cde73d5c8b921b11f4954e3577b6b63a1b1c156d23c97c9aaceeb2fd51be75d81df1d936 SHA512 e5becf1d7298567966b7653b73e3245a9db59b3eca1659890b004d8116a1c150e8c7042a81bb7fd9c0757328895dfe12c39baee9a49375110903d83f6422c988
+EBUILD virtualbox-modules-5.1.38.ebuild 1350 BLAKE2B abf66852d4f907de436721b8c8f06dfd3c3676a0676d6e569147e01aced9b6f5492c9e9a2ddaee5798b38aba0fbc8d812179427d8eb7c45e732ef9093542d40f SHA512 e09b4178d5e20260cdd59597c514a4cc7d78b8caa8e126248f213f3bb4a665762216f07076efb6e81b822920a80c09979a94df11a952488397ced662f8862108
+EBUILD virtualbox-modules-5.2.10.ebuild 1195 BLAKE2B 06cf73894136a6dfe80f0cb7b32850bba3590cf72aa23369801bc4f58f7d96d109cb88d4c84d0c00c7bca8b5b17671b5e1478279a79bc7f642b5f3faf4fede3f SHA512 a12223da83f398dacc597d9ff7d0a0592809acfc5033300ead3e5f1ad4672b1527138418db0bc9f16879456d9f136618952e324d42b22645416564942d5649b1
+EBUILD virtualbox-modules-5.2.12.ebuild 1195 BLAKE2B 06cf73894136a6dfe80f0cb7b32850bba3590cf72aa23369801bc4f58f7d96d109cb88d4c84d0c00c7bca8b5b17671b5e1478279a79bc7f642b5f3faf4fede3f SHA512 a12223da83f398dacc597d9ff7d0a0592809acfc5033300ead3e5f1ad4672b1527138418db0bc9f16879456d9f136618952e324d42b22645416564942d5649b1
 MISC metadata.xml 502 BLAKE2B 043fc7e11b803453d5c193562322ade34ce17f5966c5ba6f557c605174bab43a47fe374684b7f3b10a87d92429c70006abc2759169124c0b29ad28ad4c181b46 SHA512 399c87acfd980b7dc29b42d7eeeead868bc8e9efc085f23aa97507d9da6f4af272e747172c4d5d6c1dfe15dc125193a72a5d6ca47ec82615345e239ff26246e4
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild
deleted file mode 100644
index 47aefd145ca7..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=6
-
-inherit eutils linux-mod user
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	enewgroup vboxusers
-
-	CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
-	ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
-
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-
-	if kernel_is -ge 4 14 0 ; then
-		eapply "${FILESDIR}"/${PN}-5.1.30-udp.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.34.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.34.ebuild
deleted file mode 100644
index 36cdb4815a37..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.34.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=6
-
-inherit eutils linux-mod user
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	enewgroup vboxusers
-
-	CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
-	ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
-
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-
-	if kernel_is -ge 4 14 0 ; then
-		eapply "${FILESDIR}"/${PN}-5.1.30-udp.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.36.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.36.ebuild
index daf8d26ef33e..ad4b2205685b 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.36.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.36.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
@@ -28,13 +28,8 @@ MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vbo
 
 pkg_setup() {
 	enewgroup vboxusers
-
-	CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
-	ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
-
 	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
 }
 
 src_prepare() {
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.38.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.38.ebuild
new file mode 100644
index 000000000000..027b2333e334
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.38.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=6
+
+inherit eutils linux-mod user
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	enewgroup vboxusers
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
+	fi
+
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.10.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.10.ebuild
index 81bd3967d83a..0fd483ae195e 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.10.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.10.ebuild
@@ -28,13 +28,8 @@ MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vbo
 
 pkg_setup() {
 	enewgroup vboxusers
-
-	CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
-	ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
-
 	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
 }
 
 src_prepare() {
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.12.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.12.ebuild
new file mode 100644
index 000000000000..0fd483ae195e
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.12.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=6
+
+inherit eutils linux-mod user
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	enewgroup vboxusers
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild
deleted file mode 100644
index 81bd3967d83a..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=6
-
-inherit eutils linux-mod user
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	enewgroup vboxusers
-
-	CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
-	ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
-
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 022379a5deb6..cb1b28322108 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -10,16 +10,14 @@ AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0df
 AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f62f9be99cf87c57c42d118abb42b9436a0a83736d882b34360c9f8e67f9a8adaeffe7e9a3456c4ddc93a7850e53 SHA512 96f9ab8e2a83b5aebbb66916cbca0a7af0e2d69285296fe87869f096149791e0491dec2408f21f7249b68d928eebe396ab710a4ec6b6d6bc9c67120d323effa0
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
-DIST VirtualBox-5.1.32.tar.bz2 117268301 BLAKE2B 336df054e3407d7e701d6719258cfcba9beec1439cbe94f137570cfcbdea02df3e34374ac36d3b4387c47ebafd17a0f05c2fb710eb4f140d8200117b505aba98 SHA512 052ac1672515a36c4138e2d52672a466d4c768f219f52eefe98e747a292ebebe04e7de35547eae6803654be5dc937b8e6f4d358a65fd4f49a8333eac8862d138
-DIST VirtualBox-5.1.34.tar.bz2 117291269 BLAKE2B 0eb9b3f778f2d677ac3635fa59dfa6861d0fec3c0331582e5961b78ab55b5ab26bbf286de05a3e87e8a64e2b54861613a8d2c93f70736a07c551dca834786abd SHA512 0f828e58d68678a0a94a39c12313425105f9255ca207d40dd04065d0072857cdc4fc886f944b852c3fb63fed04d70a3449aecd2aab9e27af7f13b506143a4b6f
 DIST VirtualBox-5.1.36.tar.bz2 117244376 BLAKE2B 141048f4fcbb3ce63d236a4127b4bce377e87876c23dc3ff6437b2c0cca5b468bc6a5737899b308bc1ff3252d4e61f7d053ff7574c33c85b56fdd986c31f2af3 SHA512 d1a9322c97c68cc9c21247c3df8ce2084911aded66a63adf5510f9e0f4558b1304dfe924a0c44243adc1ae8f7c45c47782e882baac1bfe995ea6c0a1370fcbd1
+DIST VirtualBox-5.1.38.tar.bz2 117345233 BLAKE2B 15ed86a1f6730c781a0b4b055dcccfb56ff9c829c90dc4d2aa96cc2bb5bcfa8e442bdd471a7c70c5520bef994592e8f1a5b46831df4039efb5358c2e0ab83413 SHA512 6cf8536c24aa3a6e889214ef6133eb18fdbe1e7c371323cad07aa63b0e1f4414ba13d5fa7b63c12dfefe60e2e544488ced107571f678a06eb094a3e19b377ea8
 DIST VirtualBox-5.2.10.tar.bz2 118575607 BLAKE2B 46360d63cf6d1b8744016cbb2c1eee1d57ebafc45f8b32782c7216fc547f24af4c7205b4e7c34d24cd7faf7e8ce4ea8373ad4a310040a6ef9b043a8ce2300f94 SHA512 1e6d5e5c6ce45d9a3864860819f6301c192c83be154c674cfb37c98506db88a8f70526ec05d115c53e40c4c91d243513f0a3196261c7dee244a18091b2e5717e
-DIST VirtualBox-5.2.8.tar.bz2 118500065 BLAKE2B 64d0cc0f928d224332f59e7966ee1bed8adcf097d27c577b6ecea5cbf203e170e38acca9f2371d6d7aa11f63b73e705b43a0516ccbe5993171f928406b8a3876 SHA512 49a3bd1c60d2c4cbd3799ece5fbfe15d9b6a00c5af9692478a1365a8eb4975228410e17dba24a388c0cf5387cb79fb7492feb4e6b2f531bc17322c3d61de7887
+DIST VirtualBox-5.2.12.tar.bz2 118612426 BLAKE2B 685c400ef82de14891d9cc42e94e8c0de270a57d6e69820d45cf7fda0ef32d78d4c2670b4a2b89003d58035ee50d648d7906e58d99a96d40c24ee2fa51a317c9 SHA512 083219501d0103d1060cd470cad5a29a348341abf92c1caccf10e7fcfcf0db163e95d6624614d327dda7500d638d3038634fa8a3c1c441a6ee8de9e4f51325d2
 DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2
 DIST virtualbox-5.2.0-patches-01.tar.xz 2460 BLAKE2B d3f973dc7ee0557c360f801c3bf84065a7e7bc9960984398b8f86d71fab32c59774e970c6cf873be07bcb9666af168570e8a78705a5999b1fc5d863dbbc6e538 SHA512 b91278dd81a50e412f5a281c72949f591a1c53303080549b74b28763cab9e3948948afb0256e0453d17736683cca3372a8e9c6d63f02f3eff3ef92c2a1ea332b
-EBUILD virtualbox-5.1.32.ebuild 13944 BLAKE2B 4c0da01774ca4fae3b3ecffdf6739282d268ddcf8b916173c946d1a4977f00dfa012dedeb818f6cfdd28197bd6410bb0cfeb14a5e752643d0c90110b90293b27 SHA512 2e8dc871197657b8783d032188a598e09366850ed6aba92d118f6e5789e443ccecf366c4dd160eaa189cb06919076ec73c1bdbb3045b50a2a7ca0c5e318fc61c
-EBUILD virtualbox-5.1.34.ebuild 13744 BLAKE2B 106f8f073d45142839343e6f8332cd4c2989096195e7437f34985a3ace51813a36a4b6cbbfeedaad1cc4c4e449d78baeade80291332a69419be7113e93c65675 SHA512 5530ec6aee0f7a9bc83c978a03ca4b63b18e7ed2e58f95bb481f959d666b7c75543604b00dd6912801a9c6d84ec26dd6427e69edfdb08e19018cf0e0a4162ad8
-EBUILD virtualbox-5.1.36.ebuild 13740 BLAKE2B 12b4d6b327aba2894ded8edcfa637ab426231b1bdf5a0518cffd42dc696af8be26d947bef48d1ee9ec8a3e228b60caab28721a2121be3e3d58557ff7b545829d SHA512 d562108108341b4a7fd627219631848a022243b717743dccbd05e52d3ce2d57694c2fcfc0e66dae2f4f45929fc010a28647e529d8044eecf16a8d6ef6c42e8de
+EBUILD virtualbox-5.1.36.ebuild 13739 BLAKE2B f5f6922da32d136ca9ec5df87db2bbe02c0a31ff1de2e6bd6de65e27a5a002238fe83ecf78ab66bc497df1789d251d15e4cd425cb5880a4bc69de20a50989729 SHA512 db26894e87c078a675f71f200c380f6e40ba8e9248a4e5119d6a49747b9bd35dc6fc05614b330c255784eab1ab2cd3fbd41803765257d35f81e396f549df19f6
+EBUILD virtualbox-5.1.38.ebuild 13741 BLAKE2B 3ef2174630759483ad199bccaa4bde5a32c633f13f5a601f089291982f4b8199b23182fe9edba927016d44a3188df8f5145d2718059f32417d65108024950732 SHA512 be794585dd46c608accce3c1a95627c2ad0d8681bdb2d1b71be97a67f4621aaeac870d7f72dfc9fb0e29e6910c8173e2079548348ffcc8d08c6bec028faf522e
 EBUILD virtualbox-5.2.10.ebuild 13729 BLAKE2B 3659a5c2cf0b7bcdaa1fd0e9fc797e0efc91a1d197676bec23000c13747e7ac85cb995503c79654cf49160b81a12544058144a63f8219d8e81df55e8cc2ae3e7 SHA512 971467d54021f1333e39cf15dc951454ebf55f0b63f496e381e962280cf4a8b33e416aa078e456f4fe71306a2ddb99842fbebb601d402d4fefa4145ffb6f6cbb
-EBUILD virtualbox-5.2.8.ebuild 13732 BLAKE2B 8ae5d949138ee928a0036289afc1936abca2dce7914fa36639b8df7990d1e7056d0f583319c9c8c0918a8f987e86ae2abb167584c921c8e7e3dc69261855f6cc SHA512 a7f242e2491e6e541981259a1434cbc944ff679d0b897aeb56530e048cb368b18b168fdf2252399c4831d224b99e527c5661ef7606f6d02ab983e8448ea21a62
+EBUILD virtualbox-5.2.12.ebuild 13729 BLAKE2B 3659a5c2cf0b7bcdaa1fd0e9fc797e0efc91a1d197676bec23000c13747e7ac85cb995503c79654cf49160b81a12544058144a63f8219d8e81df55e8cc2ae3e7 SHA512 971467d54021f1333e39cf15dc951454ebf55f0b63f496e381e962280cf4a8b33e416aa078e456f4fe71306a2ddb99842fbebb601d402d4fefa4145ffb6f6cbb
 MISC metadata.xml 886 BLAKE2B b8d7691c820ac4d8b0aa2033037a9229ebf68ba005b5c870e6d14dee4fbb9b5c0992904223caeb869fc265d48c57cd7f486d628cc4018cc018e8e32999175df3 SHA512 954d38fbbf08cce200af437ee3a0167bd39b4554c53b93d8f8961ac16e21a173fe4c4271fa8bf0ce2e354437c066e0ab4133131b03dac6ffcc2c92564584d081
diff --git a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
deleted file mode 100644
index de534c5671c7..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
+++ /dev/null
@@ -1,472 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.1.32-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( virtual/opengl media-libs/freeglut )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lvm? ( sys-fs/lvm2 )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130-r1
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jdk-1.6 )
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' -i configure || die
-
-	# Don't use "echo -n"
-	sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if  gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	local binpath="release"
-	use debug && binpath="debug"
-	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	# *.rc files for x86_64 are only available on multilib systems
-	local rcfiles="*.rc"
-	if use amd64 && ! has_multilib_profile ; then
-		rcfiles=""
-	fi
-	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${fwfile} 0644
-	done
-	popd &>/dev/null || die
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${D}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox 4750
-			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox VirtualBox ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.1.34.ebuild b/app-emulation/virtualbox/virtualbox-5.1.34.ebuild
deleted file mode 100644
index c23a8f3802a6..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.1.34.ebuild
+++ /dev/null
@@ -1,467 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.1.32-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( virtual/opengl media-libs/freeglut )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lvm? ( sys-fs/lvm2 )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130-r1
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jdk-1.6 )
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' -i configure || die
-
-	# Don't use "echo -n"
-	sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if  gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	local binpath="release"
-	use debug && binpath="debug"
-	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	# *.rc files for x86_64 are only available on multilib systems
-	local rcfiles="*.rc"
-	if use amd64 && ! has_multilib_profile ; then
-		rcfiles=""
-	fi
-	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${fwfile} 0644
-	done
-	popd &>/dev/null || die
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${D}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox 4750
-			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox VirtualBox ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.1.36.ebuild b/app-emulation/virtualbox/virtualbox-5.1.36.ebuild
index fe32f39d7b4b..0e61d6f6497e 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.36.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.36.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
diff --git a/app-emulation/virtualbox/virtualbox-5.1.38.ebuild b/app-emulation/virtualbox/virtualbox-5.1.38.ebuild
new file mode 100644
index 000000000000..73a8fc1d5787
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-5.1.38.ebuild
@@ -0,0 +1,468 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.1.32-patches-01.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? ( virtual/opengl media-libs/freeglut )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	lvm? ( sys-fs/lvm2 )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130-r1
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	!headless? ( x11-libs/libXinerama )
+	java? ( >=virtual/jdk-1.6 )
+	pam? ( sys-libs/pam )
+	pax_kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something less stupid.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Don't use "echo -n"
+	sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# Only add nopie patch when we're on hardened
+	if  gcc-specs-pie ; then
+		eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
+	fi
+
+	# Only add paxmark patch when we're on pax_kernel
+	if use pax_kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch
+	fi
+
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--disable-dbus
+		--disable-kmods
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex qt5 '' --disable-qt)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	local binpath="release"
+	use debug && binpath="debug"
+	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	# *.rc files for x86_64 are only available on multilib systems
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${fwfile} 0644
+	done
+	popd &>/dev/null || die
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${D}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use qt5 ; then
+			vbox_inst VirtualBox 4750
+			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox VirtualBox ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/virtualbox/virtualbox-5.2.12.ebuild b/app-emulation/virtualbox/virtualbox-5.2.12.ebuild
new file mode 100644
index 000000000000..9286de0063a6
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-5.2.12.ebuild
@@ -0,0 +1,468 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.0-patches-01.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? ( virtual/opengl media-libs/freeglut )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	lvm? ( sys-fs/lvm2 )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	!headless? ( x11-libs/libXinerama )
+	java? ( >=virtual/jdk-1.6 )
+	pam? ( sys-libs/pam )
+	pax_kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something less stupid.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Don't use "echo -n"
+	sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# Only add nopie patch when we're on hardened
+	if  gcc-specs-pie ; then
+		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
+	fi
+
+	# Only add paxmark patch when we're on pax_kernel
+	if use pax_kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--disable-dbus
+		--disable-kmods
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex qt5 '' --disable-qt)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	local binpath="release"
+	use debug && binpath="debug"
+	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	# *.rc files for x86_64 are only available on multilib systems
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${fwfile} 0644
+	done
+	popd &>/dev/null || die
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${D}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use qt5 ; then
+			vbox_inst VirtualBox 4750
+			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox VirtualBox ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/virtualbox/virtualbox-5.2.8.ebuild b/app-emulation/virtualbox/virtualbox-5.2.8.ebuild
deleted file mode 100644
index 54d2ee976690..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.2.8.ebuild
+++ /dev/null
@@ -1,467 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.0-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( virtual/opengl media-libs/freeglut )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lvm? ( sys-fs/lvm2 )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jdk-1.6 )
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' -i configure || die
-
-	# Don't use "echo -n"
-	sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if  gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	local binpath="release"
-	use debug && binpath="debug"
-	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	# *.rc files for x86_64 are only available on multilib systems
-	local rcfiles="*.rc"
-	if use amd64 && ! has_multilib_profile ; then
-		rcfiles=""
-	fi
-	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${fwfile} 0644
-	done
-	popd &>/dev/null || die
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${D}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox 4750
-			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox VirtualBox ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index ad6a5fcb88d3..db84e356cfad 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 51cfaaf33ab6..36eea079a3a7 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,6 +1,4 @@
-DIST eselect-repository-2.tar.gz 5441 BLAKE2B 28608b7e5d06747afea4ef28b0f45ac97dcea0310201d857f1248e7fc586a331fce01c9017df83c332cbfb55b51b52a45361e06db8a7d4b788a70f63eb4c83d8 SHA512 7667053b7d06117f49366d7bb6ad39b1b0715c778e49e18649ce38b364e58c0c31f4fa077a459374c52d3bb7f550002a4368cbb7fc14fd9961815bb1355c1f61
 DIST eselect-repository-3.tar.gz 5448 BLAKE2B 36a079f2a876709a2cc045e0c113f44f9feaa491c49d3773eb3e123ee7e7a7ffa2ad05060ffa62ac39ff8091a64ff995ea948f3c784ffbb7d8ddca5e468364d3 SHA512 ac3396a6d14fcc7d4df1f9b058bc3025875707f3febdf4d1e03122445d0e6273759b8a66443525c94daaf19f91b411c469aabc0e0082cd53980886a91f38a062
-EBUILD eselect-repository-2.ebuild 870 BLAKE2B e22c8fd54e02aefccb8281272f0525017ab2206a09cdd8541829c7de64d3ac5c1339a6b0e262eac938e6ab9bfd5bcd152504bac3e4fcd72f6a88aa9c9184111c SHA512 8ab3769bfa2cbaddcd180d12741cd21d1211dca039ec4ac9730b9f2ed8bc9c28be87aaec12a5eda3599efa8005b5f911f0e66b16cb8131e8e0c699a5f6f0f3b0
-EBUILD eselect-repository-3.ebuild 870 BLAKE2B e22c8fd54e02aefccb8281272f0525017ab2206a09cdd8541829c7de64d3ac5c1339a6b0e262eac938e6ab9bfd5bcd152504bac3e4fcd72f6a88aa9c9184111c SHA512 8ab3769bfa2cbaddcd180d12741cd21d1211dca039ec4ac9730b9f2ed8bc9c28be87aaec12a5eda3599efa8005b5f911f0e66b16cb8131e8e0c699a5f6f0f3b0
-EBUILD eselect-repository-9999.ebuild 848 BLAKE2B a0487c133cc3096374e30c2e2d024f346e4f1f3e8573ef29cc416a8ba9066a61fa6ea0fb2d7acfb6bb3ede0eb31fac7fa71f81ecc04f73b7dcf47d800ea6015c SHA512 0c3cc2c3e2e894d2fdb1ddd4123b76283c56120da2332f5b364b9e4941b39c11cc28c200162f9f2c994deab34f5b97580116431652058a971282171923daa261
+EBUILD eselect-repository-3.ebuild 906 BLAKE2B 0823c79e3eece3ff4faa02e68d7af7aad48f65c7008c555e401bf4ae904799641133c59b4ded810dca973a931fd48cbd0a86902e58cecff41c79cab3d85fc3e7 SHA512 8e0160a730c6538ed4d2dd2857d50f2de7286914b3ae132b0748540b151bf01a75c72da21aff390b5364122489ceef940a5eb3261d6dbc9c3d0c76f1f71d8e38
+EBUILD eselect-repository-9999.ebuild 884 BLAKE2B ef691a37c5b3e0180e5ccb56e0417bbfee46edeb78d652247e30db0162bbf77cd90ce438abb09d0060eee17ea7620b24f4789ddc6e6761f96e810668a99809a6 SHA512 1f97605e8a8f2762b83b28266f2b40a0db3a253e135ae829178d5abac6158406a97e40f459d6477870372ff350a1e620dac353d96deb342f7aa3ce8db97512ec
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-2.ebuild b/app-eselect/eselect-repository/eselect-repository-2.ebuild
deleted file mode 100644
index 0b15a7d8fdc8..000000000000
--- a/app-eselect/eselect-repository/eselect-repository-2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-inherit python-single-r1
-
-DESCRIPTION="Manage repos.conf via eselect"
-HOMEPAGE="https://github.com/mgorny/eselect-repository"
-SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	app-admin/eselect
-	dev-python/lxml[${PYTHON_USEDEP}]
-	net-misc/wget"
-
-src_compile() {
-	MAKEARGS=(
-		PREFIX="${EPREFIX}/usr"
-		SYSCONFDIR="${EPREFIX}/etc"
-		SHAREDSTATEDIR="${EPREFIX}/var"
-		ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
-	)
-
-	emake "${MAKEARGS[@]}"
-	python_fix_shebang eselect-repo-helper
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	keepdir /var/db/repos
-	einstalldocs
-}
diff --git a/app-eselect/eselect-repository/eselect-repository-3.ebuild b/app-eselect/eselect-repository/eselect-repository-3.ebuild
index 0b15a7d8fdc8..b060bbdb688d 100644
--- a/app-eselect/eselect-repository/eselect-repository-3.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-3.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
 	app-admin/eselect
diff --git a/app-eselect/eselect-repository/eselect-repository-9999.ebuild b/app-eselect/eselect-repository/eselect-repository-9999.ebuild
index 9899fabe6d79..3b84ea378340 100644
--- a/app-eselect/eselect-repository/eselect-repository-9999.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-9999.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS=""
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
 	app-admin/eselect
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 4eba086b0f88..8839bae966cb 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/man-pages-pl/Manifest b/app-i18n/man-pages-pl/Manifest
index f44f9b952210..37c9cdb3cd09 100644
--- a/app-i18n/man-pages-pl/Manifest
+++ b/app-i18n/man-pages-pl/Manifest
@@ -1,5 +1,7 @@
 DIST man-PL28-06-2007.tar.gz 3436680 BLAKE2B 2f86479fa37ddf8653b3b5252485df10384c7204e7c4642ea8cda7f61d203edd5d1a473d183c1e27064ff6cadd314a546b78c63ec9f57d8f5b94875f0e259333 SHA512 cc5de191b5dc7963018db8c2e7094b8e4e6db0dc0afefaa3a36e73a0bc70a3889d68ce78c4a900862dc5590a00bf57a3897050ed25c45d2f6f33765858cc4c8b
 DIST manpages-pl-0.6.tar.bz2 3513993 BLAKE2B 3447da36b9f49b726286575d858ce74043c6a4d3954ed0329dd06a5ba796c873dc7fcfb6f905998c4b1776eeb5f5f5069236d97b4429a0d75786703857a8f0b5 SHA512 ff1841ae4e1d01af46f6f3e28ad1543d3f46ce9580665a9b4a538e96e87f77ec5b36ad26c7dc38ac816dd3c864643d47e0f809c8382e56d0c1418209849eeffa
+DIST manpages-pl-0.7.tar.bz2 3791061 BLAKE2B 81809280c78ecafc67c59a5353a589c119fe6b590c9d655dae4accb5247a178df9f3f186822834f3426b0d41ed9ab83f335204eb654acf2cf5a472dd7ca4cafb SHA512 79293e1bbfbaed5f97e63cb86fc1b445ea960fdee96567899ba9f6836d4188e0d80d4788180c29fdca3d358359b6fd3768c195857657819534942ece2c43694b
 EBUILD man-pages-pl-0.6.ebuild 662 BLAKE2B 9d630bedb4b0694f754dc97ca23f44186581c221d9cc2105bd9b29acb7e66f5cba5a42829b5774962f039a64b35ba648b95f6717dd265f72b7366cc66e8065d4 SHA512 77aeaabfb8d23d76ffb005b37c1165fec78e89ba5038f3cc08375f7dc664d4c82069a009270bf606968f905a862183f40e0e70aba53b581282a7115067cea055
+EBUILD man-pages-pl-0.7.ebuild 738 BLAKE2B da7b9f9b6cf45d839d854585e1202f67c5a1e28a63037fd8bb79808c5c3ea208124fd5905ba256fec38fb76300b9c525fa70559958eff7a1a5b579ba7a6b875c SHA512 91eecb04dab7d1d7d98ee55035afc0091d987e264bf22173f8134f8fde342122542ab2bed5b0f468cb2e31639d8a8ef70835640d06f409dbf1af6fdcbf62a408
 EBUILD man-pages-pl-0_pre20070628-r2.ebuild 1188 BLAKE2B 8579e466cb9020b2debbba6cc69e78329ca83c479665b2bd6b62ff6df68de3c8fbdb2ad17a33906e38c3362bda4640a41b54b64112c4b1a5d7263a2c9b97e25b SHA512 8403f9b302ca681e6b53afd7afa3f83c7e8ac01e72d7424b74b4eb74103229eae5c83fdb846a159f7db68151d664ddaba7c461d19e29a4f671ce988199bbea07
 MISC metadata.xml 447 BLAKE2B e8f0a2348cf7a9937b9aeaf647ed1da769201f131b377f965ac3965ee0d86a5fec00b61b804f4145e0c31c274a850481f756c8510e6ed49a951d533a94a427ce SHA512 ce47231649316f102bc2b2318d51b548efd9159b3c2df9edfc0e17dda5710cac2a39c1cd86961d842f627c4b6b83fcf32da0b6194518109b7fd69355ec337f54
diff --git a/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild b/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild
new file mode 100644
index 000000000000..5e35393fd84b
--- /dev/null
+++ b/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PKG=manpages-pl-${PV}
+
+DESCRIPTION="A collection of Polish translations of Linux manual pages"
+HOMEPAGE="https://sourceforge.net/projects/manpages-pl/"
+SRC_URI="mirror://sourceforge/manpages-pl/${MY_PKG}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DOCS=( AUTHORS README )
+
+S="${WORKDIR}/${MY_PKG}"
+
+src_prepare() {
+	default
+
+	#mans provided by other packages
+	rm generated/man1/groups.1 po/man1/groups.1.po || die "Failed to clean up duplicates from build directory!"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" COMPRESSOR=:
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index bde6abb33c06..20ed542e7f28 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index 8f2fa2e263d3..68ef9debd17b 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -2,5 +2,5 @@ AUX dtach-0.8-CVE-2012-3368.patch 1040 BLAKE2B ded617740765ca7aa814cc98acb46a368
 DIST dtach-0.8.tar.gz 55472 BLAKE2B 9627075763f02787d7071658d1ae040d0c18dfe91f2954546398431e677b7c90cf67c23af0cc20182b354656d50b579c378f54d9f691853b7707a5761bc69b4f SHA512 ad0a788d10a5e1e1be4c353b64e1e4a0dc8c888492a638b2442d7c59ef31d67975357116435a1059141bfc2c82a3a6e9e490faa87cf81e5fc3bc7457a99c1193
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
 EBUILD dtach-0.8-r1.ebuild 472 BLAKE2B fe7f93c1bb254d2d1115f0cc96ead198ab266712fab96a4dc55bf93e04311cbbeea74b1f25b2bdb16e70520c3f3b70d2c3f4dd167271d1d4ba0c54cb46a28d4e SHA512 cddc92673cb9ab6153c477c2a77f95584edcb4a7140c5e275ddb9ad64773c56084e9609d06c9a00cb226ac3cbe71842114b6fd3522e0db6b624f4adb1fdd216a
-EBUILD dtach-0.9.ebuild 461 BLAKE2B 6c5c280f23ff5505d6c4b2c59f42ecf78a1e464b7e1652433667dd5e350c4b52f43402a377caf8fe5762353b312d2b15c1adf3a78a345cae739921d14fa239be SHA512 b71d0ca7f719e32094a4d511aa828ad9ed115a1cc0a0b48173b198810fb42a58d70bcfbcd1a7a3c8745ae5f928c8f55954a7c3336bf5e835ec180e0b91dd71df
+EBUILD dtach-0.9.ebuild 460 BLAKE2B 85a124bdde143018cb8f8fe0268f6abf6e90573e012d480681b648fb7b74ca1531bdda5a1bd52815b2b759de4ff0a689d18de18162f1d0886d4742b3fe8deb72 SHA512 22dc9e835d3d9e38130f4d295634b476a1ac2f24db4e2fbc2f403fce31d84b2f5d9431c8168f326783da5a1ae744c0d2457ccc0eb9d13c6bd851f761e83530c3
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index 6b082bb4aa54..f7ad24e1dff8 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 src_install() {
diff --git a/app-misc/mvcase/Manifest b/app-misc/mvcase/Manifest
index 87a166f88f99..5f519018fcdf 100644
--- a/app-misc/mvcase/Manifest
+++ b/app-misc/mvcase/Manifest
@@ -2,5 +2,5 @@ AUX mvcase-0.1-flags.patch 531 BLAKE2B be56f4ebf49427f3d6202ca78bf76d40419055235
 AUX mvcase-0.1-includes.patch 526 BLAKE2B 1ae38fd8c03a82694fd57c9af033443d3e0a09a794686ca87419167dfd16697addb57a2f73923a8435c88fd82c5555b0715bc541f2eb377aa9f2e6389b14d311 SHA512 1860cf88e66a4bc219546a87e337056f66a344d6ec400c21bf37c7d7d5b34fdddf3cf2ac7c05274f2c6f313ee7fd530240e1d2089e598b5154c8eb2c4dffa30f
 DIST mvcase-0.1.tar.gz 9467 BLAKE2B 4f73908cb549af143582f2f046096b5ffc82bd68a7be9d599bcea159d2182a52d37b9afb7e6e5e3fcb2ad01fd647c3649dae56ed47258166884a20e81b00d40b SHA512 1b6030d51cd0da7bede43f1b528c2b2cc713b3c6ca0ccbb4931672185998957aad1b2e0e78a78148c412b6a36052076caca3606016ad1404e6028442dff8648c
 EBUILD mvcase-0.1-r1.ebuild 676 BLAKE2B 3b907b18fac78269dd1cb326322b262c58ddadb08d25ec4c06e52ddd47815a33acbac3feb10381e03e7e30708954dc31aee980e1154dc8bbf12f8af657aedb7c SHA512 4fc782129c08e4fe83e997dd26c5d3ca7d81cee74767f96dbb93d26130ee094d12a50e9979092e327500dff2eb2932dc51f7438294a614040090f792298c5db5
-EBUILD mvcase-0.1-r2.ebuild 639 BLAKE2B d62b57d54079ddea8a770c07909c5e900804e9bea3c6aa44714cf89888c874c645df577f8043e387d09d0a927543b7e1cce671e769bac0a6ca1f948b8393c195 SHA512 107db7314699cf0f6b721f256daa5c949278cf7beab365a399eb7efb1c414b8181ca9c86dca88e40286f232e545c49b1026fb4951f0fbb18cda9d8cb4f49912a
+EBUILD mvcase-0.1-r2.ebuild 638 BLAKE2B 1348da52810bdafda36d1189311a41cf62659dfb1cc7c6ad1bf2f9c0ac7b31cccb4cf9a8981231098f56b8fa6802fa7c0c3790e5ae72bb81963252c36599f969 SHA512 7e663ba11de33e5bcfe0bae90bf27ebae42b72a79f6783264890f4e37228e7864967bef134419395391e836b8828a66ca129d8288993c8b9217fffcc1d23c16f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mvcase/mvcase-0.1-r2.ebuild b/app-misc/mvcase/mvcase-0.1-r2.ebuild
index cf2b600c032c..7ac153864188 100644
--- a/app-misc/mvcase/mvcase-0.1-r2.ebuild
+++ b/app-misc/mvcase/mvcase-0.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-libs/shhopt"
 RDEPEND="${DEPEND}"
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index c1a906a27dd3..a7cd9f5ab1f0 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,10 +1,6 @@
-DIST neofetch-3.1.0.tar.gz 68930 BLAKE2B 4809b972f0cb3ea641cbda00e7777617808891d4ae12ddfd52670d8ee490f4659540faf55b994d212e047d5926349dbe8478dc7e3caccf0f22c2b97b57cb9cdc SHA512 0a13acadf1841c1e714c07f9643028446a1f4df6a79e7c3189c4c11d8854813dfbb983784d62dc59a9209893ee2339ca5642fe413d1066a5cb6e9e167ae74975
-DIST neofetch-3.2.0.tar.gz 71331 BLAKE2B 073eeaa74691b3d262fcd0da8da76d9264dc012fda89ce045b4ccdbfead490049bd551d3ff95042a21fb0d6073d1120170f889492ec4ee50c57c3ecd786cb9e4 SHA512 790dd282b99437a416f25a895d5a3359be31d162447e2f59863c635c144045a6b81672e4469ca9b6eeba56fc927e787a67f0a317309bbc0f52500b0f9e072764
 DIST neofetch-3.3.0.tar.gz 76325 BLAKE2B c7bd860dd1f89f4b0e64a5a4dcc6551d548103abbdda0606fdbfa5edbe27d91da053198f219e223af56571a87d3af4b93f8f8d615ad4f377b1754da4bee50526 SHA512 aa220f3d177a3f58e7cb665209e6bd70334eb3d2daccf7ec9cb32353b8c23f53e000f7d412422c8d5fcf1132b39f4a9dc51141ed7359f45c1f0f7a189853baf0
 DIST neofetch-3.4.0.tar.gz 82090 BLAKE2B afc00b37d84cdf3ae0fd4037312b1c67fdadcbe99d6d602e8f3b6caa844b3780861c9d2522ec605ba5b7aa08e4e85ef804129da2ce3f6f01ab8b536704cdd182 SHA512 931648e8173eb91fdf5c79b5bb9b6efef132d30cf2f10d6f75dcff42f3661d40ceec712c109e90e2226e1aa85cad7676c438b6cad49e8298a77d990d9a3d197b
-EBUILD neofetch-3.1.0.ebuild 518 BLAKE2B 3b3600dbe4f7256f3df6263d3c59e0d301f85c2e4ba44c52ea2cb03d62ed41a85c5d81e3d7cc02f2587a442b139aaae96afce8053f4ad5dbb5c7df764b03fdb2 SHA512 a47a3a932714aee7e3abb3806bf67992d97f9e66250bf17f2dd90d8507f7d5b1e04b923f0acbfba28a93b7a08f21030f71d19289fd42ca0b3041df636d08faa7
-EBUILD neofetch-3.2.0.ebuild 518 BLAKE2B 3b3600dbe4f7256f3df6263d3c59e0d301f85c2e4ba44c52ea2cb03d62ed41a85c5d81e3d7cc02f2587a442b139aaae96afce8053f4ad5dbb5c7df764b03fdb2 SHA512 a47a3a932714aee7e3abb3806bf67992d97f9e66250bf17f2dd90d8507f7d5b1e04b923f0acbfba28a93b7a08f21030f71d19289fd42ca0b3041df636d08faa7
 EBUILD neofetch-3.3.0.ebuild 528 BLAKE2B 4d3ec0296e70b97d451c01fb64848095e32acef6018b05a3265940ec77a111fa99210c986f7effab4d3c60183a60175b5299271fb203faeab829656489b02219 SHA512 7b2e63056b104e4cf1b42428311d1d20044f5bcfe601a3ab78bb996a3520a9a7b7f38958efcc44318dc0e0dbe02ee5de223e173beb3e720612f107d37088fe0b
-EBUILD neofetch-3.4.0.ebuild 530 BLAKE2B a3b1dbc0febb43f04311498175106da74d5012a4e6692351fc5556bd0fd5e0c224a22359451d15a1df176514ced95a2b57ec038bbfeeb4152c1546ac9c68c802 SHA512 4299594686814ec37e8421f180aa28af7869d0268416633de96789ec9cc8f6ecede7cb3fab95333ee7891b95872ac455865a81f422c8951436317034a9d5ea79
-EBUILD neofetch-9999.ebuild 489 BLAKE2B 133a0e384dc7610bcb2d1b162d9685e0e72607b36f28cf0ab8efdaef19cef8e0715a433fe914c85b4453eae14d3f4bf47b1b33580429c8ffd3b5a22ea8630aff SHA512 e293dea28a15013729353876565e10636de071fae44260180b563324b2b760e189019d39b216cfd0a2912cf09a70cececc2a391cce625c018f0c500e91a6f11b
+EBUILD neofetch-3.4.0.ebuild 530 BLAKE2B 84caeb2243d4c3c7b453ef5db69d50a35fc298dd7314fc1a5dfcb008c19bbf6c9e939b1151ff0cf96c357144ec10ef9de272e2bd2bc091d763fd2538a80f30f3 SHA512 d6ff236ed8c216239ffffe0cbe23b8a877d8ea07cdb98dc93577eccf7efdda05ffabf6c575c0993402d1683ab526fcfa7bdd02bfbcf33f56aafd23f4444aa1a1
+EBUILD neofetch-9999.ebuild 497 BLAKE2B 793b99ff054d95d04540d626558fd57d89378584a0822d231b01f67d177770c6e7abe717bee7c3a7cebfc4d33f8af6df8254005270b68bce442f5228ec5c3b03 SHA512 6e016dd83987b53dd41d90199e6a1cf40d849e033e5f490609fff17d38f21a24756adf88b60ed5f9fe4cbd46a0818dca6d4e20c1aa56d7936a2162c5c6cf0796
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-3.1.0.ebuild b/app-misc/neofetch/neofetch-3.1.0.ebuild
deleted file mode 100644
index 74d58f581757..000000000000
--- a/app-misc/neofetch/neofetch-3.1.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
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		x11-apps/xprop
-		x11-apps/xwininfo
-		x11-apps/xrandr
-		www-client/w3m[imlib]
-		media-libs/imlib2
-		media-gfx/imagemagick
-	)"
diff --git a/app-misc/neofetch/neofetch-3.2.0.ebuild b/app-misc/neofetch/neofetch-3.2.0.ebuild
deleted file mode 100644
index 74d58f581757..000000000000
--- a/app-misc/neofetch/neofetch-3.2.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
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		x11-apps/xprop
-		x11-apps/xwininfo
-		x11-apps/xrandr
-		www-client/w3m[imlib]
-		media-libs/imlib2
-		media-gfx/imagemagick
-	)"
diff --git a/app-misc/neofetch/neofetch-3.4.0.ebuild b/app-misc/neofetch/neofetch-3.4.0.ebuild
index 0bfd665036b1..02361f6c21ce 100644
--- a/app-misc/neofetch/neofetch-3.4.0.ebuild
+++ b/app-misc/neofetch/neofetch-3.4.0.ebuild
@@ -13,10 +13,10 @@ IUSE="X"
 
 RDEPEND="sys-apps/pciutils
 	X? (
+		media-gfx/imagemagick
+		media-libs/imlib2
+		www-client/w3m[imlib]
 		x11-apps/xprop
-		x11-apps/xwininfo
 		x11-apps/xrandr
-		www-client/w3m[imlib]
-		media-libs/imlib2
-		media-gfx/imagemagick
+		x11-apps/xwininfo
 	)"
diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild
index 6a5cf4e804aa..2bcaa63beeae 100644
--- a/app-misc/neofetch/neofetch-9999.ebuild
+++ b/app-misc/neofetch/neofetch-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
@@ -12,10 +12,11 @@ SLOT="0"
 IUSE="X"
 
 RDEPEND="sys-apps/pciutils
-	X? ( x11-apps/xprop
-	x11-apps/xwininfo
-	x11-apps/xrandr
-	www-client/w3m[imlib]
-	media-libs/imlib2
-	media-gfx/imagemagick
-)"
+	X? (
+		media-gfx/imagemagick
+		media-libs/imlib2
+		www-client/w3m[imlib]
+		x11-apps/xprop
+		x11-apps/xrandr
+		x11-apps/xwininfo
+	)"
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 0178d895df45..679331f0efe1 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -1,3 +1,5 @@
 DIST nnn-1.6.tar.gz 37456 BLAKE2B 90a6bcf7123b763585a05d5898ecee129561fa11dddbc40125f536b96315e4847b6187615df2bb6e0262d3df5efeec83d6681092ed69e4b65cd5486cf396e7e6 SHA512 7172f37f98f15b37cd2959c5ad144d32f55cde9cd2fe3221fc7a23887d3326da924c9be0bdc61a01a4d98ceb9b03de2420a66cc2cbf94a2ae1547da206e4c49a
+DIST nnn-1.8.tar.gz 42534 BLAKE2B acf1f9e211ddf688da96c77364f8eb2d12c853fa528774f2a3f8fa146203b155df089f6a3c995f0415d5349e9bb0c519cd0776c77094a83c23ecfe45561c846d SHA512 dfa3fc20cc9d77dc6a998913d79c1f98467f9e0f475d43317fe5b3b7c85f04a8aa1508305307873115ff810f5e212272e8348af9d8bd5283f48ad76ed34cad55
 EBUILD nnn-1.6.ebuild 1079 BLAKE2B d80952f77883811cb91d4c5d9e5a412bf75896fd1827ae70daee380341060d30dd9589dfe0c49587220f2dc53a7dff24aa2e6a2ef537cb20452474c415f639cf SHA512 18eeadc9e37f7853bf2341e96ca1a3a4a6bbe70b8d8576f9dfd92509c0001e8b106a0e8ee34d30a335f9fc68956b82ab23ab6d41f7e34a3f201ba04abb910f99
+EBUILD nnn-1.8.ebuild 1079 BLAKE2B d80952f77883811cb91d4c5d9e5a412bf75896fd1827ae70daee380341060d30dd9589dfe0c49587220f2dc53a7dff24aa2e6a2ef537cb20452474c415f639cf SHA512 18eeadc9e37f7853bf2341e96ca1a3a4a6bbe70b8d8576f9dfd92509c0001e8b106a0e8ee34d30a335f9fc68956b82ab23ab6d41f7e34a3f201ba04abb910f99
 MISC metadata.xml 324 BLAKE2B abbc05bbc35735d7a931021eac9e8f9a4584867c885fea581f57d7b4e9d83be1b2b3ec8b5246c1ecafd9c1e55078d66fa1cac22a8321beb5d4912a596c721e48 SHA512 291b497b906b3fdcbee656d90292d5b267c4082d1864e38f64938ce2d3b8aa56ca782d217f3a0776049db5dd7da416a4200e86f91da7075c54998b5901f78ef5
diff --git a/app-misc/nnn/nnn-1.8.ebuild b/app-misc/nnn/nnn-1.8.ebuild
new file mode 100644
index 000000000000..b1965355b427
--- /dev/null
+++ b/app-misc/nnn/nnn-1.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion fish-completion zsh-completion"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}
+		fish-completion? ( app-shells/fish )
+		zsh-completion? ( app-shells/zsh )"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	use bash-completion &&
+		newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
+
+	if use fish-completion; then
+		insinto /usr/share/fish/completions
+		doins scripts/auto-completion/fish/nnn.fish
+	fi
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins scripts/auto-completion/zsh/_nnn
+	fi
+
+	einstalldocs
+}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 2897e6400642..6d7a9d04cb89 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,4 +1,4 @@
 DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
-EBUILD pax-utils-1.2.3-r1.ebuild 1698 BLAKE2B 3377c2719fbd8e49d50c166d7a10655570197c84bb42c2a57fc0bdc4ea33c4ce29a4094da408189e5fb9ae0ffe830f39aba1e5fc0c5d04679095f81e9b04d05a SHA512 04678abb457a3206152a37e4c563f424ee551038e10e3dd00149eed4503edf27a370e7d1665fff6fdb60a43ff2492a631f8fed2f53cf3e48e03f21ea62ca7c16
+EBUILD pax-utils-1.2.3-r1.ebuild 1694 BLAKE2B fda1c5de05ca1629fa3699121784babbfa7ccd59e6c66589106fe6f7c9c0967e9789b92ce2132fc7faca9fc7cbb1a16924dcbb568c7c27f53f225879e96be790 SHA512 00f7db39f93f1905fa3978bf79dc13213347e4982a4062fd341b74e80b0af5fcf352cea1c9a0b2f24228b6a2f0b9fcbfee0c4ed541c2d858791de4b7bc0595a2
 EBUILD pax-utils-1.2.3.ebuild 1477 BLAKE2B e3e27277bcf7d95983713cb31a0a57b998d500d42d26ba75b364b42da9b3c9b82635b02148daba3e675a816b446b2d9ec09b851635b5800712d1bd61d594211f SHA512 a407d1613f4489687d3d86bae6fb9bf8f527fb123fbd59e56ac9f390e80de5063610e76ca2570b78fb35e05abed5c735939599e7604265aed68185f4cf49e731
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.3-r1.ebuild b/app-misc/pax-utils/pax-utils-1.2.3-r1.ebuild
index 5c7748c20979..4d57eedb1532 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3-r1.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.3-r1.ebuild
@@ -40,8 +40,8 @@ _emake() {
 
 src_configure() {
 	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
+	if use prefix || ! use kernel_linux ||
+		has_version '<sys-libs/glibc-2.10'
 	then
 		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
 	else
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 8ac325f44b1e..f3654260a3a6 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -13,5 +13,5 @@ EBUILD screen-4.5.1.ebuild 4127 BLAKE2B d224ced4b2a18f213fb6d2d8c31fb466d6a4fb19
 EBUILD screen-4.6.0.ebuild 4075 BLAKE2B 88b85d6cb3413354b8411c2f71fb3b17a7b8fe9b7989e06e823faad8d3328612b74c6e0846184ebd60aeaf2d94e6bdbb8e631170d3f339459a9a589e4362228e SHA512 ba1626a43f9cbb92e5abe099ed8f17524d9fcef21381fbdaf645830873bc06dbdf4e04326ae5af6f662e709393b1e3b48c4859f4136e90f02f57bd07c4eba431
 EBUILD screen-4.6.1.ebuild 4075 BLAKE2B 88b85d6cb3413354b8411c2f71fb3b17a7b8fe9b7989e06e823faad8d3328612b74c6e0846184ebd60aeaf2d94e6bdbb8e631170d3f339459a9a589e4362228e SHA512 ba1626a43f9cbb92e5abe099ed8f17524d9fcef21381fbdaf645830873bc06dbdf4e04326ae5af6f662e709393b1e3b48c4859f4136e90f02f57bd07c4eba431
 EBUILD screen-4.6.2.ebuild 4111 BLAKE2B cc6b4b3eeb615f3e313f6ed779aba160058e5d31c1b05342945bba687d3ea6f73d8f71f08fefb5d7d0e2130c6f4370b5f798e1b4529318defb67fc72172fdd67 SHA512 bf1ab9c61d9d1c8087c08315aa732fcd1922913b446bfa3729219d52f7628f9aa8fb7c1001743bd4a77eae4936117fc4f108b8aacbd29e33d4efaf4e8adf4ce1
-EBUILD screen-9999.ebuild 3680 BLAKE2B 2a30c6e1703a49390dd01132f03865a3fb355014f18e9f2bdf488ff58610d0d2e38bc397afb83804b6d69dc2bf32715c0b9c31e694c791def50096f91d051cd8 SHA512 f27332b033f31450f6cd66ea8e9a39866470633e17eac7d6ea26bc093aaa62f85dc5001875478592c417889e298c2eb87f16954735e015405f4d4ba712cf09e5
+EBUILD screen-9999.ebuild 3746 BLAKE2B c8bbcdc221e6e4e310aa161e4faad0a517579a1ee9d639957356eeac1cda6f437b33b7780877d87a2f25881a52b76f9e4e71d8760c55a92b2ef790c2af12aeb7 SHA512 07fee252dc398dc18edd4aceebc3ca9d0a86e4523593bb58983ff401fcb7cfffbb969d60563ec8e657e944b14952d462e1d9dc61e274ffff869421673a90f1ed
 MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 115c11607624..c7c5f5638521 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-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
@@ -52,7 +52,8 @@ src_prepare() {
 		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
 		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
 		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e "s:/local/screens/S-:${EPREFIX}/tmp/screen/S-:g" \
+		-e 's:/local/screens/S\\-:'"${EPREFIX}"'/tmp/screen/S\\-:g' \
+		-e 's:/usr/tmp/screens/:'"${EPREFIX}"'/tmp/screen/:g' \
 		doc/screen.1 \
 		|| die
 
diff --git a/app-misc/vcp/Manifest b/app-misc/vcp/Manifest
index 02bb655484f7..b8b3d340d759 100644
--- a/app-misc/vcp/Manifest
+++ b/app-misc/vcp/Manifest
@@ -1,5 +1,4 @@
 AUX vcp-2.2-tinfo.patch 310 BLAKE2B 31ebbb498615f7eb9c0472cd99f85643a44a84e94dcae7d671044cc2aea9001e31e925506958db397516074f45d62ea834b28302448d158ab87038c0208244b8 SHA512 886a20474591c5fee3c70bf978977b2bc19f362dc38898eff6f44365b6edebd2eaff1cf09befc764163d32f0f2a84a80d032647266af0e7fb343b9ee6c5f82d3
 DIST vcp-2.2.tar.gz 20075 BLAKE2B 862ed1a816c45e50374e17d387d33bda3d758e155e6a38c1636000ce87de3b54928acaac5f89b0580098acb9b796e803406c9d95dec76c029fdc580d65a496b2 SHA512 3f9f60bce875f16a825b935fd241b11cc75d45b85b66133b27d16b86644c4bbfe69fa5f22571703e0ed6d235498f920a8796f6d74259db51a1abbd626c6f5137
-EBUILD vcp-2.2-r1.ebuild 829 BLAKE2B c8df56cefd1edaf23cc6f9a2168438e6a7b6c1f94ea8a778af5e141f23ab3c74f4494445cc4547a6ff3572264864bae65ba849d99fed5eeceae43cd36c8e14e7 SHA512 a25a27c4cfe12343c4aed26eda370effdd57520622a664bf96d8af67642af2f63ac4fa7a746913045fd6ed205094a6444e3c3c2fb88c302199a7245b9249079c
-EBUILD vcp-2.2-r2.ebuild 742 BLAKE2B ef12366da20df5f554d2463ad905073789f9f7dca967f0b5eae1975c17e4c10029a0f4c5ecc9fee2468908d0d496aa825cbd9fcddee80498370275eb18e52a2c SHA512 001a8dcec3d4b11bb984f3236a892e40b2a410018a669463e1d1a8fb9985e4e6c411fb4efbe82eb453f39f3d4b396e62e8fa480b5e324a26272070b90d5cc816
+EBUILD vcp-2.2-r2.ebuild 741 BLAKE2B df056f3fcae3294a5b77a485f758ae3c9a253368541777c08178d5e2adf0d8b59cbe65134cab5f63cd1907b0a055dd5bdf3a3d62c9f591856df91cad2f51c02d SHA512 69900311ae134a54d5eddb17898e90e3921cfbd3c72845d09df88c0e81b1690f9645143c8c09c75813d6589d5d8242a2c4202ba63278d5b3cf5d673f0e80a29c
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vcp/vcp-2.2-r1.ebuild b/app-misc/vcp/vcp-2.2-r1.ebuild
deleted file mode 100644
index f7d2773df7a4..000000000000
--- a/app-misc/vcp/vcp-2.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="copy files/directories in a curses interface"
-HOMEPAGE="http://members.iinet.net.au/~lynx/vcp/"
-SRC_URI="http://members.iinet.net.au/~lynx/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i Makefile -e '/-o vcp/s|$(CFLAGS)|& $(LDFLAGS)|' || die "sed Makefile"
-}
-
-src_compile() {
-	filter-lfs-flags
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dobin vcp || die "dobin failed"
-	doman vcp.1 || die "doman failed"
-	insinto /etc
-	newins vcp.conf.sample vcp.conf || die "newins failed"
-	dodoc Changelog README INSTALL || die "dodoc failed"
-}
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
index a430bd10e3bd..c53cc103faa9 100644
--- a/app-misc/vcp/vcp-2.2-r2.ebuild
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://members.iinet.net.au/~lynx/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~sparc x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 4bd4f619f59f..3a6c4c55aec1 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index 6c69c11d9a9f..b4fec101cbd9 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,6 +1,4 @@
 AUX kexi-3.1.0-qt-5.11.patch 724 BLAKE2B 8571c381220f163685017a5f6ed74cae80042e23836227e510160ffc1190e2172deb7c8280c3fadbec9b85d6f7469747e185e89414a5e2e508a4c6888442b17c SHA512 11817808ff2b0c86b52511c1f03941470beeebb61f63a6f1b5b29546de17371f9f3d771a49b2664e8c9fe07b5ffee65995d22ff19cc1aadf50af484cb2d43e17
-DIST kexi-3.0.2.tar.xz 3676556 BLAKE2B 2d1d08904c4459362d7e0d2f79bd9ae0dce2bf11c18e6a9c3a68276bbd8c2fa67075c5d0739f7ecbb853802791df8676b76b0900eda396b62d0e09cb7f3a2107 SHA512 ef1da2e4a7b9d1f80200feb111f5dcedf8e3422e797bba4ac45744cb4b2f948cf3190aa0d126d0a3bb2bfb88f8fa112919e3dbb191bfcedd03e8e4512d1cf74e
 DIST kexi-3.1.0.tar.xz 3028492 BLAKE2B 8af7105ba570af225e7e2cbea2ab15d0c6e4997414c321654691af1329930754bea8a52c3ce5abb246c6a47e17473c462b9212eab8ef30fc23e4691f2ab8c9b2 SHA512 538b8b2c021bababb59a05cd477aa4414df76f84a9ae88244afe6f3dc29751257bfee2586279ee8ee7800d939702c3a81f71562039a6f97132f2cba4e9018118
-EBUILD kexi-3.0.2.ebuild 2076 BLAKE2B cd375cffc042e1b3a2f12896b9a5b4ce3a53363ad05264e7b7fb8be7ab28b2ff38e617da4e97807f11519da7687f8dd66f1b564982b994122eea4e2cc627abdd SHA512 d24fcd511261340f6efc35c5a6179d102f905e9f61df808d80cc77e79e09fc0234c47d6b0c624b3ae349d173ff96a5885b87446fe2cf20b83a63bff2ebccfa15
 EBUILD kexi-3.1.0.ebuild 2385 BLAKE2B fd7a0627ebf0d073102aaef30cd88cf5be1699507e4b8aee3b8666d095eb3c11967cea140db81ab5d45953faa6013a796aa8afbc619e2313523005ceedc84e56 SHA512 d205bdf08b3394f34d27ffc4edc2152c88b76bdd63cc3c1c38391f667076856b7675d13a685a47b6068d1f1325ddd05008060c8630216d205b9fc8184eab89ac
 MISC metadata.xml 600 BLAKE2B 383b28f24ff8522330ed843789c30ac771b4ecb03f45f7f60503463ead5e6a6fd4480eea83be7904d3e0cfecaca73c6fc9d8d29214fbfb2082aa97c45ba607ff SHA512 fc7615150e90fb963d4ae2775b5d0dda7667c0fd975cdcd8e5d52a87d01935471c37c9256e894c68fe88268d61d7a3cde42f36171f9160dae20ce8140eaab22f
diff --git a/app-office/kexi/kexi-3.0.2.ebuild b/app-office/kexi/kexi-3.0.2.ebuild
deleted file mode 100644
index fac7a700f2df..000000000000
--- a/app-office/kexi/kexi-3.0.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# KDE_HANDBOOK="true"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Visual database applications creator"
-HOMEPAGE="https://www.kde.org/applications/office/kexi/ http://www.kexi-project.org/"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-
-KEYWORDS="amd64 x86"
-IUSE="marble mdb mysql postgres sqlite webkit"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-db/kdb-3.0.2[mysql?,postgres?,sqlite?]
-	dev-libs/kproperty
-	dev-libs/kreport
-	marble? ( $(add_kdeapps_dep marble) )
-	mdb? (
-		dev-libs/glib:2
-		virtual/libiconv
-	)
-	mysql? ( virtual/libmysqlclient )
-	postgres? (
-		dev-db/postgresql:*
-		dev-libs/libpqxx
-	)
-	webkit? ( $(add_qt_dep qtwebkit) )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep breeze-icons-rcc)
-	!app-office/calligra:4[calligra_features_kexi]
-	!app-office/calligra-l10n:4[calligra_features_kexi(+)]
-"
-
-src_prepare() {
-	if ! use webkit; then
-		punt_bogus_dep Qt5 WebKit
-		punt_bogus_dep Qt5 WebKitWidgets
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package marble KexiMarble)
-		$(cmake-utils_use_find_package mdb GLIB2)
-		$(cmake-utils_use_find_package mysql MySQL)
-		$(cmake-utils_use_find_package postgres KexiPostgreSQL)
-	)
-	kde5_src_configure
-}
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index a173c3b16828..390d37b61bb0 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,4 +1,5 @@
 AUX kmymoney-5.0.1-cmake.patch 1089 BLAKE2B 5574c6bebd5502a4f6046a57c14593b5b305734981bf04fe19bc500ccb76dcc56e851213b011c4cef41795d9134e970fb5a83e7372cf928136efbbf84451ace1 SHA512 dc894facca9ff086b92397b8fde830fee54593130eb52523ba8d3c517d037f98af8639918007a4970ce1c0e1df88208dd06a80fa6cf5d00ea6a7e06269702b74
+AUX kmymoney-5.0.1-qt-5.11.patch 735 BLAKE2B 25fbe640be8474010ea8417aece91baa475e3fe2e1bf4b432093496cf8d435fdccf995b9239eeb2744e39946a0a69a5fb0f2252dbe1c73f52e163b0d61678d4d SHA512 7cd3fb3b85c47aad71d049ad71047ed38597449300cfdf17f9eca4cf7429ea931056088fe03e88b238730f770b6ed757db4a388d4596a718341fa37985dd478d
 DIST kmymoney-5.0.1.tar.xz 13307860 BLAKE2B df61285f848df693510f1807bbf66b7cfec4498f2c540df3420731734a8ced8c4ae6426e338af2cecc85278120087eddc261a9e35bad50722991e3bb617d4a9c SHA512 74ace8d98f144c503d572c68cf50c27664a49bc5f4428788b69a1da52b8f72e97e1bb70914dbf041c43884c3b6340e28390618dec179ebe3d1b3ea63bede93e7
-EBUILD kmymoney-5.0.1-r2.ebuild 3098 BLAKE2B ed4c52096ca0dba934af17e1c692938575a296fa6a14b877319cff9f10eded23639b0845d1fc9e078e573726edb8a42d51c2c4a1d69292f4bd315bb18c323c84 SHA512 20048a1ce4a9a4f323bd8237823c1d3558b923fc42fdd6c9ba240dfdb6360a62e097677487dd5c38b4b628d6ec570a0da1dde4aafe760434b8c79f11712c1ccc
+EBUILD kmymoney-5.0.1-r2.ebuild 3133 BLAKE2B 7903b6f072e7e01d52193d459547d629baecdb27564e727b796597b897604de2d30838acc17c3029555a2eccd0eda9d058d28cf3f3a183c004dd7b454aa3ea3f SHA512 8a4e41ab95ada9412f7f1db529cb2ee461413c6ddc3f0c9d956ac679d1589b36ab64b596ee51879f3c6f5c0abf0c114ea2e8b6ff32e879d337291b06403073e5
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch b/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch
new file mode 100644
index 000000000000..4158e0f8ed5b
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch
@@ -0,0 +1,23 @@
+From e5198a902996b27bf9abde0ad24af82d55ab5dc1 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Thu, 10 May 2018 09:35:34 +0200
+Subject: Fix build with Qt 5.11
+
+---
+ kmymoney/plugins/kbanking/widgets/chiptandialog.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
+index 928e7a8..53fb2a3 100644
+--- a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
++++ b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
+@@ -28,6 +28,7 @@
+ #include <QQuickView>
+ #include <QQuickItem>
+ #include <QPushButton>
++#include <QRegExpValidator>
+ #include <QStandardPaths>
+ 
+ #include <KLocalizedString>
+-- 
+cgit v0.11.2
diff --git a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
index 44363179fe05..7891db19927c 100644
--- a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
@@ -87,7 +87,10 @@ RDEPEND="${COMMON_DEPEND}
 	quotes? ( dev-perl/Finance-Quote )
 "
 
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
+)
 
 pkg_setup() {
 	use weboob && python_setup
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 114ce991cef1..842f8207b3c2 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -335,6 +335,175 @@ DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_xh.tar.gz 295519 BLAKE2B 43fe241
 DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 798275 BLAKE2B 2764972970aa98f346ad76bac0f8be6685cb2436613e1e29b289f018cd5cc8636ca73c9726bc91b493fe3bacc116f7913a1ab943645c054352def45cde15ddfa SHA512 032ef143bb3bd3bd06701e84aff497d3dfd8076493e31221723ef3d321cb952196022b1520904ba21266944d84efe5d241822375ef116c56a02ecbd23de8f3c1
 DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 796214 BLAKE2B a24f8f780837c685d50763854e9ae5f3c9b5685a46215acfd5215b25a7d46ed310c036fdc3a98bd5c4142346d5ff393defaaf68f27e192797bd73b71493285ff SHA512 58248f1fc7a7aafbb4262ee0d70273b3f5afe5a294b19d5032d76e6a173f0562fc2d3326319670b595367f97bfa26536b59dcbad8e9fee88633bd5ce33d2164a
 DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zu.tar.gz 325473 BLAKE2B 44d86495b8e5b09ba09b9699f7b37c727b834c9b28ce7027f24965f6ad9c920a3609dd36acfd70cf534db20884245844a111ec4b32e04c102080f0ae4e0223b8 SHA512 2d399bf1eb9d9214f36b134869fdac3de69735a0e964136cb663f82f26896fd86165922f253dfd3ba069c282ddc19e4dc2db08e83248ee2fa10f534b9378c0c0
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_am.tar.gz 7989318 BLAKE2B dff8a638d4656c7757cb3acb6c82304cf8133564d20aa53eb86623e7ef9b9b2bc2ecbb7d7c6ef533c22d574b34b8c0cc561c550447926d80538707cdc9894aff SHA512 04838ecd54c5f1013bb995f4b25dfc7b7ebd50df4a7c508841a187bf2c06553ac93bb85effdb4cdb9400bd2f0c84fed72d61a45692180ae846dd86093ce154d3
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ast.tar.gz 7905195 BLAKE2B 1d333aaace08aa9ed4ff842d40c98b6d4576f1e36fe1fe434e79f925f9b13cb6bf4c49c31f08655bd5f32a045fe02111871a6b7c11efa48aeed05a141fc2e1ac SHA512 853be346f58bcba7f69a9780d01f0c0022c3f5dbd5afd8a0047bc474bc15de8346bbbd360514bc3147992c30f038403d7ca4611a8531e549107678c725769997
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bg.tar.gz 8465475 BLAKE2B b38e14362b6b3677bfeea2dfa46a688ad909ab58a5d188888f39fcf7ba8233995ee1eea2e76ef4d5c6e8fdc0c369a884b92ef2ecd03636079e30cc51b3e816e9 SHA512 4a0524435e37c385c99e0cab90d82a88ca3a6325775f925af1900d9d982465261ac24b3143e58cb9bc8a9ce71708a93322d55072e2d09fdea5d3b32983516170
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 9145094 BLAKE2B 206f35eff26983172ec45cc465e752aaa6c07de5ee0125aad2bdec69236b3eb3e04ca2a747ed20c3d0bbbd19a7a20416e242ab2cb5776b65c5d2d2f377f9fe46 SHA512 310b6cda615f271c728c2a47c4a8c50e818a5cd71d515920a652d2cc45d35972eaf7d116f5d565836989f949483891016d5b1c0ab4957a50c945ec1bb6d84919
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bn.tar.gz 9145330 BLAKE2B 9521624a8915cefaccc25cef08bca22280bb19f2fdf7810b9bb729cbebdb56668713ae43f957b85775c46e7e5188620a72c9b0d62d12711860fcd18c8ee80bc8 SHA512 2dbe91d980cf62025eca392c984263070cb5d8bb9e8c262c232b2c87538313b1edcf95e58cb7d7b6c2d3a4d19d5e9a9673ff79ec874fcdac668dd3d688dc6221
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bo.tar.gz 8891112 BLAKE2B 34d3c6c3d053344f1e7669cf2670dd888133ec9f8e1c2923531db6631ccc90fbaf1b7a62b064f44943da870062b01306a9200c9a8dfb00583728ab1a8f0ce2bc SHA512 fddcb1795a076528085cf66055d1cf487d732e6785a5133bee14eb8afc65588b94833b41e15d32ca08cd865c44fb675e14985166f9d929d59a5e03d899e95840
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bs.tar.gz 7210831 BLAKE2B 39ddc8a1d980f55ab4ed4c2ea486dbe150381f7e3ab6222ba24fa21f0d9a040c8c26a022a9093e65f78455c7157da30ef5301a43ba4da0c52fa0f16bfe3bd581 SHA512 5825e310cd8a95275232b4d240012bd1cbcef9affd8f7f78be99d43225e0d1fa51f13e2d9456fd142d3af09a6eafc79f1443451762c6f9993ba5cbf1506a2ee1
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 8091664 BLAKE2B 37db170ff705c41911c6fc4ce2c6d7f24dd2f637a1dd227c35b81856255cc4bd15a425ff6ed1e458de4cd80dfe7016faaaf07030c6712c37c13dba9d948d9e65 SHA512 5f53bc8657a3fe33911c48198e9c70a5cfc37d283b8d6ccdccedc0c5f64ddd619eec5375f76d325c3250e624297180dbfff234d5e71ea70b9a34d66d3cea0a99
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ca.tar.gz 8095343 BLAKE2B a51af984095ff07395a2d7ca09a0d73ce6ba45bfce5a67f01967eace6e329dd71353c65538270cdf2a454cb49003cc57653335678a1db93764781fd35167f6f9 SHA512 8bf924d891fe2899fe96df73217e9ab56ebd86ef8438287eb148794e55ae3eea3c3734c199bdb121989953339dfe9f0b050e8cedebeedd86876c9fb3651b2a24
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_cs.tar.gz 7798298 BLAKE2B 5e2e49f0e3ea4c3a07bf8dd7052190dc8ed636380cb5e9cab858a4344e23b33687b5b96e5582895d766223144d0f107d0554714421f53cdc624290b4644d844c SHA512 1686c12cfb7117a5d981fde8a3800bda80cfbf034d7392414d0c454c15adb0d2733dec0b12f53f21258046b9bba5ab1a732f4273c0ec78bded3684c0ff410da8
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_da.tar.gz 7725858 BLAKE2B c26e01475771750a7979143880d79e0074e6c27d4f41004998df8b3bfeb09bf8d904851066250d9aab66d984313358595b87fceebb0bbf7c68aae91abbd4cf50 SHA512 23f162e5946dd060adc86d4e59ee2602179c0c9f2b9c10a949685113776214a8478cf4e8d763978cfe72eea9fa70a3c4d6bdfeedd4cf9262a0f358da2fe1a35f
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_de.tar.gz 8227442 BLAKE2B 414ef8264068aed5e7107d9bb04e0e321b592bbc841ccb61e4e8d836dd403a6ea5cd520fb5aeca65e012f2caa9e52b430a3c7a0c2fd5a6adac6d7a21f5a0029f SHA512 53f5a46e263e00a8b2b980147ce9d1327544068e1332500da1460690f9b92f04be24681c234258daa1137fd2eab4dfe8808a518dd1f6bca2aefe189e80a95ff8
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_dz.tar.gz 10265361 BLAKE2B 0af51bd822655edab6d0cbb40bd3f4f5e5588f4935942ec3871f5e5fd3e8d3c283b6638c37e068f47e7979585678de4322c48ea7372d22ba28f3d83e1334b980 SHA512 7cf2b24dcab316fd4c0ae483deeb87489e3d62fa58edaae6f59ad782d8573b117fff148ff7fd501ad051ab4059177dbb07177eacbab07ab228ecb0d9ef93be17
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_el.tar.gz 9114852 BLAKE2B de0261eaedb5005ec0e1beb4b40ca9f5861dc9e07d712e27986a3c2889b904ff9c3e38cabf5645079324c64d8d18c497aac966874f0aa330cb4549aa9f86777a SHA512 492f5a688d7976be375ff53eb5fdedd197ce7ec457085ab8be00392c773daa45dbea8c0cd80549febc6d76ae7aa5642b52d4620d35596e27b3b4deace03e3ec3
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_en-GB.tar.gz 6554906 BLAKE2B d6285f85b53589895c559b7bdd800a3c912b7a758a5f1e66e7eb266c302c9371d89e849c15aa8bad2ff79be4f83a88c2a8a5f307b31492b2063a0a002b3bb9aa SHA512 906b0601bbc1c19c761aac6c46bdff92f334a3fb740f2ae60614b38a9e2dcf73a3fb9d461e744674dac8bf524bce79c398809653db84e2f8a596a02748c9de9c
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_en-US.tar.gz 6590469 BLAKE2B d2b3dd296c1f19b539c5d0b7d0fea4f27a8e77c5de8cb9bd5cae06f8771296ede33627f49af88f453f271746e3537f0e615fb0dfa75b76c557ef819e6ea22c7f SHA512 754856eba0dbc433b6f43d40a94773f0e2ff6ceee3212be03b99c4fcefafdb603b7516577a6d07784f868b0101d6cfb8ae7127af600f1f2cd29c25f815e281bf
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 6533213 BLAKE2B 210b0319de10d1472665ec1fa7809b219a78689870a65364a43fc70be9e79d9c6bd26144ae8cfc8ba4c2a68c0953ae57fb4d38c7c41e620f76824f37f5b32db1 SHA512 eb6e4011d2a78cac8393183ff57a18fed097bd4f62abc05dc2389d53b9a096275fb4cc9176897038071d56b3dbfb1bbbec862bcad689a60fb532c36ad361c8e6
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_eo.tar.gz 7157466 BLAKE2B 950595e5f1d5dffe71162d9534559102667c726453f40f87767e7c3244c6a03113a87c6974b11189573dc03928c688bb673d48b5352508f4762c4af5a15fe3b4 SHA512 070c1b68c00feff377c04439aee4fb15b09adafd3ad68fe9e75424a385586cf2f2e2b1bb346baa07343e10873a4179781b30bee84c0a6030f4775f58b2307251
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_es.tar.gz 8143973 BLAKE2B 9c9bd19517dfa3b51b31fff6c8acbbb6617fbe975a32b67c5f9425ac747863f099da2792352065d140999bb0a73e041d4a8edbd1786d607d685f45a0e17819ae SHA512 4ca94735af3f6554f8c54c50688c5f43e4610dae8a0832a6df6b8f000c4c9f1336e7b9ddd1a310172c1e3df64e07d811d9939c1a1cabeeb72acc9d7433f279ac
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_et.tar.gz 7655015 BLAKE2B 94771c514d1ef2d2613c130acc470026022f09bba1c76b52c174c64db21905c9115ca346d37d3ffb7ec171abc11d63979502f382aa44b2f175bb8f2ade0e9e5c SHA512 0776ca5998c42d8a03c032fb71126e87111360a2bb4da27b71aa5776302b2fca19286b343dc76c74110fa644b0fafea11fe90f3d234c74e132cfa61942c46df1
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_eu.tar.gz 7717493 BLAKE2B 432617bd7352741e42d8010cda0f888966272c04a2ae94e79f83a12f725fa2b0358413ec44f92414a366d867999aefb9f4b2b8e284ba7342c115df583f3471e4 SHA512 5946e8263e5de6f886a606bb5b0372382b872b4f88af1d636c3ee178c9d991a4696a814b9e71f8792ae213058913abcddc5a4de7fd4d5b051d6d38257ee6f9aa
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_fi.tar.gz 7893141 BLAKE2B 77d4f67742d0b115dd921f85d94c8aca58ef743aac1c99776ca097fb888e490af4232ef3ee83aa33a86fa624b8226fa66a04e81454a2a5d8b39eb8dee5cfc0ae SHA512 1055442c80c5f3c9570252f497ffb885aadc8500248c04e2d87f74ee123ff867fa9c8ac224b557ca7419e1804570ba8c3dc1a34c8eb7fc77f01991c87fb392c9
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_fr.tar.gz 8323668 BLAKE2B 21fa2411042cb4c310135be9d79b073e21627f202637ae9a75463d01ee2a916d77cd4760cfaba354a3755fb5868c57c37b279988ea11b33c2c6df386137202f1 SHA512 04a2a87e59ebdad5f6a641a5e265cd1b9d19132a3f6b7e8a9cec94970b6d207589cf5f422e4972a3607804ddbae90580a60e86f2a297b895fb66016cb4966fed
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_gl.tar.gz 7808054 BLAKE2B 21599d0ee424d8997abb9d2363320df49c109dfaf95dc7b2f84f684b9a47a92f3244428b12fd52b4d13cfa74e164c61bee07235dcbdad2874aeef0326c34f8eb SHA512 4ee956763456ab95a700778d4be5f4420fe45224b97d11440fef45e326182a8b645da4de69f966f63ed3b7952c3efbbc77e887ca964cb3ef600cccdd31d600a1
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_gu.tar.gz 6750563 BLAKE2B 2a2c9dfb540791c75f3726f7ab2741c8bbab820622b212e73a7c66ec8e4a9c56c6d4a321fef59641acf14fd55a0bba4dc8bb957dc1e1c7fd5292b2dbd92fb6f4 SHA512 a5864b8ac6a65d431a877f9dbbfa86ed2b2a82b67540650d04eedddfd491815bd9d0274d1ea06306239d680726e93a245d63394314b7e1d708858f7c860a6aa1
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_he.tar.gz 6365314 BLAKE2B c26685b084636afa279f4b49b377407cdf0587c7782debdb9af133d5cc9eb6ecdc7cce5c3e398def0cc28335016cb4c26ea8e39a0054b07570f60f0bd59a8bec SHA512 40e02003fa14246d1b77ee49291e93aea34a22e91aac649d764f352892fce8a0a02b25c86ea6e7982dad4cd6bfd90ac7749f4d9feb62d689270bb6dfb8a08400
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_hi.tar.gz 7397697 BLAKE2B 70cf3873c42d5aa7cfed94802ddc704938b19c0a840b7719abfa6f0fe200073e74bd05f00f6aed3d208755774c61d66fc889ee85b73daff0d8466c82775b2c08 SHA512 aac2451a04c1234d91a37d169a5e58fec76b339a60f7dab2adf436e7c56c78889dfd34a82c5d161f1406bcab561b3e52173ce83fe5b2fdbd22da2839ad088019
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_hr.tar.gz 6903535 BLAKE2B c6a0fbf5b32e0726c601a88820b218af997beac8559ec4ea30b834c333c5a8d8ad82a68c44d00304e99ee3458ec312d510f2685ef7f2cd2c351d70e0e623923e SHA512 6ab856e9569553c652807b1eefb969e31dfdca8bb6b9dd1020e868a2b40befd335d238011ed3cdc24ea07268ebe75b70a81b57ccf9989b24ab543882c4657246
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_hu.tar.gz 8220201 BLAKE2B 02a176963762de1023820e79630d64cb6f8439cd7b1a4f980722576d7915d6867c5375e6934e16a85de2479a6e9aa62a44d7490b63abcf50a663ba79ee39ca60 SHA512 eb656fbcbb42b910346d97fd8dd6a3c9cb8a6d85ba79c5da900feb9941cc92477f10685ddf1928d6dc56776b91574cbdce862d19242c9a6fe21c0b5ed344fd31
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_id.tar.gz 6967112 BLAKE2B d5b1286d04aa6c65a8d794498301ec9aa10fbc3158772b76c86293651fa80af729326ef648b8a75201499445f7e8643793f89f845b404cce7ea319714d8eff5f SHA512 aff6d3d0a9fec0bede932e334a1d7e3ec57c5112d42c5aa32ed5cbbe865b10558c4be6ec255e96ecad47f789535cb8f39a2907a579d1c65716964ea3139990c8
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_is.tar.gz 7029592 BLAKE2B 55525a7a16161b3d43a7563f22720a7430eb66109b36ac05c6ed8b389db947a49cc7dfa1d893f244977abcd050226f9aacf0899e1e337fdfff1f789e4a4fde04 SHA512 9183dc2752ef325190b10e9d53050a57ab0343ccd07a6cb0c101120bc4f97edd694108b1075e2d0f93afc61bf56269087b41c568f9505326e0e7f8fc00a20128
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_it.tar.gz 8075666 BLAKE2B 4c9390a83a906d28b7cea8ecb28d0f0c44319d8b51269668fc180fd8a05fe1703ddb40f2cb82573b4d9aedba71fe0efdabd83298a7088638dfd922fdcc7781af SHA512 88d49e4a262f4bd0047e0ce007b1fe8e534e35837275bd2fef4f6397c4043f1a9767215843dcbb9af245b2caaa6432f4b3d561117ccbcbc60ecbbe1bd8f72bfc
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ja.tar.gz 13165876 BLAKE2B f5c00f2dcbae9f1ee59e5953df00e5562eb043d1fb232d88e3be8b6b6c74adccd2e61787cfee55873fa4c9dc7a6dd83d731af5600819b13c8b48e3d03d7ceefd SHA512 b1b21878cbbf03081bf0ddeb5601d42b1f2a9486a6d48f29dee63a8ea3fa6862fd60c2a9d08a15b4cc451a6bcd65539c8c653111893ffd144701d84b4db6118e
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ka.tar.gz 7192686 BLAKE2B cf66c7f2a7ecd0790943ace5ad1389338463d6dab22c846c9fb93536b4a40906939a76e82d1b195eb2947eb595586bf86e24d64f6873781c93b73047d9640828 SHA512 68cd349c1674dedd7bae5fbafcba9979559b752335e54fd79f5af3feba98b446aaf695c8da3638688df1d212b6fc30c344ac3be304554485f5dbb7aa8941b64f
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_km.tar.gz 10329114 BLAKE2B e212e6621e8afcd3d2181e1ae003320bae9aa77d6893c14679dc0cd20a77c3709159acba1aaf606df7fcf90b933e4d69e5d72e2af26bd8e71b095902f0eede75 SHA512 b90fe5515c6b3a5cef7a16f75fda9e5999d54509e4ed6143fde550b5b0044b3d33ff995f7f22f2313dbcb19e77f3d447e0574c50738f9759946d86afc8480c25
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ko.tar.gz 9438028 BLAKE2B 01f48035d2f6c5b9e8e66971732cc4f400ee32b3af7744d62b2c7bfe4c9bee5e9409b156137cb3b7b5c7b4cbd5105a63d458773b7f0c85b6e19d1ffb5cbc69db SHA512 e21e45dfd9a92841049b4f60beb970d102969cf34241143197ce8e12a07e6bc56c6c0d8e5ef865160ba88fd7e9770f17507b8cc942b6205f7cbd908b19de5a35
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_mk.tar.gz 7412050 BLAKE2B 5ada9975274eb2ed77b7a1fde8bd9256558cdd76d0a68e6102bfea364d87e1e2bdf352dcb007fd8826910a9137e6fc27859c8c87e6712e5eb90553ff8ad73332 SHA512 e3b22fb5a47ca00a15b332ca9a301b1af42fd76a9b17eec5643cedabdd4d028ba69f48a2c7ce9fb6a388391922be2f96dd009458a7f2c9258c4e8b36bd64a9cb
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_nb.tar.gz 7765886 BLAKE2B d2b7def4da89d561b2194b13adaf3196198779ef88748253823fd64faf2ebda2752c3856c50b613a213657b5e44148e93f3c89c08879a33a0847f0de03e8ed69 SHA512 d2a04991f30c482c4471fa56042fa375c3bcb8e454d168f1f4cce3e19e89de0748f4730c3a9569e594a88c76247f5be021fc0762f570efd7b859e4b5b7941927
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ne.tar.gz 9787466 BLAKE2B 830e6ba177b041fab6117975f0b8e4c5cf50ae38560a6cfc43a3afe747bb9cf351631611638a176357a0083d321b0a065af5f65b14f610b092e77710f210b76d SHA512 f020df389c6b1c6ba1d1b2ca90b2e0863fcabdeb895133f815c03e07b14303abde79b30564c944a88ba11b799febc791bce9dcc1ee41aac35777ecb9919585c0
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_nl.tar.gz 7878533 BLAKE2B 9208d481a86482e488cf90522fe4dd53760bef4fa0f2d9775af7002241632eb15891e81c99d495b54a804c5dc9038dc8533782caab72ba9007bd3a59ad03b2b6 SHA512 bd6bad02c32b6effcb44c3d3ae63c98d37eb63f5ae6f9fc494cb7232217bd50f7453f7440fc7ec543904435bf84e00a9018b504b886ebb5dc99332672e84fe7a
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_nn.tar.gz 7755783 BLAKE2B 3915e1c574139b6b3ed7a1faa57ba43aadadc62e63e2d4abd9892e1d5de9d7c29aa5c02a5a98a22f00f86abb98f53e78ec98bb3e6d19d8f2ab2d836d485f517c SHA512 09fb39e72af6792f2f172910f602c47a0e670e6eb021096ba414785a83c1fd8d96b9576d5d001adc80c1f6f3519d8f21f1447350e4c29e5c20434081c86178ca
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_om.tar.gz 8063410 BLAKE2B 949d82b87010027e423d7f2f13d66e599cbcc1c6a0c8d92433c08754c267e7ac6ab623b3b13df0416d7e1a9641805bfaf1c0845a84378313c23094a6c3b38de9 SHA512 2eecfdfb21026c8eb2321da7218b4cf11a8ea0285e3b96b87067fb2286d72f0ff0149dc2d941a393d310083a268fa8dc38067bebade45d5ef0628b84e7da2794
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_pl.tar.gz 8231006 BLAKE2B 8c1cce7ddcc23a2412cb05d4e992831aeefb77154b4133ef0822aba1ffc09c3131632c020b936a04f2b7d1974b057e0ab0678706867e2568c0be69dd2df14c00 SHA512 a048608b6c7180d7475f12d0dc2678290b6ceb5c5287fe9eda29189065aea2bb404033cd283c10964236cbe6b4a84be9e30be5c2a006413f1640b5fb11f02908
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 7889490 BLAKE2B 811c2ab5c920d95cf1f77cbd6fb33e4f645d355d9e524803af76ab1b3cafd4024e716e5c51bc581a3970782a397ece08321ff436362d5e4f4379101d9b47c112 SHA512 4d7f8b182028016fb868ae5d7d54140d23ec2fa7d951d6754a5e3a21097900ef5f6593e94321341432d335e57e996d50a2280087eab70bffcd3d85b77be8a298
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_pt.tar.gz 7863123 BLAKE2B 82824e365556b40996acd17fa590f9a0fb5bfa900f2fbba13e72a9109f5fd443f408ba6e20166a17ffee2615515e4c92dbedc6f18ce9ed8659698c1be50518f3 SHA512 45d5cda613b2c54e91e1091ecad43d266c11729a5682782f9adfa985301ab7acfa86c95ab1d40c970c9d958d367bcb3828779127e07813c44dfc8e46026f6cbd
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ru.tar.gz 8503140 BLAKE2B 7f5517375245892f095a5fe7202426bdc951e7c1de8b50ca5d5ace57fc2a644b1f2858d0b355e683c45497d74d4b794178f6748998d3f7f83697c5b4ffee53f6 SHA512 b80ec811127a63bd29b2e255ad1ab0e91b6e68eb6660866b023d9950c5d192e6a07a77883995cddcccd0fa25734921d2dc99b018bb26216f4d18f4a0455d975b
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_si.tar.gz 7283477 BLAKE2B d10669f59676ac90e81071046f2497e607cbf96056bc8f09b6c5dada1753ec6c54b6c0959b94afb55292b141ea58f0d194b6b0eb180db909ff9cfb508ded3b48 SHA512 adc7e23f99682a18aa7be20d0a3af3a7eec2ec3ca4da8f486e471a0cc61a219b7b64173d6f6c3f7fbdd5d451eceadb85461cb3cc3ba2bcd2e3c2a61dc9abd32a
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_sk.tar.gz 7585964 BLAKE2B 6449a87b0e5223103059ac9da355518f0e99de4559efd17a0f113ae369d23c3cfd5d9a8381426e38596679623983b8fc821bd816c8063eed132e7dbf7071caef SHA512 710cf4f52d48e695799985451b2442781acd76e5f89f8815de3f118d0ca9f4c27b6abeda6e6b291832fb62a0d8cec960bcd931dc7e3656c9edbb16fa99ebc389
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_sl.tar.gz 7898312 BLAKE2B f7ab0d6cf784cffd29813b78ef181072ae15d4b4e2c52747727b65d0b6eb326bf7e795b8d1568e564281bc14a86e3a9ed743019844983fecfae867b08fbd3a7b SHA512 845fd6ac2c2a1067b9324e1a28ab64dd8e826391d7942e00ca19152e2c9b4f522bab94dcc2ceaab5af468f66a19ffa35f656724923114f8e86ac3518120173d6
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_sq.tar.gz 6940309 BLAKE2B 8d4ad65775fd5e30b6f11bb4c04c433a3a879ab66d04fcd28f176d1a11b3979e4f56b2c6d12cc5e90d8692aabbbe251909f5de2ec1589fd465437d8a82d67204 SHA512 0a90ebfa682bfcdef74e966d0e4ec03d4114c04769e2542b3b374b8b5f53e9e6a6cdfedb7b6d9e4b65ec2708f030bb84909260a6797eb90a93ac2da57108065d
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_sv.tar.gz 7823890 BLAKE2B 39b2e3340e49c739d4d014b67f8860646ac406351294a5efa0c9f4c84c6e7185bf6c19dab9f7561665aad476a3d6712fae0df7975aa7f8b9990c2107f96f105a SHA512 21c49d6ff76a1d03bdafeca4bdc68ba89026da30198c61e161d385b6b4666ac697cf752ece742618d60da41fd31e942665d5952cf936fee72ccbafea673a437a
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_tg.tar.gz 7245306 BLAKE2B e686e7fdead312f26fac1f5ec3384c0133260a4b8477995e2fb76c888b39957142143776b96fccb09261e606c721bbacd9da38d96d1b73e22e667d2977f65caf SHA512 ad3a05ccee6febcaf68d57c18fa87aa1ea2f0f12437063306daa5261264dca4162764c28ed05d83b9edcede4812622935136c3cfa59c22d5b72fa34fcd199a63
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_tr.tar.gz 8037954 BLAKE2B f7f371328400b1de2de93239cc442bcf23d640368cf205885da1779234ad0915151f52121175422d6a04c6fbcb65c7dc148aef640b7ef9dd87207b8f00462745 SHA512 9fb2b737f9c6416475f3bb08fc119fbb60e4ec21c9ebd600f18bb33f96966ecbb73465111dd02ad7b00b9e1d0607caedfe22e9d86f7f67db9ce39275e2af338c
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ug.tar.gz 6935038 BLAKE2B 3c8bbb42554e3dc0ab005900b9eb3ea8493d0f2a7f820e042784a1a689739c500b854dcc5c66ce6846359ddd2f62f114d89df59e46cc56455693eb1964284be0 SHA512 aaf303f24f32b159623e96d3823ffc1ae255cd967b72461e46a8828ce60ed1e1b36dd14e8cdaf145ecd8d2b8f3dd8fda24e900c79870324632f8e23989fdffbb
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_uk.tar.gz 7973587 BLAKE2B 3265d4943edef99ff4b7281ea6a6d72d88954da38d7347d4fa394ebd098869cb4e77f9c1a8f1805ba3ab5356df71ed9b204db08de53c1290d9a1fb73123fea0b SHA512 12c7f5104863bcf5467ffe0c9cdb802a6b7f125c742866e358e80248a84e0f24a986831e63f977e1caca74bbb43aaa29f116a96d04d68cc8cb2301c65cf6901a
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_vi.tar.gz 8185736 BLAKE2B eba9118654c0416a32c9394304a8d447ebe0a1f07a3bca3d9dbf91341174893d95d2a3e36828e57c1cbfa928ebbb439763da5ea3a4e090113ba6f53a8b3046a8 SHA512 14eee7f92a24feaee6b19f78bed6b147933ab935f19ff6a1bd4eb334befcf973058168bac611e623f900b73e0468f9a162d3516a98fa921d314f84ae6e3052a2
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 10798006 BLAKE2B b8d4a595d32d142e63ed3cbca17ff8c595c0f9cace94c196df80a4d9fcf3e52377edaf00f06e7f462c2861fb24b7e1bf7f15ba5b3ceaacd0060f180f2a1d194a SHA512 e7f4d741ec6b9fe35b2e037989713950d878652626ec8166fd4bdf19fe5963f14b02fe5fc56ea9d690c31879d3e99a83cde8c84a28a5011fbd3d8c7271712ce7
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 10719948 BLAKE2B 618abc4627581a9161f140adb7dde9e94b879353c5e4736bd8489048af059be37d02f7e3b1c00e89560046f1c3d88963abdaf16cce5e27f62c4590299d42aeb6 SHA512 20f302f6f1f6f82a1d5a53e2931b79580b4366b21b8247aac83e7c9288493b5e0dc5bd15ca0d680b4754617772b8344a70a74d139b71a6e21100d633e87407f0
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_af.tar.gz 1012366 BLAKE2B fb1ec55a008ab622a4397a170a930f8a8a545628641f0a411652e07694095be9a2ccba52e0689c3c6f08a7e67437173cf8ec1cdd62fcf212d723806e680f9178 SHA512 b15d34808d9d58f29d7111b16075d213de62ef99024d4297769a5bafc3b8ef37b836aadf0e352fae4bcc426a236ca20385df09bcf49c3efbf9499bc3346ed279
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_am.tar.gz 753437 BLAKE2B 26b563a3e3f49e32e577746e1bcabc677e26c726a58fa0d12ba80aa42d6abf35906fc0b6513f383220da6f3c95c04ef608ad413b4b185f86a308159215f4a2dd SHA512 d26235de05e4d573934372f580f7324a635a96a90527b92e528d76afdaff05c521aa942035a36fe42b75954be3f27731574f67e52364551c7e26008dd73ba09f
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ar.tar.gz 2424188 BLAKE2B 406dae48ff821afe805c7f64e8d761872cab6c0a7f08f6dbb72494a24b6315d8db961431ef34b9623820998b4722c38e04ff58ff9b95e90ee01a3022af77b4dc SHA512 79a6fee7a9556803f7add64c8ea3978e680f44dc6670b145b6552333f45461a88af1cd045af5089d251f93b68bffdeb3282fba7c5965a747fefd196410515298
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_as.tar.gz 541922 BLAKE2B a35e46f99b8be1ad81c37469ede31f2ca57ee63b11cc66af3ffe0e7f0476cfad252028fb3aec9813a000aeb99a0225424ab02dabb39741b99331f7862f26c36b SHA512 b817be87e20744ca9b03d7f5b4df4741a89bda4d3b34815adea91efea26872977922083d0a3c857996ed4b17774d1b6985a9fdcd419f947a4cc1951b9965e2ae
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ast.tar.gz 450173 BLAKE2B d97c529a8613d8f9bdf8a1c4c9e7cb90a856e9dff9cbe40094e295db1e1adff64b8bf47835cb147ef1287f24fc527cd4a8f08825034c8eafa5be7a052ddf3f4b SHA512 296b448c3d7cab2776d211af58c935861904ae89f2d2a350b6c2fbccdd21d20b4f64843737adb9978942601bcff9e2e4c2f89a417c63d40d91431fec5083ee7c
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_be.tar.gz 1074840 BLAKE2B 8ff170bb35433017b2e2f408e7ee7c785966044d8609d350afe3b3d788b7f7313ee02703588cd9ad3f36dea6b1b26bc4241fc2a6f9e3478afaf766bbc9caa04b SHA512 161c8688fc33a660c0f9c59586fa76f50a1692943509ffffcad6bc07fd7518b2a0aa3e2e85fe6a7b2f06306427121db9e67f84a35567ee5be55bf2006c14d38b
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bg.tar.gz 2203415 BLAKE2B 8f5b27f5dd863484d52ae9b91172874a6a5d7a5ecc226931ba628bb1162b2f666e4178b9645346962d08e0ad6e2284395be814ae38664ff735b4a66abbc5c054 SHA512 e04bfcc2f7ecdf66701fcf5be4e4e1a0446e0da8125f40b8d880c24bc6e579597e8bfb2285aa406a53aae0109ef97a25bb6f9de471af67772d09f7e5b5f62d32
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 629677 BLAKE2B 77d35ae97f80d41681de7bb8d53663641c27718443f9cd3484a95ce21f80bf2657f68a2c12e155791cb69fc9a9712f0634f99afa3fccca9d380c36c37fc9c3a3 SHA512 21e328b8a2ae5a890fd19411708a89858289c8a63db08bc2f579e8312619950a9dd6bae40ef78a8178905d399478204efc10b3f8a25f233c201829fc6109bd04
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bn.tar.gz 795678 BLAKE2B 3f715c5471f49eaca47323b198edd01d4635ccb26bea472ee09f4a532b066a8be5b46eab5ca9a463bde4e60618f1080a28ba879f86ecaf7b5c35b17b38f0d5e9 SHA512 69f4e658e54061ee32955eaa0c00317e2f3dbfa3e90be31097bdab9f681811a5ac187725af9ffd3504ab64e82df185e75e4ca36f4a04a1dac1b9f99fd3540d80
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bo.tar.gz 386650 BLAKE2B 254858a01ba4d3cb47e78f51f97141c2b91fa61bf417704e21462e30a975181f1f00b58f04696d4b37ce09bf1e462def2254874d3865638ff8287a4d36db07b2 SHA512 241da47e795fe300e752b1df1884bf5d0e9182142c45c97d3cf08cf7d658a4671cb2f369b3b70e8bbe6476616ed474d72ccb9c785037f75f699823ded16c4375
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_br.tar.gz 1866146 BLAKE2B af2d8fd35a7858a5cb9d9782317ad00879bf138a492c9863033c92424fe2b4cf553c2ef9f872fbd3d8e3c994e87c0e9c7dacc4a5197a95a6e4248a0b6eb96f05 SHA512 cee95fde0ca3d5409dd11e458e14ee953f90b4a931284c0dc2e5958166b211bd5f9e4d64469ddcf78c2f2a2728d4d6676feed2ac1ea20c6418ef56326c4763ac
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_brx.tar.gz 342830 BLAKE2B 76e0735b41f4d44781342024a09ce61370b11665e5a1437b996d3daf161935602df1bb1ba2c246ba93a43d81c8e9a98e549aa314ba957f58041eb3bbdfe7e86a SHA512 3c0a3ec54aedf743c2710f76b77ceeb55355f423c2fe920d1d9b5b00327bb9c3f8d978e46b087e56b2b30812435b0501b9510102ba17576f9ae0f0ce0eaa7859
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bs.tar.gz 646199 BLAKE2B 2c9c7b49954612abcb7a0552ade1a626625b078092f1ea0857fe26724ef4f9774951216a409c7f39e0e69d00cec545e0e2e860ce441bd0a835dabece29995345 SHA512 fb53266fd67804198921c7b8eacfa02fd78fc87f86f26ed0cb53ab173098f84e57eeec3f98f87bbc1fe7ff5c4c5df78614f1a1835ef637c876a16375cd5714a2
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1993077 BLAKE2B f293f87b41ccca24fb2807f3577b4c84152b43433308e03edfe78c0071a787f2bdb87cb1f5616f43d500534d547df3e9ca28e69aa90aa4f516a8037af736b084 SHA512 6cd7dfef98f69a591b10b4938654f3ae84a6a3c48c74ec33108eb89dbae812eda6236161f2e00da17b9b78d68fcb7631a408c464028488d8eb83ea3166487b0b
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ca.tar.gz 2007015 BLAKE2B fa541a1d51a136425fb69cbf8193a35835f1832e7a954d271ac0be1da814177d36b990541d8c5f50e94c91e3271bea2b744755da59daba7bdbb2d036a34af9a7 SHA512 c1720c0e6cdfe8046d8fdd9005455cb3be2144a7292ecab0450a2e910229e814a8b274f73281a9ad415735efbb7115e0d638dd7a95e275baae97e588412b00ab
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_cs.tar.gz 3173450 BLAKE2B 008ff06596a6e24c9fac02149724bfb2520389a06e555d48bf79ec88e0d5dbd6a448df1a6ca91d5813f8483c25a3c8b79a8957effb2ca80cb018dda77d8da231 SHA512 6a013451c9ba5c4e087fd1b1b63c20931f5974dddc15f3c55be395f184bff1d8251a8db163b12033d687d8780d0bf2ad7fe92db91c47c912c76d99f58831a1d4
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_cy.tar.gz 713362 BLAKE2B 3d25158c648670fdb8cf86a25eb3adfc1e44e69e656017216a27481696d7b1f118b7f05c4da85d8bfa4aef7d7e0426bef649957dbe29bcd504d9d26f647fdcec SHA512 fe8f2e70089902684c4aa5c75d92471f30a0eab314cb412441707062d3a6e376a84ae68385529d231c9900d79bbf9e33f80a64228c899361279be867700d8a97
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_da.tar.gz 2616908 BLAKE2B edf1810909fe9c5d0d0aec1f7855673ec8dba59668098c2d449e8e73859c837b897e33c7f8b7d5fe8281154dd84d35ba9f5cc9e2920861af395190dda6836b7b SHA512 dbfbe5d48c66291c2abbf0cc7518d1552e17f8063df2e41e7da1f39bdf38d8a0faf62986b2f14b9b03656f49ca30d18cecfba5e589bd8f25f1c99e23d3db0117
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_de.tar.gz 21744126 BLAKE2B 6817060319bf4f3df96b3b9818bf0ffc6eb6d903b314e42d03aecb391d0127627cb83481646f073434e00a97e9fd3ee8e2ac70844d1187bc5f915455b10e20d0 SHA512 93d0b55f9cd977139d578879d6a8cc9ca8051f5b05cbfa4d05dc068e28d9e4f16c21cf36a2a237eaf177e2bbe2c224b78018fd9ce4769e8711f47d13b2cd255e
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_dgo.tar.gz 448452 BLAKE2B ddb4e3bd5b5076b0dcac2ee7166f168dd26375d7867ab94a4c687511f50eb130b99a8ba56fdf22e409ec26685f745bf0a675db2b4b178818fc1c0087fbc623b8 SHA512 a39b5faea1811e9d23e1f9a2c187f9ae4b64ebfaa42b28e74fdcdcd148d08a39f31a624ea2e927a64e270bdd45036c4b71e6a47e2785a0c8e4d2a57b491eccbf
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_dz.tar.gz 374218 BLAKE2B ed5050d42699c969e3416e98346b9db9ba546e6b19c8f2000fa74a3a02bd8f0ec8756fa5f9da4470ff70c6f7ae8d523cd7ca0ae4ef9e4055693b908a13a00973 SHA512 cf32c32582c8ffa74bcfe3285f1215333c627f8c67c79e08313c4f3696b50fd09e5178f1207974f21d47f668e1bebad8b3578d59063936b2fb30d2c3e03cb784
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_el.tar.gz 2814787 BLAKE2B e192f12cc2e69fbb2465b3d117107ca0ae8105825526fa3ec6ca0a0af4001d1898dbebf74f699c105cbb4966781d17ae6f0e3d772a6f49734c0a12ccac09c27a SHA512 8de21134bad8866ec7cc12820f1a39256eee3128c9f2acb69b13cb0544031ba016ff84db09575bd8e60520d504a9f7f4a545b683550bf5fc87dd06fc87fe796d
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_en-GB.tar.gz 7229644 BLAKE2B 475e79e2758c43ed8b567d6b9682de2d04c5f72306bad6dd4d8de3711f7ec51cbcf205e36d977b3c6ae207bde0ddfbc4a01c052503b074570800ea4898055f55 SHA512 4b15bb3ea9142870eebccce82c876dac711921440efabcb5a6e3b4f0f308eef94465b749b0d6e0dcb8c8174fd97b18e6fc644813bfc898751303fff2debb6850
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 6835624 BLAKE2B fe9d45f32139594ad585d15b889454a093372c37a7b03b27a945c97bef322057ef55833c2eba12d828517bc35eedc7599d95a29fac5cff03f859f8dc64210bfe SHA512 a0021282fd6bd1d1a5f495a69447af8a74ddfcc42a534cdc5cf64a16f167dd78f247a2be8f11b06d239be274c14f006cebed467f9c4b99aaadcad3a009cbc290
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_eo.tar.gz 710488 BLAKE2B d7ba464c302540ec7cd0d6c0315b026f9cb3f196bbc03cb918aca48e3b5771c64fc5db57723c8b77df80e57e6f4731ebde84b60df6a7971abbde25f608cd3d1f SHA512 64499f25f8489764eebb9d4f550c9953791eb5dadd5a50191e6dbbc3eb3315eae0db032f853880d8f6c1ffcfe897b334c4dc4121aa05dedc70fcd521ce8f6cb6
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_es.tar.gz 2208865 BLAKE2B 3d7067a623e1d6c67aa532f6643ba2065de71a30a589e1c75fa3e6cf20d965e909f3fd47bfbbd52b47a0e7ab69167df573e199fc31af907e8053576f95ae8452 SHA512 021d8a92ab6d5d30cee38a67deb6705d289b1e721b89cc5a1becc33671ab06309d13a84b9f160e9682860feb30250ccbe0b3c60f6bbb6339645c973d8c2ffc19
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_et.tar.gz 1622832 BLAKE2B 975b64d199416b4d90c94eff8fdb833260d7a90fd9a8ab3fbaa3bfaf9e2c973b64977b5cf8d68a6e89fe106dd04632c3e5162cd00275d07400729c989cfaea30 SHA512 c0d6eaad9de09c136fe4b1dc7b264b57f145fe4fd6b51d562362b66a735ccc6d1463243b997532684716872c09858aec2088021234d3e66b5e295f22510c2700
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_eu.tar.gz 718441 BLAKE2B 298b1f191fe7eac9122463305e654c7bff84b7467a6a7babfa002fcf57cd0ee0ef70b4a0bc6143c85ae40d9fb7bf4cb34e2e20f11b94b3de346baf82d26b6998 SHA512 d8fbe61ba0788873b5a766f8de30620fcc2940a5e3f773fede8da049c1cff089ed81d3d1546ce4753ebeb7ad511475813ecc853710c0371adcdfe9c2cadb7450
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_fa.tar.gz 335047 BLAKE2B fc089b4745396807fd186e60815a78f4adb89deb38e4ed1c556c08d2e1fb52e728c1f5fbd3468d6f008d6d04692ea244489880bb22215b1c87ff167f8fb3873d SHA512 e83e2c182fa290cb161213bb951af3dff01c171de8b708856b53ca8a99036d13edd0058be7bc7082a9830ae5a45673977898e0d20b7ee69775bad387a9281d95
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_fi.tar.gz 723909 BLAKE2B 8db68bed773b6bd9861c74b66837e7afe1ac71df3f5ac2cc99e273224758c5696d1e3d0c792f42379f8c0d225266bbdfba9fd841627b802a1ce55b251dc4671f SHA512 9f0b392825b04ca968b1a39dd2fe26327291c7dde977e796b4fb155915604771a9944359f7b02854620a62d00fa73647f4041828ff6134e77f1e0b753907e1f6
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_fr.tar.gz 3020804 BLAKE2B e4aa3eec71efc65452ba2a223e5b4ee16d8ae5d5a8349b57e8907fb375c1b403614c6461c59e26303c54b89675ad0ce1705773a67cd0c55ae69caabda7a021c5 SHA512 0fc661f256b51b1999c970ebb4a979c3afb0a91923a46446fee6f2399e83fda5ade9583acfd0313299bae4a151c071c2e9eb5cb99d2ff593da07efa66d760cbe
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ga.tar.gz 733452 BLAKE2B 48fdfddc0657d8a0e8853ab97d1bcb308f0a21346d6863ec77f3ec8e33c3a8288faf8eec8097ebf7d922d6a6acced97bfaff7fd94033a7a362f74d68f6e1d351 SHA512 310a8715211fe240dd4aae2cb8ae9329c86a0a25564c583a496474f7fd0eb6c8f12dd396b63f8944b5a60fa3a67b49affed71714a15cae1678b3d1f5fe65f122
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_gd.tar.gz 1770543 BLAKE2B 1c691d9a49dcc1b6d1c6012fc3552723138a9c787cb4eeeeedc412fce3b5b8c9fc9448f4d6bc6fae118c394955dadcd03e6005ba6d37bc14f8f267b86824a520 SHA512 abf155358472dbf7abf0e788e4f6f636a3290a582f2280137ecf1f545ecaeb5166b02e66d5847d8915137b7af8a8e4737b612b41a1b6af839eee7f1d8d6eb1d3
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_gl.tar.gz 1283616 BLAKE2B 42aba8c7357ebf7ee5462e89a5766a89fb5e61fe7da37930b0590efb89dea336ec988cf753e81fe47879baaefb578d9d722d9929276668806cb920a626c47eee SHA512 83623e1bbb96e76fe630228501fd61bf409f1a227a622143fafbd73edd3ecd527c50cbc3e319b079fb0cbfdec97e6006f414a8097bf8fecf11458d56c965511e
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_gu.tar.gz 1240553 BLAKE2B fbaff93c144f82f51bfc772c85b7f204489379f9d5c1d3e400b419084a5399dd2ead19293242c77578faf6da4b9f5db3559d2ace071c3179d1932fae6ac8531a SHA512 4aaaf468c5d240e4297daa79adac2084767a69b98889e04128d7c50236c066a159c62d2f26f62fdcffbdff3a692c995821398ce4e7db8b95890285b00ebb9d6f
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_gug.tar.gz 521324 BLAKE2B d98a7fc6a371163f2b02e8050529197127fd21593e7eef2c63b42a1927c674f702047075f02861c87364cf2c3b694f3ee8904fd5703324331815ece45888f4f1 SHA512 b3eb0f962c1101353c34b3f7ee3fd4c89d478c21dbc158a9d2a8460913f10287d1348de09b0002522c1feac3bc72a76278ca886ca6aadc87ef441348b1d7e916
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_he.tar.gz 1631811 BLAKE2B 538e09ff182e9e7285b2329ca288c50b416807c445a73db699f8f00962987ecea19fb6e7f99fe2be70b9ca8781b7f0b1a6e40855b4b1004723d576b7b33e16e8 SHA512 3960694c04294d4aef899e5114ebd7151a8e3aabaa1329fbd625728571d673711f078929952bef6e28ca9c136453fb946c14807ff00f638ba10468f89bac43ac
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_hi.tar.gz 579226 BLAKE2B 7c198bace0ad25a673e167dca9d0bec0461d546a5ebf288414317e22de1424104fae9c97e172a372e8390f7ce8a4170839ae12b9267708c378545ef536bc00fb SHA512 906c24241b4fac4f5bdc57ecfbccc2ba952eb9a42fd2d3eb294f83ba7a356b90c6a1a1238311ee2f2bd34a6292cd4f1fc5a72289c9a5c1d29f2e848d19818364
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_hr.tar.gz 967277 BLAKE2B cf53df533309f37bd7c1804bf2925b8528d2170921a11ffe8c2a4396e5ae6625c192c0445ea9dcd47c6af58f870db1e1c6bf4c1d39d3462c2b1d33dac226a20e SHA512 2997e96859fea87aa8aed0a1e1f0047c3541901ead8eacc09781df04a0baf6501a24b81ae283e4de93897db6bb9888b18d036adb384e06ffb06a28139dcbe4a6
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_hu.tar.gz 2984293 BLAKE2B 21c1427b5a0ec673d708eb79cd806541d2172ea7db2c8ed291980d96badad7867c8c57a698a61cf5d65a4f97181308e1c82a38f7032f6f4a142678b740c54799 SHA512 9795615efc4d11e503d1c97e79b34aadb8508d6ea13d744266041414fd53af2ff68c04d2ebfdafb20d171d8d663c15994e7c8d5cd7d24c9e25dc080479429d17
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_id.tar.gz 693873 BLAKE2B aa771ad098274e8e45ef27035cf49a81720ce4d46b3db8e9e2505517f48fdc4edb1b0975e82c5f421a582beb012f3f4b43758864ecd6b8ca024b178e90c211e7 SHA512 07badb8b604484c4527af4597793341b73561ba1047027c47a84d9c58b1a90f37dbfa11d21b733636d12115298ab8c4c593b2afd69db221eef7575ff04ce20d1
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_is.tar.gz 1503896 BLAKE2B 41bacd8d0ec7b2f41c73b5b17cef3104b0002d3dee89fa38320b0838544c07f2a86139e966aa62e89e00204308ee7314a43267bd8bbde8a395e63936d6b170a0 SHA512 84a466acc1665d46d4876c98fd0e2eb7a115d69a628fd82933642df511372056370f0b4219f0b8e4590f68eef53727ace620d0610dcbc474bd3708605dc8b82c
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_it.tar.gz 2057354 BLAKE2B 909533ed8b9a004eadbb7b5c35ac918b48459082fa5898315bcc57a5a0bbd85290bbcae4b886dc1c8938376d6c5393f704378b5fda42dfb7ae20703cabf0dfac SHA512 ff64a0a8a6a44e1562580d20e6091c5e3a56ae96f7e9a7a8680c26b9868f992947cd99fca8e41b2f69676e801bb5cd602dde88e7132604fac656842b5908d406
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ja.tar.gz 807896 BLAKE2B 62547becb819c89a4c1812dcb524ca8a26dc76b6e1e074be647539d77f4023161c9de343bd847bd1efea9cf3c89701c7d0a2037a32b5227d923597311efed074 SHA512 25080c9fa31af838d3b6842c873f0e4f15b76705d4a0666172ca597c0efd1d621bc09d6d555d4ba8079612ab3d58d2e66f6e742928d2817f793d87bdae5ac059
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ka.tar.gz 366260 BLAKE2B 69a9818e4f2c5e784ed4bfa3317d4fb1f9545cb7482e24d6952e6ed5bcb51800010d77ca7289a93a3f30f0ad0190152b790e9c9e8f2b32fb7c69864653406a19 SHA512 82ec8869cda4d79812fb7cbef104407cc7fbaf40bd2356179db67da1790edf6d97a1413dc0419dabc7abb379e966f33115dc8a1134050e457adbefdcdd1b4cdd
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_kk.tar.gz 770428 BLAKE2B a3ba9077a24895006aff5447e2f3394018958ed81c07600c6744f24a04e153f9691efad9720c014f500213ffc25592e195ae993eb58dc74b3b547fc1c07862aa SHA512 79a40ad006ece6f6a216b5fea5a4282efdc0bc3fb47b8fa21771cb704f1bb6b1c209870ecd090e3ffbc6781e958594bf99456a9702914fe71e41276458c38c4f
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_km.tar.gz 696569 BLAKE2B 0bb4c2bb4f98e26972455a81acee973f458015c7330deadf17f5987f37b63c95685ed1b2ccceecdfaa88e55cccf91db79e6e276d85ecebdee4776d180259df24 SHA512 fbd8566f05542a2c181fb74f754df0ed85aa9ef1a8ed9de34b614319745a26dd744d5f688e5545318f8ec94d7ca1ef8aa4e06cebfc3b659b8dad9020f29c3b65
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 340362 BLAKE2B 336ef1158950a18a43fd0d6dcedbe7445aa5f15c54eee628ea77fe1bfa2979a00c185aa3f8dc90de5a7836eceff44a4c2514734d10a40825f6c91f63d3228173 SHA512 9b0437d99cd850115bd67181838aebb529d735e3250b3232f2792bc85914b4659d42394ef380d5df8c431f48b8e6d43c33a5547b55648ff8aadb361a18af646f
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_kn.tar.gz 594464 BLAKE2B 8b732f186ebecfee1320ba11f438db41e654aee82de89a3c8fb725709e697d85fe48f877102c1688e9d8821546b4559bd4a17465c4fae05868a54ecb9cc7770f SHA512 94e6612be3f957d7906d253a965df6856856968ba69d20165a60f9d41e935f52cc499390df7b1737e123f309f0fa6077cdd2562a7a01c28f305477e75e4e8d50
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ko.tar.gz 809129 BLAKE2B 0b4f03fcf1b10eac59f2d5cc2999939d9457f9d2db873bb343e9130dc0a30185dd627ab190397708ce7cd2793d32f34febef4872ce7fcf139d9e4d417c7b2191 SHA512 7cb3c34ce9727ab0e5f3d2d4f228fc6f370e9471a6253c9dd481d3e7e451f85b249b54a38f7111e2c28dc8f902236b94641e6324dc00b50be286115000efeaea
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_kok.tar.gz 419444 BLAKE2B 021e2ca40dec694cb07165ccb682d1a110f2925069dc0f0a606ef5b81f72c2a40bd4d4ad3d0455e6c0072b9af682e1e9d5ca35e6bb934374f41fa52034bb41d5 SHA512 491d14178c673d9946ce448ba4528f78315be1865b1953d5f9d15e740c86cbd151a058bdf0e71d6d9f682af2b7ee853dd0de2079fb00f355118c5eaec2278b2f
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ks.tar.gz 334886 BLAKE2B dd4fefff4fe97e906d43cae027316e642bbdc8664553a1ca3b4fe668762f94692a7095980d1c7fed386ca95ac5503fc793afc387aa887c20f7673ce1ab925061 SHA512 1ae123c94ba7eae9039b003d1a6525746cde873a634755accd76bfb4c2b3327deb7871f01810564e0fc14b61ce47a0c809104a2ac4506f0bbc870f975b293829
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_lb.tar.gz 144994 BLAKE2B c1e79957751b73ca52303af9ddab62602474da3275d18add6c5c204fdaae090424c6dc53a13494ecf938ca40ea4aa83254188b2ca5d8f0648c5c726b926f067d SHA512 9ba8a55bb37e27d28babe4c8ba28884ceb1af5172df2cbdcad16dbe2c3c08d1b18a323e65671018b965b87299861d02a8be6592ac95b43e765db85e4aa44f3cf
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_lo.tar.gz 368693 BLAKE2B e91b6bc6ab8451ac162a556756d5b36772d2e0c18704d05005e781f8b17c7770f0080f42e5048df06c4a22a695bd2782c40b32692a3219cdab53456f2af58028 SHA512 b31dba199983da4cb0af4894622699f540aead0d1eadf14cd915ffc8db4c0b6becf4a4103d077459ba9ac0321a21fd1490347a3b4e6c0180b5be1ce69081ab32
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_lt.tar.gz 1027212 BLAKE2B f889485e7f8ce41f2a936215410d4040074f1f3288fb1282714e8a781944d03d998fe1e8c90bdb4d814badd1e7341ac255ed1ad0a260577906728f9b10e8271c SHA512 e467488eda47cb2e86be278bfb2ec89d6aa7d04cae758921ab46cdb8d2ca8e132ca09c631dd0c484798bfe11632e0a8b862b6ee29358b772c87aca61c6c29b40
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_lv.tar.gz 1481862 BLAKE2B 831761f33ffb6a9ab019eb120989391ce3707365506c0c957935759098e7c099d088a0390775b4a4c35eb5da0617e2cfed52c475308ac3931964f2be51cd9268 SHA512 584189e08c7823eaff8fb49ff461d06c1667fa256d93e3352ccaf74499e248f9436dc81e98879ac5859d8336a05e40aca09a006f7d92b5bddc7e2a926773d78b
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mai.tar.gz 336164 BLAKE2B 4bd3cae54e4f2d90815118d5beaa8ef4a8f8cdbfe99cdd53b1b8c87d7aaca0efaccf723205d52239c35e084c58ee65b007695eab4f01155b74fcb0baf33d1498 SHA512 ffebbd13a6b0b8d5f9c4798a1148b3a2ac766897540e83d63edf496c0eda0ca97f91679bf5ed5148945ba4da03d7a853b3c1cf07b4962511cfdb44e9f52bddbb
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mk.tar.gz 389657 BLAKE2B 28bd21117eee52d08982c2eacee517ff5de2ea3b6aa38c7504e38af7675c037154f8eb874c092c923b7c891807b61b0420ee27b3f5c4f4c6612ab421607a7109 SHA512 e4e98f4dd3daeb73f8c7150f51c34649c7f35d6d2427febf97281418dac002c2b427f0f19233d4f6492cf78e13dc364e5e6209a7749078223f28b9fcba03c8f4
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ml.tar.gz 556543 BLAKE2B c1f3e38c9e0f510ad05ce46ba466816efc19db6f9f9d0e5fc906e1bd57742befb928b5c4ea99cd971e6cdb8a41ab687dc43c7cf2846a34c47a439835075df395 SHA512 73750a859174cb54196ac181eb2bb813385b351fd7c7b7502456e4c6013b3734ca064721420a580d164e6778b59bcbaeed8f921f3ce00a247298a9d8dbc3a2ab
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mn.tar.gz 519048 BLAKE2B 7dcb48727c5567d7c983c06d80c1649bd4f25aabbb729d9655e430aef2db825ee2112b9fc57a1ad712d0ccaeea4cde6c25c107c103fca16b3b64ba0b1e74f7a6 SHA512 53f83665ba9d6c18739ca0a7e59247e08cf7d85e0d2ed2a590c048dd4701a066075b423d0538448c4dac2613ac23401679aab5f59cd8920900ebbd78efcd2da3
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mni.tar.gz 410206 BLAKE2B d06b0df9a86b8bafa96eba2b5f8ff02375150a66978f95dfb6976c648b053600140ed1e476369d16319dc67b098aa38e6e9870156261fe45bab4dcb74a6ea355 SHA512 b31b742e3806a520577d489598faee3ab7b84f80f71a4306062de52edc59aeec9da247c913b796dcdcea0342355bc367c0d7c9d530066c16087552f3cc94de4c
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mr.tar.gz 590611 BLAKE2B fe5d730fcf4a7baf1b5481f03a231f270893b3eb3c47e34079f6c29264a035a90612e5f4a1b2d30bc3477e590f56cb347151a1a52afdd019ae73b4750f04869c SHA512 4afeca97d699f67218fd31f981ae5bc6ddf15bcc69bf74c3e19f5ae3c8ec63e4dcc01737fbf3b5cb87ac5af9671ba3bb7c7d7ce0959a1c9b1476deff03756b64
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_my.tar.gz 473237 BLAKE2B bf8dd0a3b67644f2dfea90cc0f6d8da29d028edd128af8ec38455147e9f594fed45d89990b78a7852ce549c1cae5b5699342bd3a2f0609bff1f3c1ebf818a3da SHA512 63faac43b9fff5fbe8189fbd348bd97c9fa41266e3ea08b1234449cf2416ffeaff1fa2fa9f811ddde11c37742a64c5b2ee26ba167f9bd10218e64902a43f51ac
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nb.tar.gz 3713018 BLAKE2B 21bf4cc172eb7ac758878ea8123dc754146b74e8c9d3192d9752e9460e6d4e6b77aa9aa07ff9418cb7c9a0212d8ee069b791ee91cef6f31cd02b2c3aa5a50bba SHA512 3121511d2fd55849a8d7bfa4698791d77e23d93f232789e121377be642325246cc26061930db5903a13e32e69395cb470d206ab2bf7366219cb710bc2439f6f5
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ne.tar.gz 857865 BLAKE2B d75822762cb46dc515231edfe7f366750756401ca838ed3d9985eeb1e1e7b3189cf0c068d384923fa07c3ba33d1b36cd2111aa66bd20add72fe08ff4b841e399 SHA512 b2e2223c21211fddf2f86cf2e1a3bd6a694b728309866fa36f609a142cc0055809c84c4f825c7bb65bb128c0075ac4488d83519bb2b4b0c3c89ed2f7ccd6bcf3
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nl.tar.gz 1513272 BLAKE2B f57d1e3ee62e580d9b1a65e5c23707465be5c985a7947c8a35d8869d28a64224716af9e40fa8ee3cc1e7d73df817058967192cc68b1f6c19040e0a7ad6589184 SHA512 2c7e2cbd90a5b027054f4a481e94b3f257f256969aece0e49cf612755cd28b6de5120ba1bfd50b073060666ea3fe251e3f38a206223fdf5b8e645a411e1a6b7c
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nn.tar.gz 3713350 BLAKE2B f37f03a14206efb4967d264bc455a50c8133fd19a965ab1b3e5571a2fde18166f2e740f521d18d788e023b09e72443d2579b5dd4a302d5cb166d535ad9325216 SHA512 2ee041a05f97aa395c9ff70714717808ecfe59986e19ecc2f4d8e2f2113d597549c9f1ae9e78b758deeb22efff8ab7442d4ff548e94d1e3f7fd8704bc2fad72e
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nr.tar.gz 282613 BLAKE2B efc9ea585647d7333a1340f8a58c0674f29dc5feab4dffba52ae6353735eaf1e4e258957a71e2db2115c3d9c91b89a264985311a4cb2ec935b074d29f64df093 SHA512 5933d4635a8de87486098617124bb3f3e1d51760c58eacf1c283ba992b55b814457c90bd31f489425be2fabc89bbedf25a600b9f0a95b571203dded2dad0812d
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nso.tar.gz 328275 BLAKE2B f0f7fe1639e62738326103c858d2c5f472f49828e4263fd4b374f386b45556377f7b6b1e9bbd95177976d386313cd3026200b16f820518cf7f0502c60a00ffda SHA512 aa918caf1bde47c8dd9870058c2f62b2d9b14fddd72521a004c05d8126ee33dbfd4af31f29973cbdb1c8c31e7ca77a0886213623ecd22f7000902f427beacaf5
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_oc.tar.gz 885122 BLAKE2B 35ca5a5d5fe4a36f758eb9e3397dcec45e7be5db0abf29f638fb0adab92ccb30510a772413056c858ba4fd1086bb6e85477870d3f69b522af9b169923eaeb8e7 SHA512 f56fcbc144b0cdddcc5352c412b902744cfc1583ee8ff22f1d069aaca2183920a17b7eaf74e752c0d7ad3d8ffa63dfd9087c444e230c077df302c629aa0830e0
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_om.tar.gz 376693 BLAKE2B 23c944893d53e7bf02be7673b333355b24f6d8f1ed6c90ad18ccdd86f55d62b0507a8674cf0b0c1351f203b30f87ccb10b224332a7f58c15401ae0ef5debcbf4 SHA512 35e4f566292b6b3e4bd039829c102a5c2cf97945904348427c46c57199cf8c3434b6c5c25bd3361bbd7a853177f22f052717fbd97e5bb37703b40a5d36bfa3e7
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_or.tar.gz 613122 BLAKE2B a5b8c9befc583948256ec485ab0282821bf610f3d9627c39ef255a1ec0f8f5a695580ce7be389fbbabb864a09daf5f6523fb8b6c922d137a80425d0908f3c0fc SHA512 66cc42eff7074199ce12a0930626ae3fb5de88321ebd4d14601cb8305e74c061ff658a65153878adc20083e4a879d97568d8c1fe66ce5088c0400539cb6f1e30
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 481606 BLAKE2B 8486fcab7819fb98ab0371898581ac6f3eeebe0b8a4a492de458b2f934e7e9c4e9530d157f7142504d84f383676d8fa2a5215930f1a42dad3a698acd2147dced SHA512 1373ee87b67a58d793c7385b72e55fff52d29571765fef276e4ed1f09426cd588f5fc5d3cb4f96e1e800f1cfb68444a819e472e8a42f30b36b33a742bb1662bc
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_pl.tar.gz 3040441 BLAKE2B 46db391e8c015a3c2bc10431cde805151d7d0a2445383adcaf54e131295410425ad9175aa053726d174b27741e5230d7a4eb07f2419fe2c43f87fc7fe0e1861f SHA512 b0d7a9055c9051996c7040467ff342765a27b488cd732af863554e120dc2c0995c084ee827d16a765f4ba61f3cc0fb486415584229ca21b1aaedbc41f5baafcb
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2804025 BLAKE2B c430cdc479ccb0f339ae15afda47a2548f19f21f5bdeeef11ca327bcb066d628bd94e431668c4dd4e4f36378d088264c2555142d9599844ebb8fcc99ecdabc21 SHA512 a23b3b15bbce371cf8f058b45f5d0423545d435e0045e5141c7693d42b586e881b42286bba85f4a805e9ff0ac1bf31b624cc0551de7fa1fb9f45b93784fbb757
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_pt.tar.gz 2359522 BLAKE2B 83b30ada0173b0a8f8f979940c37fcd56f24423b19ab63c860167cf516f9004297c7ef9fc023727d4348211977c7aeed980a04d0310e5a48cb4ee46d06447db8 SHA512 3ee8b5ab3476d9e75faa0d77a3c9baba7429585ef1e70d49538f967595ca9023d1761a9b22b28f649428764c1bcae6ac1869cf2afe05150a87e6b78c6dbc1a94
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ro.tar.gz 2545777 BLAKE2B 9b26819cd76323ea1807ced3ebabce092a33220e30610cb091c3b472645842034a277bdea5ba77c96342729132e93630e4965a1b307f9b16e507fa6279192a9c SHA512 b709c3a557a117de828869be1403ec8ee9b4cbe35aa127d2a9ac54f84445d84a50ec4d3c38ac3f1b1960e31088d8263cc5279cb9492df890b60765749c5d5012
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ru.tar.gz 1886636 BLAKE2B 4022ab5cb66a61cf81f18c435b486001309c9d65d231f76f6e159e3adbecf56248f5b82d6af35a2d2c270fd2922b6a8bfb80d76acbe568bdb3d4cf530c85652e SHA512 483068996260aa2354b70d8054d8ab9216c651c9c753065168992c94317c3f3c9008f98a1e2345afaab2ee610ec4d1ce6f57aa5b6e8c6132d05c2ce439fd08be
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_rw.tar.gz 349080 BLAKE2B b0b9bb54a2ee965d47c62b685efaf4083004d0e5f55b8d15b1c47c3adfece18cfd95f7b01666dd584e2b2ae101bc6c77b9f31ee00183fdd07710d7c26cc7d912 SHA512 edad49f3f6c29fb7718672a5ed58cc53dac410b043ea1fc9fceda9806a3aeb61cceb095fd8ba77656aff4b8f2ac75777ca975e4f378d7aebe5fb123c96a373cf
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 459218 BLAKE2B 4ff29a0a9be71e8241eb67baa272305291b58ed284e7f7aecd611f1f3422353c7b2b7418201a2a166fe5003de7d5f64779e0bff2134298d6fbab11a084c2b0f3 SHA512 452b6fee3ddf43ba0c74a9e762907dc892ef7198d340f72006981633ca2276ca3578a6923500eb0f88ed04b8272aae21aef0f031fb3c0bf496c18d21201a6fef
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sat.tar.gz 533990 BLAKE2B e8ba8c7c9a109f09dae36ea5633c2990940ef7229100c324a4df641d046e9e418e493fdbd0959065d9ea8bab03f92df328663534a63f9dd4dbde03c776f0a082 SHA512 2943f1d1b1a9675a901268acd127d035dbec51edb4643c4748e366c7f72e97a54bfad6af19a28bf5dcea7610d6a1efb200e1e49e9ec6bf83f748c693a416c75b
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sd.tar.gz 444815 BLAKE2B 791255f8067a44f1fc4ebeb617bfd567aa5b782bbca13e5a99fb5aca3fdc2acf4ea3dfc7fc25c86505ac22f46f08189c161cef93f6ce6e9c4d228df248626aa4 SHA512 cf221c61291b0a4c5b193b9c60f8d6003ca273e5d6400113793889c69b3768bbaef18fc7cd4df25f41aab3fbd0a529a9277c148caa9bccb77e732b73e622f53d
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_si.tar.gz 747183 BLAKE2B 80c2a17daf90fd6b364fe06cd1c62a6485e63016a9a718b750475163eb82d925da14b499d12768e49c4dd5dba0fd526acc93b923f4481b103344f6363e68136c SHA512 03c354522aebafc6a63b1f0ecf12f3849da61369712bd5eab9e3ebd04a0c2cfa3792228457ce3f0632d7f54e52a3fc21ad141a2826dac3cfa172fc7d90026c69
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sid.tar.gz 460873 BLAKE2B 83fb02905ef52cce1f94e886ddd33f470e7189a249b7e395f39b8e4fd6871fa411b2a67eb7ce769c105ea105358aad31da688764f753926ad65daecb7056e7ba SHA512 3f4b38e970df0dc02ef955a60f1cdf49453e0ac2ed71c30eaa58fa911c0229c6462921f2d2cc3cb8868775754191b4482afcc4c7b0a52adaac1adad53951ea12
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sk.tar.gz 2005943 BLAKE2B 266a3cebe74ea69d9b918a72fef4731924933e8816437bebb2b90cf40998bdf80210afbc6f1214c0678c13876615d897a832d042a5441d04b992e7b2e5e8678f SHA512 656f2c43fa391a9ff164d46a72c378066f7d39867e410d4e0ba1035ff30f38a53a541fdf110d47d05c5d26151f664d43eaf1bc0ed370afda541deeeb71018e94
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sl.tar.gz 2405816 BLAKE2B aea5564f0c7f7e4fc0d195860c921d8625150f1ca577eb26eba20d82c0cf16641de148ffc3b0c38c73b028dad738d2f07a32dacf1e942332607860d3665966d2 SHA512 da8cae6be79a4b1dd6b60085fa326f076d35f29a23baa3b63364f8a0cb79f1774dc80e2b924f145027250d6cb777a2d33480b712a645f7f8951d72566dfe0f33
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sq.tar.gz 1171464 BLAKE2B 043c8afda20e4a7ad86a6e86083c5f8e1009ee69e8d57f3c8a23dc589aafd92b6c044277ad54b91218b8ef2fc2491f3b7afca62a0bd50b5314328d8d0a1030c2 SHA512 85b5b6a20fce9559923de1589c95d30ee43de69cc08eacd28e8bbef31ba143b490ad0f033cafdb817a103eef2e8641d1e49341e7798007c5c1ba33814caee366
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1461723 BLAKE2B 7e31cc08802d902f3d29f959f548d8dc7f9f502b297a855e10eb8dd8bb2b60c786b8b254f706c169d9a9e7083a5e72999c8abbfd2e0450ecdf2dd73443dcccc2 SHA512 157754fad9ab7dfb3fbef64d0dddd27f5447e7c5a3d9a85a24ea2d16b07d10cf3aa94ca9ed3be6c28b8d0b468d3cb846232d60ada1dbba992d6204798a4388dd
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sr.tar.gz 1480773 BLAKE2B ad5c4e53a8c9a4bc3e4fad5a6ea4a142e379be7e14f0d9e7381e93b8668c9c752a20d193d43335b4286871c9d4331577739be355867c816611f912346c3c9054 SHA512 5c6fae5dc6965ac38d3baa87497e57d5b770c8d5710e45c89d25eab65b63d336fc3bf40769931aa0aea89856f4197029352f7019becc85745697e9fbffce8b7c
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ss.tar.gz 291015 BLAKE2B a93ef58beaa8924593d1f24f327928034604369e4dc936ec2886c4eb0c3ce3118356050eb9360ac97133e83b6ec8ca9bd4b2668cf3f59458986003119938396f SHA512 e13db8bad27d90d7bc4f6707c2f7898febfa68cebc201e54670df664e580cc704155f84f4a6b87d18cc1cfd1e33e37ea7b2bd073abf05f4c1ee7c46ff59c693f
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_st.tar.gz 283751 BLAKE2B 76b92446e0c1cf5d73ae11d62fd97e2eed1414d11a29c47ea407d6b953847794db823b24672fb961b1831cd825171aa19c8c16e1acee107f0612b65a96b08eb7 SHA512 6ff0f6e4e748c169f1763d23784595f3b0e405bf17e036275dc710c7ceaf6fa3858dd53d4275f6a2a2b5cf7b46423049edf43d16ace5e428ec196b60da578f7c
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sv.tar.gz 2553259 BLAKE2B 21a6d5062817f95771377d0802be452bf54b1b7f61866a3aa9b93eb87429dfebe2ecb7fbf4a17c8c68be4ef89cf9f8004da4f3d82c38d950034ffa0cf9ca93e6 SHA512 bf19c335794f5b2bc2425dc32ed3e53dafbbc57c150d124b8d94f5fb20c7a6f2b1aadf6259cfc014af0cf7b0d8fc18a8fa4c0db641e93e0f747c3ae0ab53d6d9
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 323431 BLAKE2B c19bce0c236de22d8b2ada366075df8409a6a1c728be0dceba9d86b7cc0a728125760ef3fdc934eff63f66c99a98b15eebdbd37a76f85635d3661d8197bc1e7e SHA512 63f6f95d3e18dd5908c1739e88e12bce18279770aca086d50f997c60f5faad96a8a1cb064245601e19589c26b96d3469232aa37f86bccb235e71af83df764ba4
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ta.tar.gz 697701 BLAKE2B 0852b4f612753bb5e364bc82b32f8cdcf98cc95ea219e798fee451a592c3e5833db10d7c56a32ff83e02816760fd049f137f3a75068254fbbcdf6687bff3882a SHA512 b5d3cc2e5d3cc254d192c123edb152c9a808f9d167f0949c87fc6b023de4f573791c4928f9ed9359486eae31c78abebef6b2a829671a7451c63a7081854b88b2
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_te.tar.gz 1099328 BLAKE2B 024e3ec76c8afe458d47b492f5f100b46e557bb6fb75f340e8840d8fff0e25c7891e87f0e1b57f709f851bbc26e9d38584ad85bedaa3cb7bcb53b8fe62dd36b5 SHA512 d4a066dbac4180060fa801d1c4b4641e5ac14ee93cb2335d81be955fd8fc8facf6f0cdfa558efe8bd07c247da0725a15ffa8504bfd759001868103d06feccb06
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_tg.tar.gz 362705 BLAKE2B 2a55b23712928ab3724b0069501aabccf9a9e6e6a685a33fcb4b7ddf07101906fe98356d04ba76d5fa63a4309525ef111c046b136b4b24629e7cf947af2cb43b SHA512 a33366bf37491ab19a1d32a9ffa3870f1907b003e738706030e18dfe20b5af94265222855f86a01a27d436cc79b07b57e15a3587aca83f5538cf6543e5a15399
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_th.tar.gz 631827 BLAKE2B ba2112edcc89ace178638ab2b5500d0a82167842a4f15e6690120f1d5f60efcfd87386e0f1011ca61c6a7531663c857f669e2c3424b1c4ac3b30de0fedb2df41 SHA512 d0c9d9ed2a8c9cfdc9785501ed69e9df5a7c09d4fd5c75016e752e24a758e0d39c81f6c76b299d85cd6eeafdb0bc6188d7afd715ec06c12e200cb2845f63e4b7
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_tn.tar.gz 264007 BLAKE2B 76dcd68288a6558b764f2f650aeba16cb6e3f244cc5e4a2857ac631ddad0f7b4c77144a77f09c7bc6a3db835bbae15bc9da6f243b3193e3c883ff9a552eea8a4 SHA512 2957a20c0dbcb9494d84ee8d68f85a7247709b089ef0735d3a6f70e534201942d5ab5031d4163143e9e0fb16177b1388915f622eef22ddbf85d634d2a05bee64
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_tr.tar.gz 763753 BLAKE2B ba936f1ae84fa34d455e89bda4bfb94992e56e40d7035b067b4479fc8463ec21498df805d075550985762da9e64b1c5800f2444b6b2d5f1ceede8c79a488f22e SHA512 9f6868fdff84af935ce9988f7c4c0385bcd045b61afb3550d084fc988aeaba39e43409b82545ba296eee3ddd24fe8266e5dc182eb737e9f401aeea0ff5c8af07
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ts.tar.gz 283126 BLAKE2B 69250952e32c8322a8a217169e8fb7c79e9e7da9188bca7718d84fd2de647d211b1a3657bed8a356d5ee3b8d3c07af701d8710f341bc203c580739ef3ced0e3f SHA512 dd9dde6f8755268688f759bb634e76b3e4e6a33e5119188b9f49e8b27a45964001da28b856cad1241fd5c3866173def742ac6af37f5a71f5e75c14202a969df3
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_tt.tar.gz 185676 BLAKE2B f7dc2d029d2cdf155fdc1740aa04d9b152404d0e0071f4de75f0914093023b5352fd69dd6dc6b92446f637d42f4bf3fadb09e549736424e80288051d06bbb303 SHA512 f81e839a2e6f06e88ae1aab6c5d9a04830a3cb15e400666a04ae088c3b6e6a7ead95b4a6f70265e445fe0cc2007aa84af56d037058bd8ea2df7f92a79530a871
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ug.tar.gz 557731 BLAKE2B 9514c0fbafbe862d65e6b746a73d6fdcd8d14ccc37cb218fb81ccb4166888b7e39cd48a74f22fb8103f74795ae0fffcf832c8d821bd8d414a3f3d62a9fdb7fa1 SHA512 6bf882e6760fb122a4f113d433df9ab25dad21ad7e8ebfb89fca7593a33448d658e20904664097f3f6e368a090651c30df01e66453aa1da46dca172a99d67259
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_uk.tar.gz 1609184 BLAKE2B 519bf839a81cc340235bf08e9a661a66fa1992f4d4e3b621a3a31cd718601ee5d0fd4dd70ca08dbd4606b1ff70763ce902da00ae6e10c86608a28839521fed2b SHA512 288bffa0c9e62c0a78af4583efdd3900fb870d09557df67f902d4074a6f3452edf135a728809a695b0395341e52ccfe7820803a4841e9a843aa89944118eda88
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_uz.tar.gz 320450 BLAKE2B c11c411435cbb7cdb195de6432d812d9625f01040cb15d930c3f5e41cf9bafe9b6123432e8d0fa9160feda7b0fc7e118dd2e66675180daa013ddebd857aa4506 SHA512 64c008ed94b9d2e276a67b7e43e6b60601399aea7307571975d36113fe818b7d39929245b03865aff547b17ca8f50f627a1bd8ff11e9c0dc206df3f491dd4917
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ve.tar.gz 286618 BLAKE2B c4b50a6376ae937bcaabc48dfa4dde6b96660a3154b93746c6ce378af6bf11341a4b39802433d6508a09ce2146803a4586647abd2a49c52d0323c3a43a3fde53 SHA512 1361295cf3dbe67046241f7161a34e7fad067b90c89551ac9983bfe96646a66f30b49e4f6799acb6c4e8c82f65c12bc14ff6dff2bc6460453cb081fdb22144a1
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_vi.tar.gz 472790 BLAKE2B c031fddb3dc45885e9bd04b6b7090a64005c75fae8c96e9f972ae1a020b9b072dfa71c98f7a06ebd1da64a2e43148ff4dec73f69f7c0e38fdc90b1f5a9dcb9a7 SHA512 219214b8f017f53c998a02c1eeaa54023ddf18aad865c89a1529429b1d13678f5bbfe695df705d9485542a282a939d5b73518bdb59409bab20d561eab9a7685d
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_xh.tar.gz 294871 BLAKE2B 50f7a02c13fe7328daed946350b3b199d200e6a3db61e23bcd36f077fe4849c9b71a2b24a832b52c16e058a754f922ba7139b26dd77a6ba5e96faec73f0c45a3 SHA512 4a1ca4fce27928892b6537a8d5bd43b7cd1bf2aab373921fb7acb4ca37498db3181a445c7aaa7ebc23e1017b7015cd3d6ae19d7eb344652b9a33cc6d3bd64b28
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 798834 BLAKE2B 17ed533c1a8b5f7e29f824f87ef0990bed87865c60d0a1ad6d4589cb7566a02b57deca3d2d9e7582d806a1dbf25769864b1963b96f299e865b83fba1b28cd4aa SHA512 7d1766cb7df8fa9c0a977135dd393f047867b10efc9f5cced0611fcf19a51b37829d8510ef344b5c943ccf9d40800ac865694123ef0dbaf8a384dff3777958c0
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 796762 BLAKE2B 347d7e14c472b79f2bd24d43f36432f9be54d3d0b279d7c341dda655064ffdcb05c8396171a855985086a48ab5dfbf2978fb738a51378261fd3db9d4e9038c8f SHA512 59a7ed0157e7591323f428a6c0e2f5e05be954a1eb1783047b718fb20e687c4e03c5f54922af1247d3e0fc3469fdc87085a08af33ee1cc17e37e4f8ff33ffd0f
+DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_zu.tar.gz 325449 BLAKE2B d8b454b6ce1378e13ec7d3197897be29d8b53d55d788f70d2d6700b0b5018fabd3ba63ab20157dda025e2ec4bcf8e06bafc6e31891491cd8898d5080c2802c0c SHA512 6b45ebbc3771eb5dfc9774bfc1703b8301720aae409a39bcbc0e65d34c53f7841f740254b4d5c92ec976e508c60b2e8761db50911c826fe7b16e4c67040c76bc
 EBUILD libreoffice-l10n-5.4.5.1.ebuild 3365 BLAKE2B ac42e9f05e88133d0adb56e0c8e7288ea1d79c19a2359c8afa51620615f49d0921337242903ca134a8760030ed5a3c7a2171561dbcd6e7b3f04e58951825c165 SHA512 e7c0f037d6e9ffaa42d286fbebefdffe0f21d3f6937bb7d2b55cef9ef7e4c2557dc4b6f30bf9411740f3fabf4063b7b1dd5714148c5f2698419247448f2d95ea
 EBUILD libreoffice-l10n-6.0.3.2.ebuild 3367 BLAKE2B 6182f0d27145926bbac711586b7fe3eb6dfa41b4d4b9b0176ae983643db76f35911b43e286e7ec23fee5cfc20a9e6d93297b8dc3fd9789386074d579c19e6082 SHA512 99f77f3898305c0c9526bc983c1321093d9ca81aa261fbf9b8ae703eba2d625f367aad8987d2d5cc077da7468c1e77b15e8fd8b71b5b8e398b985cbd13821b78
+EBUILD libreoffice-l10n-6.0.4.2.ebuild 3325 BLAKE2B 9300825c46c619c23d03948033f247792337133829a2c335b62bae0e804e9e9c849b9906a3bacb9f0aa1a448615e8c105bda398d41791f343df8982864416992 SHA512 feed2226ac09e367fd5a97353ae70b4ff0fc0b1d318f9d2cd462ccd90ceb03d29025c5f746381c9c2cf68dd23cd28ea244eee82a497bdc5de71bf048bf06f6aa
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.0.4.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.0.4.2.ebuild
new file mode 100644
index 000000000000..0a893cd1d293
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.0.4.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm eapi7-ver
+
+MY_PV=$(ver_cut 1-3)
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="https://www.libreoffice.org"
+BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
+BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
+	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	if [[ ${lang%:*} != en ]]; then
+		langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
+		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
+	fi
+	IUSE+=" l10n_${lang%:*}"
+done
+unset lang helppack langpack
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled
+		use l10n_${lang%:*} || continue
+
+		dir=${lang#*:}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang%:*} != en ]]; then
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
+	# Condition required for people that do not install anything eg no l10n
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in the l10n for some weird reason
+	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 548d97d5ecad..b061852e274d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -14,11 +14,14 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
 DIST libreoffice-5.4.5.1.tar.xz 193846832 BLAKE2B 50e9afb84d6e1901c3a6c99d1a4d3e274894d001afce71a0ced6a3ba0682995adf75e21eed40cfbc6d159581bf152273fad85615030fee33ba63dbf1ca15148d SHA512 70ef595aab3ddc81a000c18f2f783e5a87d98326fd3b69923c43e94e832a7f4d89f0d7444073d9ec48590e9a90b9fcd049ba0c85d17ac7921cd022cb2d0bebd5
 DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
 DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
+DIST libreoffice-6.0.4.2.tar.xz 204556512 BLAKE2B 2131fb0f810c81803f9905bc1f3f9bfa04615deceb8eb443644a35d6b4226f6876ffdbb8ef00c9ffe8e5a677877513b3c2adb40b3f87ddcdb46946c5bf3d6183 SHA512 004cef88c1a6d908a519b8813562d4dd623c899608026aa603dd86012a3d0b9a5d776c05e0e2d7541c691f4a9fc6c4d62c278fe88627872a1c6f841bddc2736e
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
 DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
+DIST libreoffice-help-6.0.4.2.tar.xz 2972636 BLAKE2B 0528ad30fc754269a94a4b2a0c9eab26ecb707b1e9a230686a982a24215fbc91016813fecef687499ee4cfb49228febbfbaaaff7371053d130adefd705a1bb49 SHA512 ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651
 EBUILD libreoffice-5.4.5.1.ebuild 17387 BLAKE2B 49447d04e804bb922dc23a0480c23b042feb8047ff8c3fd18ae1301e1eabf6776a9cd25718c8df8219ee2572cb6436900b7900edc59f5c945fab72e00f891102 SHA512 c5acb6351eb47e3c34dccc98c86f3eb146787a03aaf23aa195ad818719b102a26747b0de1e406845e134b27012830e8eed8abcf275e77d825225f828c67be248
 EBUILD libreoffice-6.0.3.2.ebuild 16731 BLAKE2B c48eba2a33c9ef9badd692c40b3bdfaa72f8f14f02c4d65c960a21db1bd054df50c2d0fa3dcfb8496b675a5bc73476f55c90ef2d6ccfd0c2f6fb8b0970043f2d SHA512 01b3403c57518a92f1bdf9bf97130d310de2c1d5db9560f2372d20a7d06add0e2e0a4d8556642bdff7d74033e72fdae27ec37427ef25e81d8bc11ed70a5762a6
+EBUILD libreoffice-6.0.4.2.ebuild 16671 BLAKE2B a1754528bc47efb263348c840335556661e8d558eaa20a4712e8b11740a8b3f98dba8a6c6c0fd4e6287b1906ec1469716bd287331b258b942faebfe2728a69aa SHA512 9dbcc4b34d94dcb80dda4d0e8dd15f39481447a92e0d99331cd09449a2d9be9847e206079a5b52df0d7266aeb12918171d638853bddcdc7fe3b30d57dae1f0fb
 EBUILD libreoffice-6.0.9999.ebuild 16671 BLAKE2B a1754528bc47efb263348c840335556661e8d558eaa20a4712e8b11740a8b3f98dba8a6c6c0fd4e6287b1906ec1469716bd287331b258b942faebfe2728a69aa SHA512 9dbcc4b34d94dcb80dda4d0e8dd15f39481447a92e0d99331cd09449a2d9be9847e206079a5b52df0d7266aeb12918171d638853bddcdc7fe3b30d57dae1f0fb
 EBUILD libreoffice-9999.ebuild 16557 BLAKE2B f49927c376a1f325256ddefbd4bb7b7da135efa392bec073844470d5b7e1086fc31019786d740c2ed22ea97a26e5e5fef1cb2bec67f254a50d1a6b2950492a4d SHA512 518ce3280a8cd83a91488542083afab86f91d15c8ff384b22b7f4401ca21c111902ec7e85208d2edd1d33b7a45dd9d24424f543c90bbf0c7b2653b3644b85539
 MISC metadata.xml 1443 BLAKE2B cbf2c4306fdcde291bcb0692af7dc9f43f1eaf05fe93d6faffbc85833dc4d5ae653cc299a9bdb55dfb335c8aff316893a72ac48488fb372f667f81212648fe75 SHA512 df37d47b0f2f9f9c229b0d558d69fcda897a54b8ef1584d9940a7817885d52aa6b17b1879cf3103a9129fcac0611b4fe49213876bd2e446c70e57735a144b323
diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
new file mode 100644
index 000000000000..c29d9ffa33db
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -0,0 +1,569 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
+gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	kde? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	dev-lang/perl
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	>=dev-libs/liborcus-0.13.3
+	dev-libs/librevenge
+	dev-libs/nspr
+	dev-libs/nss
+	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+	libressl? ( dev-libs/libressl )
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.24[nss]
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	net-libs/neon
+	net-misc/curl
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( dev-libs/dbus-glib )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+	)
+	gtk2? (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.24:2
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtwidgets:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( dev-db/mysql-connector-c++ )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	media-fonts/libertine
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.6 )
+	kde? ( kde-frameworks/breeze-icons:* )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	!<sys-devel/make-3.82
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-1.2.3:1=
+	media-libs/glm
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.6
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? (
+		dev-util/cppunit
+		media-fonts/dejavu
+	)
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+
+	# TODO: upstream
+	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+
+	# gtk3-kde5 vcl plugin backported from master
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+}
+
+pkg_pretend() {
+	use java || \
+		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+	fi
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		_check_reqs
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		_check_reqs
+		check-reqs_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	default
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+	# Note: these are for Gentoo use ONLY. For your own distribution, please get
+	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use kde; then
+		export QT_SELECT=5 # bug 639620 needs proper fix though
+		export QT5DIR="$(qt5_get_bindir)/../"
+		export MOC5="$(qt5_get_bindir)/moc"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-ccache
+		--disable-dependency-tracking
+		--disable-epm
+		--disable-fetch-external
+		--disable-gstreamer-0-10
+		--disable-online-update
+		--disable-pdfium
+		--disable-report-builder
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+		--with-build-version="Gentoo official package"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-ucpp
+		--with-vendor="Gentoo Foundation"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--without-help
+		--with-helppack-integration
+		--with-system-gpgmepp
+		--without-system-sane
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk gtk3)
+		$(use_enable gtk2 gtk)
+		$(use_enable kde gtk3-kde5)
+		$(use_enable kde qt5)
+		$(use_enable mysql ext-mariadb-connector)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_enable vlc)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with mysql system-mysql-cppconn)
+		$(use_with odk doxygen)
+	)
+
+	if use eds || use gtk; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		)
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=helpcontent2/source/media/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# bug 593514
+	if use gtk; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 05cece9cc29c..0280291133df 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -4,9 +4,7 @@ AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27
 AUX scribus-1.5.3-poppler-0.58.patch 17057 BLAKE2B 87a0e55baa398ed412b48cb5c4d3c8c2dd8f15f40da5a20f9d09a652191c77dc103640357dc5928fbfeae90031762e288221c13115da97a7d307b676f697510d SHA512 e9ad65c1c20ca6efd204829bec141336d250c073ebed08f74f07c416213bf46204826abc410510f7a72df21a00a43f7e1793847107612981dedbe96a5927956d
 AUX scribus-1.5.3-qt-5.11.patch 2165 BLAKE2B 57d76b3eda506465442a4fffcf268f1db559a341273350825d5d7e67610f5873501e16c3c1c7a27312250d4fcde920131ca2671fb349833756aa4ba372277c29 SHA512 5cbb775ab034ecf3a26a3181fdf9985418af555cfec42fc67fe314a0cf8b3ddcc01fdbded81591c7a309dc7a47611ea0126bf2d86c39fb4825d6766f0a1fff46
 AUX scribus-1.5.3-x86-fpic.patch 759 BLAKE2B 0abaed6521042c9398ea12075ffe88f3ec47b2f020a7040beb7312dfbb298e733b380935d5676102df7b04512f866bea2fb67fc9135cc741db208ad4b451176a SHA512 8b843098e31be3ad07ed82225a6b9bb7e46ae29b369508cdea6f092142d27071908c510ccbfe11b778d970e0b3a5bf14277e0124c781ba0f8bc230716a9c03e0
-AUX scribus-9999-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
-AUX scribus-9999-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
 DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
 EBUILD scribus-1.5.3-r1.ebuild 7057 BLAKE2B 3fb1fa669b1742ff4426032e0c0caddcd3c7f2f3653acfe41c9cac88d46bddd85051d688d25a52f82f5f77cba0637ea64e90be89c0424d8355d9b439650f08af SHA512 0040419091f78c69532d82d86a45f0d43fd66d1a72d495382e2c30f1358404f7faa5a9e8df14344f7cfba297afd2cd78e48ee7c3f3cc846d3ac345c28ae828c5
-EBUILD scribus-9999.ebuild 6905 BLAKE2B b0d53f60e39fd23d041faa595dc8a26c5404fd4920c0f084d0805854b9d3b46ab01a7b4799098c8d9ff9004206b9b5837f2c14d46ca98d2297fdc907a1fba971 SHA512 c8c651d3375c4f5c3090cd5a202b6ca8c19e9c978245ba7275f6db374aa6336c71d4aa0e7d7c2a9dad7865bd5de54bf895d06c75619d67272e068d04ae37932a
+EBUILD scribus-9999.ebuild 6919 BLAKE2B 001f1dd93db566b3403db7066cb3f1e9067449f39af08335d54cbf5880a265f1b51f33fd5036b42851d1420cd375c0a08e97b15a29e6d49f3556ea65ecef7cc3 SHA512 92bbd75dd620a61f03373b969e38d939a32ddddc9f4db39213c0b52c8edc5897d594fb1e5a9b62060abbe79ff70f5845b150efbc7738b2f2ea93b6ab73cda008
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/files/scribus-9999-docdir.patch b/app-office/scribus/files/scribus-9999-docdir.patch
deleted file mode 100644
index d866922fa18a..000000000000
--- a/app-office/scribus/files/scribus-9999-docdir.patch
+++ /dev/null
@@ -1,42 +0,0 @@
- CMakeLists.txt | 28 +++++++++++++++-------------
- 1 file changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 29d66f3..1c08cdd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,19 +244,21 @@ else()
- endif()
- 
- #SHARE - use the default on Apple as TAG_VERSION is empty
--if(WIN32 OR OS2)
--	set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
--else()
--	if(TAG_VERSION OR BUILD_OSX_BUNDLE)
--		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
--	else()
--		if(NOT WANT_VERSIONING)
--			set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
--		else()
--			set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
--		endif()
--	endif()
--endif()
-+if(NOT DOCDIR)
-+	if(WIN32 OR OS2)
-+		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
-+	else()
-+		if(TAG_VERSION OR BUILD_OSX_BUNDLE)
-+			set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-+		else()
-+			if(NOT WANT_VERSIONING)
-+				set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
-+			else()
-+				set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
-+			endif()
-+		endif()
-+	endif()
-+endif()
- if(NOT IS_ABSOLUTE ${DOCDIR})
- 	add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
- else()
diff --git a/app-office/scribus/files/scribus-9999-fpic.patch b/app-office/scribus/files/scribus-9999-fpic.patch
deleted file mode 100644
index ba0721955ef8..000000000000
--- a/app-office/scribus/files/scribus-9999-fpic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- scribus/third_party/prc/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt
-index 5f7c2c6..1da7177 100644
---- a/scribus/third_party/prc/CMakeLists.txt
-+++ b/scribus/third_party/prc/CMakeLists.txt
-@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
- ${FREETYPE_INCLUDE_DIRS}
- )
- 
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-+
- set(SCRIBUS_PRC_LIB_SOURCES
-     oPRCFile.cc
-     PRCbitStream.cc
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index e0fb1c4035f2..742448b27386 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -94,8 +94,8 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-docdir.patch
-	"${FILESDIR}"/${P}-fpic.patch
+	"${FILESDIR}"/${PN}-1.5.3-docdir.patch
+	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
 )
 
 src_prepare() {
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index a9635651b461..bea6a2639732 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,4 +1,6 @@
 AUX skrooge-2.12.0-qt-5.11.patch 1280 BLAKE2B cae8b90183fefa70f062355184f40e8767d357e78e4eed1901a32dae3e1b444251c37917e69201e23873d91ccb47b19268b85906cf45f36b0414751770c0e2fd SHA512 625947c334c06ed9bfd0c7cf0a7a6b0ddcf491572532d9e73e529cd4a1ef2e53939b6570df9442817269db897dc2d3c5155d318e6738ddcd4787470a8ffc85ad
 DIST skrooge-2.12.0.tar.xz 20289828 BLAKE2B 999f100fffca3b8fff5e343b1137fc51e337428cdbd89f7e5eb72811e3e5e1522cc257e6be83aad57cf4ec66fefd061b685d94caaadcc27182f32da13d57014f SHA512 348262a7e86f6b3f9fa028fea324eeb73c96e03a77d16774ae9f4b554c1893aca7a002bcf3160d4055cfe8aaceeb76a364e71e7f605382cfe1a801eca1ca874f
+DIST skrooge-2.13.0.tar.xz 20432856 BLAKE2B 5e5ace28f0a3d0f60decb8bcb63fde3d9ed5dc79103ce8d2f4bad2be33b3e4896f19aac4954668bee194362b3b860f0e585e902ed54563b0a82ee36ab41263a7 SHA512 7c5543a4c26953c89a1a67b653bdf5fa7f4baa14d96e763d868f27b288a0f9d7d4bc2994436a4e749d4fd7db999c16b6fcee69817be0774c6e171e49d69e30ba
 EBUILD skrooge-2.12.0.ebuild 2411 BLAKE2B a8146472badf1889d4cbd6d1191e9308ab061e6ceaa70f37d2635a86fb4b300e70dc7bef507844eb1f1a6e8367177bd8c1371e418894445355d5250dd4934977 SHA512 cba8d0a3106bffe5a1a833838c89b20315c0c35ce843be20038f634a8d0b69b1ebb5699aac99e34abba74eff70640fcc7f4d95f3e8fab0f0d69b722aee81b5ff
+EBUILD skrooge-2.13.0.ebuild 2367 BLAKE2B e4045cba2290bad7f903e9ff81615f7f5f443a0c3dd42ec82a6e1e43e7e9ef421737fa06a799d76c63e1801ea2ce43cfb74fb5b1dc959ae6cf1cc96125ec2773 SHA512 9e2ceacaa2ae8e16864cf3fe4de6dea5d261ad24f42af0e6499b7f1be88afabc3c40ee178de0ff12eb8c70ac1d1d58d73d912d55ea785d2f4739dab35e1bce5c
 MISC metadata.xml 400 BLAKE2B b0f7a87e2c2fda05271f731d2c3a6d9a490cf94dd7a742ed60e21aa44964a50bad1218c6ebd9ad16d87a8814f34b70792f7d80bd1e03d80845bd9f1c9292a95c SHA512 50120cec8f5798f6b104c6e1fd05b831f2f280e2f3bab8aa66667a3da1bb351a955b671d16cf4e30b44b0738625424fe4a32bb8a677947d147031964e108dcb0
diff --git a/app-office/skrooge/skrooge-2.13.0.ebuild b/app-office/skrooge/skrooge-2.13.0.ebuild
new file mode 100644
index 000000000000..f5110fcfb096
--- /dev/null
+++ b/app-office/skrooge/skrooge-2.13.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
+HOMEPAGE="https://skrooge.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities designer kde ofx"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlcipher
+	dev-libs/grantlee:5
+	activities? ( $(add_frameworks_dep kactivities) )
+	kde? ( $(add_frameworks_dep krunner) )
+	ofx? ( dev-libs/libofx )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwindowsystem)
+	dev-libs/libxslt
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	designer? (
+		$(add_frameworks_dep kdesignerplugin)
+		$(add_qt_dep designer)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/skrooge:4
+"
+
+REQUIRED_USE="test? ( designer )"
+
+# hangs + installs files
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=$(usex test)
+		-DSKG_DESIGNER=$(usex designer)
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package kde KF5Runner)
+		$(cmake-utils_use_find_package ofx LibOfx)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=ON
+	)
+	kde5_src_test
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 7a31ac2a6f0b..3d9ab34f89b3 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index 5424584a729a..906b6b534ed7 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,13 +1,6 @@
-AUX elogviewer-0.6.2-missing_newline.patch 806 BLAKE2B 9d2cb63fd3007d274c6ae744558553fac2502fc36e5ff8c2e513545005e80a760cb8066cde678bf1c5c5a7884a38bace368f954027de41255870b09f3c7e01a1 SHA512 e2e335f679cfd8850c9797f1233464b44abc9939f48ab218aae94e072c597a10a1814411f7453d01ef39c79382d5904c48efa12b9eecb6282d3cb9fde3a54968
-DIST elogviewer-0.6.2.tar.gz 13904 BLAKE2B 9612fafd14e1561a1172fa45aa44a3dda19ccb74ce56b8dfa6f8e6cd2103c80a34e278a3ea788a26b64da0d8deeb6b2b7cfdeb73cbc1d791629ce40e7bbfc4bd SHA512 dccf4dffb87fefb7d9e0609b3312d63b73c1b9c5933819c38b775b049e222687e9da06e63fe8194560f4bb631fa586b4746af9e0a7575eefa782b57d9c1c6e04
-DIST elogviewer-2.1.tar.gz 14968 BLAKE2B 027ed77deafa3646c2d20e9f7f048d723178ccef84d07839c814e10ab9047ff997917cc5704d73a48a4b56da8f93bebb46c6701ca985c10c5240550e4dcf607c SHA512 27a34ce67e16a51055246b7169c11c248310b2a1d987018938094301b2602839e48909e3224f7d791343bb691de8e2f0ca7b00bd1477e2b3b43d61a24b4e688f
-DIST elogviewer-2.6.tar.gz 16093 BLAKE2B 9b8b22e6e2ae772d2051a528867b139d33557279ab8349270afd497031599cbec27313287cda4cfa48529973672e4dbd28e4e51f29b1922380ece30980ae3279 SHA512 1ca43c0ddc7dcab6a9e753644866b0a8ec8ddb5a56d2b8a25ab06f9ee1fc759910ef7af6257c3c98b886700121f078409931aada67b2aad03a43f440a0b8f233
 DIST elogviewer-2.7.tar.gz 19936 BLAKE2B 530c3324666089af93712a17f01cc9b6284b2639b4e768a41461da35d615ee1a75870a4138587d85d4eff4925945dee45dbc1af848b7fc500165c8e96d3c7d01 SHA512 81cf20e8e5509d83634d601f0920bd369e1974c843b600b54faa433dc9927a0df6c9820d2b1f35b241bcd86ea891945f16ec2b0d1b65d08c085a3b245c8b038d
-EBUILD elogviewer-0.6.2-r3.ebuild 1627 BLAKE2B bd5ff2629f94674607bbcded8840dbaf2cda744474460ec074dae2c5657534f6113da66bfb1af6f0d226c007d1698cb251e6f2021ecb58dec092ce7a5a0d88d1 SHA512 37f1e3c1251bbb2b7dd8e192bf8d64316836f88c77e1f890b42116bca24ea98d0a4f9768e345958a08f0f4e3742c716e6998cc71e261c4888974e1f07cae8e3d
-EBUILD elogviewer-2.1-r1.ebuild 1343 BLAKE2B 8e937c6a85a738a36971cdcce87ba5288f0d02e084b15be64137dd3706a558333da6e9153b19e505e7aa19baf1bede4bf70613da250f4f2548506ef1324bb37a SHA512 2db28fda43a17633e0bccc7a73c8e52d4083c7cbf6999308373d2495f67b3686ac14b5b1972c41764e503223891a26ad801dd0f212fc1cc4662f067445d0250e
-EBUILD elogviewer-2.1-r2.ebuild 1349 BLAKE2B b39d72b182768ddd0f2b1feb283af288227d4a8eb065628fa9497bb421d80b1a0ef92be47c1db840c04cb42367b3c95d426f303f1f4cb3c7f97552f553a6c8bd SHA512 bf1fbfd6b012dd6c0e1f9ea31b6356098219cfd15373bf4b4471b785fc67f40c13850cd1735119898b5ea60e23dee0f7e8f8db3ff3f93138012dfcd9bbb50583
-EBUILD elogviewer-2.6-r1.ebuild 1511 BLAKE2B 099a4423d6fd1ae1b9cc9b39cfc74c7121c4058a55753ce7671cf5f3d0120c6611e7ccfa510fc587d2a5aa04c584ed021400e33c7e6dff05ed2eb2ac2f99a0fc SHA512 5996ca563a74e8ec679c0e4ea87821d4b0bbbabeba6c32a51a8bc5b2c360e53dcbd419b2422a8852b628b8f720f9083476c2e8d4e4a2c34ddb060095630a96bf
-EBUILD elogviewer-2.6-r2.ebuild 1569 BLAKE2B e0bb5b2ca7bf6e04ff9adb6f611bbd4cebd6487c34803c6df2f3d85d2a61c694c0ac6b3907fb96bbe3d793490bc3d1e50f4fd1af3147f433755f421b279540b8 SHA512 9a05aad3e028ed993283c0bb9dbef9b517f0f7b58d4c85b955404b75253677b916d91b8a28a3c8b566f153c680d0f72ccb72daa101fe9c29681a6d5b7adbad5a
-EBUILD elogviewer-2.6.ebuild 1457 BLAKE2B a70315579271f03b824747f6a2590cdbe113bae593910e215a1cb9750ee9ac9ee01bb43ff96fe22345fa7a9b2e66e741c3ea5b5dd5edf7b335d70dfb4ac669b5 SHA512 1914a17e6a2dbb062b3b15c051e32be7d4c03d46243d359d192af79f0496354ef0ade2af62ac4dba01624f0f379fcb7c0c03d9f7af83669b029f81e79ba600e9
+DIST elogviewer-2.9.tar.gz 24157 BLAKE2B ff527c0198e86f7be15fce3f25f0e9677b6911cef72cfdc1f582c62f534fc15adac8c2cf612475f174561dd46b489dcaf819c8ccd1b5893adeb7a6c085ce11c2 SHA512 e5781eeaf663fafa680b0620c4a6aec63afffd05c1cb4cb5362e9eca3a35c85550ee295a6b753155b0392d69442068cf155c3ead872c457e5a3cdbcd59b1ab2e
 EBUILD elogviewer-2.7-r1.ebuild 1903 BLAKE2B ba1d44a2d319b8c1286e94d521e6a15da9a56e74acdb4f7fab110c63085d79708c82f0fa77ba262a48ffc62f6908167f43b019141d47be1af593195f6912096c SHA512 884642f815e018d5eb0fc5c323ff0fd7d71ab7f2f00670694cc71661f38147ca0f88bc793326ccf0c5f86a8f7a3c459fdb2c5f6340015cc113c540e9760862fa
-MISC metadata.xml 509 BLAKE2B 3a84f5b5dafc1666c58c34666742f4e67bf969d7e0b4b166bddb32b7254d3b4e5257730541438746071f2a8c1a9e057ac0b5977e32695c6a96a76b661cd84d2d SHA512 2fc82898f7f2968181f8ea2cbcb3ad34327f4849e6060ab818c4d4d9bf58a8515027e74dc6034dd1016e12c0df7fb84d0c234235880ee547a5ae3fac9a09e1b3
+EBUILD elogviewer-2.7-r2.ebuild 1756 BLAKE2B 1fbea8d206ac31e9a056ed564982f02ffc3384a451a1046c05ca5d2f24184cf436e9e2deb3e71215dc8d3603bc393c1e18d11b090f613826be4f9987b5d29e4e SHA512 c4eef83e6bb2c089d286319ec77f658d8dc4d53950119b6f78b30035c44a3cdb34e6891f09663ee0e5a9ee7605378d8fe8f13650a91bd2597976e03a07afc280
+EBUILD elogviewer-2.9.ebuild 1758 BLAKE2B d60c2b09aeb6e0e9183c7b8832f106db1fc27b133b1c4c1e8a00301dd137eb82dd51b6a8785281452ec2c2413c256753146aafad792ccfcdca8c779e51975770 SHA512 a70da5046befbc695344d61f3173fcc28284e45592deb2a027bb93b798d630a06c6e762f028efc35f2d233022ea2758c3ca31fdf4801b7247054925e6c86d87c
+MISC metadata.xml 508 BLAKE2B 4414a5567ae33626032ceec6a059d7547bf8f2b69bc561b08e7ce60817194cd646813e0d3d0debc88ca10b85933ecbbdf954cbfe4d6b4194499e866ce54d7271 SHA512 bcea5d31473ddfb682d52f604f8eec6ec26938a30a62f7388e9b3be36d17a8f189ea97c418708b88949a6d48e10f6652feabbd247eeb9ef9132ce20916c41ec8
diff --git a/app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild b/app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild
deleted file mode 100644
index de0a0d95ee43..000000000000
--- a/app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-DESCRIPTION="GTK+ based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer/"
-
-SRC_URI="mirror://sourceforge/elogviewer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	>=sys-apps/portage-2.1
-	>=dev-python/pygtk-2.0"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	# Apply patch from Bug 349071 to restore missing newline
-	epatch "${FILESDIR}/${P}-missing_newline.patch"
-	# Fix bug #453016
-	sed -e 's|is not ""|!= ""|' -i elogviewer || die
-}
-
-src_install() {
-	python_foreach_impl python_doscript  "${WORKDIR}"/elogviewer
-	dodoc "${WORKDIR}"/CHANGELOG
-	doman "${WORKDIR}"/elogviewer.1
-	make_desktop_entry elogviewer Elogviewer "" "System" ||
-		die "Couldn't make desktop entry"
-}
-
-pkg_postinst() {
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in /usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogviewer/elogviewer-2.1-r1.ebuild b/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
deleted file mode 100644
index 3d151f53b65d..000000000000
--- a/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-inherit distutils-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-		|| ( dev-python/PyQt4[${PYTHON_USEDEP},X]
-			dev-python/pyside[${PYTHON_USEDEP},X] )
-		>=sys-apps/portage-2.1
-		"
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	mv elogviewer.py elogviewer
-	dobin elogviewer
-	doman elogviewer.1
-	dodoc LICENSE.TXT
-}
-
-pkg_postinst() {
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in /usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogviewer/elogviewer-2.1-r2.ebuild b/app-portage/elogviewer/elogviewer-2.1-r2.ebuild
deleted file mode 100644
index 53a2e8edd64d..000000000000
--- a/app-portage/elogviewer/elogviewer-2.1-r2.ebuild
+++ /dev/null
@@ -1,49 +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})
-
-inherit distutils-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-		|| ( dev-python/PyQt4[${PYTHON_USEDEP},X]
-			dev-python/pyside[${PYTHON_USEDEP},X] )
-		>=sys-apps/portage-2.1
-		"
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	mv elogviewer.py elogviewer
-	dobin elogviewer
-	doman elogviewer.1
-	dodoc LICENSE.TXT
-}
-
-pkg_postinst() {
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in /usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogviewer/elogviewer-2.6-r1.ebuild b/app-portage/elogviewer/elogviewer-2.6-r1.ebuild
deleted file mode 100644
index e7579cce328c..000000000000
--- a/app-portage/elogviewer/elogviewer-2.6-r1.ebuild
+++ /dev/null
@@ -1,50 +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})
-DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 eutils readme.gentoo
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	|| (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP},X]
-		dev-python/pyside[${PYTHON_USEDEP},X] )
-	>=sys-apps/portage-2.1
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	!dev-python/PyQt5[-gui]
-	!dev-python/PyQt5[-widgets]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-src_install() {
-	mv elogviewer.py elogviewer
-	dobin elogviewer
-	doman elogviewer.1
-	make_desktop_entry ${PN} ${PN} ${PN} System
-	readme.gentoo_src_install
-}
diff --git a/app-portage/elogviewer/elogviewer-2.6-r2.ebuild b/app-portage/elogviewer/elogviewer-2.6-r2.ebuild
deleted file mode 100644
index 94b30a95ff5d..000000000000
--- a/app-portage/elogviewer/elogviewer-2.6-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-DISABLE_AUTOFORMATTING=true
-
-inherit python-single-r1 eutils readme.gentoo-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	|| (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP},X]
-		dev-python/pyside[${PYTHON_USEDEP},X]
-	)
-	>=sys-apps/portage-2.1
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	!dev-python/PyQt5[-gui]
-	!dev-python/PyQt5[-widgets]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-src_install() {
-	python_newscript elogviewer.py elogviewer
-
-	make_desktop_entry ${PN} ${PN} ${PN} System
-
-	doman elogviewer.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-portage/elogviewer/elogviewer-2.6.ebuild b/app-portage/elogviewer/elogviewer-2.6.ebuild
deleted file mode 100644
index c1e8197e554c..000000000000
--- a/app-portage/elogviewer/elogviewer-2.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python{2_7,3_4})
-DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 eutils readme.gentoo
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	|| (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP},X]
-		dev-python/pyside[${PYTHON_USEDEP},X] )
-	>=sys-apps/portage-2.1
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-src_install() {
-	mv elogviewer.py elogviewer
-	dobin elogviewer
-	doman elogviewer.1
-	make_desktop_entry ${PN} ${PN} ${PN} System
-	readme.gentoo_src_install
-}
diff --git a/app-portage/elogviewer/elogviewer-2.7-r2.ebuild b/app-portage/elogviewer/elogviewer-2.7-r2.ebuild
new file mode 100644
index 000000000000..cad621a1469e
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-2.7-r2.ebuild
@@ -0,0 +1,64 @@
+# 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} )
+
+DISABLE_AUTOFORMATTING=true
+
+inherit python-single-r1 eutils readme.gentoo-r1
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://sourceforge.net/projects/elogviewer"
+SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86 ~x86-fbsd"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	|| (
+		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOC_CONTENTS="In order to use this software, you need to activate
+Portage's elog features.  Required is
+	PORTAGE_ELOG_SYSTEM=\"save\"
+and at least one of
+	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
+More information on the elog system can be found in
+/usr/share/portage/config/make.conf.example
+
+To operate properly this software needs the directory
+${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
+To start the software as a user, add yourself to the portage group."
+
+src_compile() {
+	rm -f Makefile
+}
+
+src_install() {
+	python_newscript elogviewer.py elogviewer
+
+	make_desktop_entry ${PN} ${PN} ${PN} System
+
+	doman elogviewer.1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	ewarn "The elogviewer's configuration file is now saved in:"
+	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
+	ewarn "Please migrate any user specific settings to the new config file."
+}
diff --git a/app-portage/elogviewer/elogviewer-2.9.ebuild b/app-portage/elogviewer/elogviewer-2.9.ebuild
new file mode 100644
index 000000000000..e007e8820641
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-2.9.ebuild
@@ -0,0 +1,64 @@
+# 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} )
+
+DISABLE_AUTOFORMATTING=true
+
+inherit python-single-r1 eutils readme.gentoo-r1
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://sourceforge.net/projects/elogviewer"
+SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	|| (
+		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOC_CONTENTS="In order to use this software, you need to activate
+Portage's elog features.  Required is
+	PORTAGE_ELOG_SYSTEM=\"save\"
+and at least one of
+	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
+More information on the elog system can be found in
+/usr/share/portage/config/make.conf.example
+
+To operate properly this software needs the directory
+${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
+To start the software as a user, add yourself to the portage group."
+
+src_compile() {
+	rm -f Makefile
+}
+
+src_install() {
+	python_newscript elogviewer.py elogviewer
+
+	make_desktop_entry ${PN} ${PN} ${PN} System
+
+	doman elogviewer.1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	ewarn "The elogviewer's configuration file is now saved in:"
+	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
+	ewarn "Please migrate any user specific settings to the new config file."
+}
diff --git a/app-portage/elogviewer/files/elogviewer-0.6.2-missing_newline.patch b/app-portage/elogviewer/files/elogviewer-0.6.2-missing_newline.patch
deleted file mode 100644
index e7f3e79a6a93..000000000000
--- a/app-portage/elogviewer/files/elogviewer-0.6.2-missing_newline.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Add missing newline and remove debug print statement
-
-https://bugs.gentoo.org/349071
-
---- elogviewer
-+++ elogviewer
-@@ -154,7 +154,7 @@
-                     and self.filters[section] == True:
-                     self.insert_with_tags(
-                         self.get_end_iter(),
--                        line,
-+                        line + '\n',
-                         self.get_tag_table().lookup(header))
-         finally:
-             file_obj.close()
-@@ -385,7 +385,6 @@
-         if len(split_filename) is 3:
-             (self._category, self._package, t) = split_filename
-         elif len(split_filename) is 2:
--            print split_filename
-             (self._category, self._package) = split_filename[0].split('/')
-             t = split_filename[1]
-         t = time.strptime(t, itime)
diff --git a/app-portage/elogviewer/metadata.xml b/app-portage/elogviewer/metadata.xml
index 2ac6f8372519..7144a8404ae4 100644
--- a/app-portage/elogviewer/metadata.xml
+++ b/app-portage/elogviewer/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>fuzzyray@gentoo.org</email>
-		<name>Paul Varner</name>
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>tools-portage@gentoo.org</email>
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 7f2db4aafdba..fe37798103c3 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,4 +1,6 @@
 DIST gentoopm-0.2.9.tar.bz2 24652 BLAKE2B 1046d4cc5dca19d2cc72e8d8d54cd0d2172164aa5594666c89a4dde9dbd994654d07982a2381fa09038b29ebb011bdd410f60ac3c340bdbf533bcfc29f4c4796 SHA512 e7d1daa811eb6c0877c2bec98b72bce61380802fe704f271a4df6383506d62ba661eb83ac9afd432627e2f10bf38840796768a565b80b6489563cfc54ed81ae7
+DIST gentoopm-0.3.0.tar.gz 37614 BLAKE2B c848c08677c4ac5ab0fdc1499045ae418048ec35d4ef925d1fe09ab4b68ec90e4f6843511efc29184883f3b3582bd3de519212bea1997736378b01bdc13ebd14 SHA512 e2a82f37b9a42688b6dd7023accdbf537780069deb6ca6ec6d9e159baf774af17e2a405c9eb40105b73b165f1c8c2ccde3ed685e04a61c9cd6665d1677da61d3
 EBUILD gentoopm-0.2.9-r1.ebuild 949 BLAKE2B cddba8cbec01872603134552283f1893df14f877a5a31d855ef74a93939b354a85e988856d9163878e85fe21da8a192ea1bc61bfa0db20962c9443a13d422f5a SHA512 47f12ad7c000b293e07e8baa9a309f82014604aa37961b81328b9102df7dd98ba1ba55744029362048eb79db27e162b7ce8c336a16e89f7cb5c370e14b14eeed
-EBUILD gentoopm-9999.ebuild 1096 BLAKE2B 0103075de6fa4557d8c877d7c7764534fe8470de7f3618266154119554db6dd7ded2ade13a6a4cdfa78c53fb06b8b8c7c7da31c05beadb1da78d89d33e5ac872 SHA512 683aa712825c855dd299811e2e87732b1f5bf79a0d68e121c5d53579a92a60da4ff3afb37307f8d46939e869c4da21251d5c8c9ad113def2aad7b64f2d9335bb
+EBUILD gentoopm-0.3.0.ebuild 766 BLAKE2B fda0b3d19493bd2e65b27d63add3cb319b74159a40afc234bb41f8500e376a0098454f616d99d711e5e7deb98980350ac7639d52c7d1d1f8c9c528baebaaf3b3 SHA512 480ba237ef5e55cebc04f74861510ca9c43e9dbc3aef879d080c7e75ed4b296c96859abb47e462bbc975070012be5d019a7b7e1c7332b9c4029a61d1a1eddca7
+EBUILD gentoopm-9999.ebuild 713 BLAKE2B 7f9e351e8bd066d2e04c03ec4e3863595455767a3f1b5338cd34d77bbf522afc5785db74b3d6786af789b50874b687df1cb16f60f5ae2597609d0259b40eda22 SHA512 79792fa49fcfeebc388f7627c9cfefe3ca334ba864901849980d28cd6a90b3eef31b35c385a012472abe248339e955158459e9e92cf2ca3ddc2237584b1d3198
 MISC metadata.xml 527 BLAKE2B cc7db429f639eefca32141b0b3936964330508679f87cf2c75e3c5dd86e24e25cb8628d51f4da728bff784af983ebb33ee64cd8e3becd953033f8b35bcfe7f13 SHA512 422137d02e652646b6e1cc176d4b5209dd7831dcd63eb1c47ce58105aee6648817cd79b67c8dcc1002cb97c53112b0ec75957821af0935275ee5125013c7ff2e
diff --git a/app-portage/gentoopm/gentoopm-0.3.0.ebuild b/app-portage/gentoopm/gentoopm-0.3.0.ebuild
new file mode 100644
index 000000000000..305f093bd468
--- /dev/null
+++ b/app-portage/gentoopm/gentoopm-0.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A common interface to Gentoo package managers"
+HOMEPAGE="https://github.com/mgorny/gentoopm/"
+SRC_URI="https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	|| (
+		>=sys-apps/pkgcore-0.9.4[${PYTHON_USEDEP}]
+		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		>=sys-apps/paludis-3.0.0_pre20170219[python,${PYTHON_USEDEP}] )"
+PDEPEND="app-eselect/eselect-package-manager"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index e9de24d57a0a..96a9ef4eacfc 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc"
+IUSE=""
 
 RDEPEND="
 	|| (
@@ -22,26 +22,8 @@ RDEPEND="
 		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]
 		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 		>=sys-apps/paludis-3.0.0_pre20170219[python,${PYTHON_USEDEP}] )"
-DEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep python2_7)] )"
 PDEPEND="app-eselect/eselect-package-manager"
 
-REQUIRED_USE="doc? ( $(python_gen_useflags python2_7) )"
-
-src_configure() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-	distutils-r1_src_configure
-}
-
-python_compile_all() {
-	use doc && esetup.py doc
-}
-
 python_test() {
 	esetup.py test
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/app-portage/unsandbox/Manifest b/app-portage/unsandbox/Manifest
deleted file mode 100644
index d4bc05baac34..000000000000
--- a/app-portage/unsandbox/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST unsandbox-2.tar.gz 891 BLAKE2B 7daabf3f5ae0bdd1fcbc9c61a098c6752a84f7e1ea9053ff4317760a6140d84bae541b802f738d1c11316c336ed67ebdd1d802ca4af467a4558fe14a940967e8 SHA512 d669a7119e397434219c7a86a5d10caeb0099fed841a3264ba09ed45c206621baf3f98104d3b6ff8239a79306177d6ebe0305ab67ab472e739f722e1823ab2c6
-EBUILD unsandbox-2.ebuild 369 BLAKE2B 2b7df2bde09003d681c93eb2137448a694f00be0f00b2f60aa176247dabfaf57cd6d40b0ec47600c0b61c68f8c53610bec74e592f1689b9a9893a72425e5ad58 SHA512 ab24e87b520139ea49e611781a1f40a2160bf47da6060e350b4d0e05e42594b8f66569d41a02ca7ddc2d3069306b6b07d398ecea605f3128002b2b53a4302993
-MISC metadata.xml 328 BLAKE2B a5cffa25c3b0f9094e74a51c45f97b624c95b0d0461f1da1b8a237815b774e39359436a82959ec9c9669bde7f0b6c8d17835233c01eb2354f58607bb4259bead SHA512 800ada1895db6c4dd907d24e7400046c8c5d9b919310b3bd7f394ba368b1261fafd1140d175e20830e406282c4088c3304f70a506461fc1ea0c86a8a3e783961
diff --git a/app-portage/unsandbox/metadata.xml b/app-portage/unsandbox/metadata.xml
deleted file mode 100644
index 6a495dd36abf..000000000000
--- a/app-portage/unsandbox/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mgorny/unsandbox</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/unsandbox/unsandbox-2.ebuild b/app-portage/unsandbox/unsandbox-2.ebuild
deleted file mode 100644
index 41773bc4e617..000000000000
--- a/app-portage/unsandbox/unsandbox-2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="The Sandbox escapist tool"
-HOMEPAGE="https://github.com/mgorny/unsandbox"
-SRC_URI="https://github.com/mgorny/unsandbox/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 3fa69654f6fe..556fd17565ae 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 20b8cfebec51..a5db880b9e18 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -3,6 +3,6 @@ DIST bash-completion-2.4.tar.xz 276148 BLAKE2B 1ca38db1d1ad9f0bf7d1aa4e49cba1c82
 DIST bash-completion-2.7.tar.xz 280048 BLAKE2B 88b09f451fd4e14daf8e139951a4b65aaa9d9b1d86dceade388a726ac7f3caff2546597695c3f0cbd5dd64e20472d0cf3e98e0f367898b81d696d4ccb8f2fb73 SHA512 514709ad2e5f6bd4e20027c7049a1144c1854a37b653d5c11fad1cdf7a46d0e1afca725d6ce75d49691149e0de57be85747f704ac1c429ef4cea114bfbff8fcd
 DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce
 EBUILD bash-completion-2.4-r1.ebuild 3161 BLAKE2B 0c3b185bb625c951f47fb9571695ac67900d67868a0bab27d1a80cb15a31e997422fa8e43677f4d68c6644e10f502c25fad166e1ad1257696c9795bcdc2967c0 SHA512 2d6366a7609d3fab9a423fac06e2c78957f079c37a9c69d9694dac6f70ed50d4234b14f4fb54dda303ef916ec6f92402179b6bb2830208d83e6c5e98bacfb693
-EBUILD bash-completion-2.7-r3.ebuild 4112 BLAKE2B b93a8e062e4b7df75448cb6017165e4841d06540a0ca503f96d4c1714681abbe3a3a6e3b86f05faa653ab31cb5837aedf7b9d1cb78639ea4d5329357949f0665 SHA512 25b229343ebef55fa986ad1c20ecc7f129eb7616e609accfa59536bff35b757c28cc73ca95a377c3eaf3597a5a801c93022ea31816a903856f66c0f158733f1d
+EBUILD bash-completion-2.7-r3.ebuild 4111 BLAKE2B fb88bc02f138f0001b0a919ee29b3ac5affd164219ea5a7a9775c45bdb368a1a6b80315833d69eb777c8c7f9b36e3532d91a2d57b419c4fc9770339ef9f62b71 SHA512 17b06c8c059d80b9ee50da3df53b73a955fa697d3ba7e3be5b924bf99787e83f092d27746fdc57d83aee84de210b75af39afab8a48827b2da8fd9ecc7e2cfaa3
 EBUILD bash-completion-9999.ebuild 3966 BLAKE2B fb35f3822108eabcd36264cdc2eb0c386f99bfcd6df5a4bddeb5a0e7a110f7ca598507169adff6aadeee3ea678547ef974792d97091ac99e666cd5783a0d8ca3 SHA512 f4db656cac0725c95e1acca37b2ce0fda2bd49d1bc07249f0204c9434a1fee517761f6d00ff0863e608ad070d1f7a6a93882f2663b5ae24ad87e902460a4d159
 MISC metadata.xml 1309 BLAKE2B db08060cd74841bd7220e688e251225ddaf59e4da737c08785e7c6ce83c2d40600fbe38e9b9449fb559ccb2d03b8c2368295b647ec2a52191429fe1d3d1c7470 SHA512 3ee23fb6cbee1e80a0c8fab13f7bb67bdad3292fa8ec187e306b00804a7bf709358c8c08eda4101a5f5baa408e0892aa94c07ae466b5beae4edc18055b1192ee
diff --git a/app-shells/bash-completion/bash-completion-2.7-r3.ebuild b/app-shells/bash-completion/bash-completion-2.7-r3.ebuild
index 7f82f2003950..94afac9d526e 100644
--- a/app-shells/bash-completion/bash-completion-2.7-r3.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.7-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE="test"
 # Multiple test failures, need to investigate the exact problem
 RESTRICT="test"
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 8e8e5b842827..723ca8982eed 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,8 +1,9 @@
 AUX dash-0.5.10-dumb-echo.patch 2612 BLAKE2B 8a303b8515b41786fdeaf0fe5ee28e2f04f377fedf8761bb76dd6c9219040b7cb44509587cddcf8282e77237f1089abee5483868ea8410a1000bc4baac76347c SHA512 2ac6d6a22a7adbb8248c73665c198146606293dbdc35e680a2376d721f34132a87d3b57848348af1e048ba6db478df8e5324728eb844ac9d63be0be7b0465170
+AUX dash-0.5.10-subshells.patch 465 BLAKE2B ce3ea3870ad088d61d0df9ca00619b77ab42035c62967c853ef9ad003b69b032a8007dc31ff7d5a11fe01c945afbb098f4963876abfae3ebeaf445a7473b225f SHA512 12f4d4447569feda2ec839ebdc480a85a915c8f0cab068ca289630e369575bc0f5ca59509af928df951d74e7a9a73d8b5a52890f3a53cd4535b9dc9260edef0d
 AUX dash-0.5.9.1-dumb-echo.patch 2592 BLAKE2B 95e79281e579d0d40e320f0433fa94185f22e971a2e5c6b8a7686e96479a490c2d7820545875de2bdb81f52f7ce0b7ea0811a207c41601d7e2272c0829f07d14 SHA512 8dcbee6a53b46b78986c17860f84f47c94b3137b84cf46cd521ec9e4f0b5b4f5a2afbc9e7faa8130b591b3a0f9d2c9dc7853803c8b092c4ec1b5c5b7411fecbf
 AUX dash-0.5.9.1-format-security.patch 374 BLAKE2B 63a9128f8a396e9c9808867ffdff90f1a176a99108db02d4ff03395d74c9eb69039604d3921cb26c42aced4411caa27cf20eafced3febbb4b175a7d118b66ca0 SHA512 4726d96ad1a86e47374c129f1cbd13bf5f2b6c77faa4e3e85be65978222cc040175313218fe29da176af2bbc2546c432d84247ea342d261a284b64b42ce138c6
 DIST dash-0.5.10.tar.gz 225242 BLAKE2B c21b04aea58599c4a487ec7325bc1ffac2fb4b9be911e07cb0da3fd62eb15b5eb8d30857fad6cbc01fa36a948ac5e5e226566b42d4f9507f709e4d6636cf84f6 SHA512 47383284faf2cbdf65471b72196bdcea46efb8b01041fdc7685a811ae125ba77e5af653939255bda20bd3d56a13f838d85e0003549dcede6b75a37625816cb30
 DIST dash-0.5.9.1.tar.gz 225217 BLAKE2B a80aa00ea5418d00b03c9ded21ef5c3a28d599059d1ac2f20082867b71ece6afac2f0bce9bc09946450c7618ad2c7f95df63b3d519a7f56552a291d09e44a71b SHA512 d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d
-EBUILD dash-0.5.10.ebuild 2110 BLAKE2B 7d7f133841bf2628eae1c7c86326ba3cc380c44587915eec6b3234a4e1ca78ecaf32a325643b00f38d1fb71b6048340e7d8466e4b5df88d81b76c6ae49c539b0 SHA512 078ca37ab0b5f8da550f176bfb234d84bf187a95bb3bc541ca36e2c0a27616373b609fefe3b7899f5899e1a9cc073719db95ba2bb52f2ac31c7c42b0acd02477
+EBUILD dash-0.5.10-r1.ebuild 2147 BLAKE2B 382c8bfd6eca89b738b477178f5f853b2078671b5801224063c1712ab1fbbc59fb04a1a0c6a50959db34e00fa0d26afc7c6a38fd5ed9c368c0468fdd4a81fb18 SHA512 b32a4e91fa56f07eccc251cbe64c70c202aff5a96a95effd86b1deb3875a973ebaf9d285194eac4e49cbcfaf88a17fc67df4131002615c426fbdfd21fcae1672
 EBUILD dash-0.5.9.1-r3.ebuild 2102 BLAKE2B 4afafb3ed350dead0d0383877b612b8891d4241f742fbf7bac0f28f7c42bf0e29a59f5f512fbdc9914197cc930241b789e74239a33757f4383527cfe6b563b98 SHA512 9145720f7d1e33a8c6c60f265ba7574bed868893bb8190726afdd9ffb09a18f4c624f761ffe08746f2ec9f68f69611f8751684a04827bd480bb783056a9928ef
 MISC metadata.xml 598 BLAKE2B 0ec9bc56758f158bfce29ffcbbb84c45abe17cd477014fa428240a9af5a4a9f8740c5a66f4aa4828795135d7464426c65410702e81aea81befec5e11a07ec3fa SHA512 a477ff729919625c910ef9a0b95ea85e683122383c4026c1c51f163d8faca06749ec05eef8b4f01ed9eede68b49e637f24f94202b8a00e67bb01bc21294610e6
diff --git a/app-shells/dash/dash-0.5.10-r1.ebuild b/app-shells/dash/dash-0.5.10-r1.ebuild
new file mode 100644
index 000000000000..97e4202bc4d1
--- /dev/null
+++ b/app-shells/dash/dash-0.5.10-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs versionator
+
+#MY_PV="$(get_version_component_range 1-3)"
+DEB_PATCH="" #$(get_version_component_range 4)
+#MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Debian Almquist Shell"
+HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
+SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
+if [[ -n "${DEB_PATCH}" ]] ; then
+	DEB_PF="${PN}_${MY_PV}-${DEB_PATCH}"
+	SRC_URI+=" mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libedit static vanilla"
+
+RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.9.1-format-security.patch
+	"${FILESDIR}"/${P}-subshells.patch
+)
+
+src_prepare() {
+	if [[ -n "${DEB_PATCH}" ]] ; then
+		eapply "${WORKDIR}"/${DEB_PF}.diff
+		eapply */debian/diff/*
+	fi
+
+	#337329 #527848
+	use vanilla || eapply "${FILESDIR}"/${PN}-0.5.10-dumb-echo.patch
+
+	default
+
+	# Fix the invalid sort
+	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
+
+	# Use pkg-config for libedit linkage
+	sed -i \
+		-e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
+		configure || die
+}
+
+src_configure() {
+	# don't redefine stat on Solaris
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		export ac_cv_func_stat64=yes
+	fi
+	append-cppflags -DJOBS=$(usex libedit 1 0)
+	use static && append-ldflags -static
+	# Do not pass --enable-glob due to #443552.
+	# Autotools use $LINENO as a proxy for extended debug support
+	# (i.e. they're running bash), so disable that. #527644
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-fnmatch
+		--disable-lineno
+		$(use_with libedit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	if [[ -n "${DEB_PATCH}" ]] ; then
+		dodoc */debian/changelog
+	fi
+}
diff --git a/app-shells/dash/dash-0.5.10.ebuild b/app-shells/dash/dash-0.5.10.ebuild
deleted file mode 100644
index 72821681d9b7..000000000000
--- a/app-shells/dash/dash-0.5.10.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs versionator
-
-#MY_PV="$(get_version_component_range 1-3)"
-DEB_PATCH="" #$(get_version_component_range 4)
-#MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Debian Almquist Shell"
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
-if [[ -n "${DEB_PATCH}" ]] ; then
-	DEB_PF="${PN}_${MY_PV}-${DEB_PATCH}"
-	SRC_URI+=" mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libedit static vanilla"
-
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.5.9.1-format-security.patch )
-
-src_prepare() {
-	if [[ -n "${DEB_PATCH}" ]] ; then
-		eapply "${WORKDIR}"/${DEB_PF}.diff
-		eapply */debian/diff/*
-	fi
-
-	#337329 #527848
-	use vanilla || eapply "${FILESDIR}"/${PN}-0.5.10-dumb-echo.patch
-
-	default
-
-	# Fix the invalid sort
-	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
-
-	# Use pkg-config for libedit linkage
-	sed -i \
-		-e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
-		configure || die
-}
-
-src_configure() {
-	# don't redefine stat on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		export ac_cv_func_stat64=yes
-	fi
-	append-cppflags -DJOBS=$(usex libedit 1 0)
-	use static && append-ldflags -static
-	# Do not pass --enable-glob due to #443552.
-	# Autotools use $LINENO as a proxy for extended debug support
-	# (i.e. they're running bash), so disable that. #527644
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-fnmatch
-		--disable-lineno
-		$(use_with libedit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if [[ -n "${DEB_PATCH}" ]] ; then
-		dodoc */debian/changelog
-	fi
-}
diff --git a/app-shells/dash/files/dash-0.5.10-subshells.patch b/app-shells/dash/files/dash-0.5.10-subshells.patch
new file mode 100644
index 000000000000..5943db11e697
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.10-subshells.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/655320
+https://patchwork.kernel.org/patch/10382199/
+
+--- dash-0.5.10/src/jobs.c
++++ dash-0.5.10/src/jobs.c
+@@ -975,8 +975,8 @@
+ 	int st;
+ 
+ 	TRACE(("waitforjob(%%%d) called\n", jp ? jobno(jp) : 0));
+-	while ((jp && jp->state == JOBRUNNING) || gotsigchld)
+-		dowait(DOWAIT_BLOCK, jp);
++	while (jp ? jp->state == JOBRUNNING : gotsigchld)
++		dowait(jp ? DOWAIT_BLOCK : DOWAIT_NORMAL, jp);
+ 	if (!jp)
+ 		return exitstatus;
+ 	st = getstatus(jp);
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 7eef6ff16eb5..2834fa2a2f67 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 19cee9337a0e..cbdd0374ddb3 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,7 +1,7 @@
 DIST qpdfview-0.4.16.tar.gz 636095 BLAKE2B b25da3ed1b4bacc02701f6cd2c4e282fd1c7b1fcac8faa1687c5089baefa328854c520ba803a333ea107e7b423a004f6476eb9a7adf67287d4d0807146094fed SHA512 d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584
 DIST qpdfview-0.4.17beta1.tar.gz 658978 BLAKE2B 7f0ba945cf7903cae7bb11ac1d3baa08fc5f70e9e5a20a9f265cf8de4f0ce0f847f34852b2ce4374e2736542c8fc1e07c15e6bd4ae54d5147d14524e076f312f SHA512 803bd9a1165fc84302fb3c7734127eaab754bd2bf23083a1bcf340810fa617800f3d0069eae7b1f43fb528ebe17a6a32a652efbb902d525a95efc31efeb1e10a
 DIST qpdfview-0.4.18_pre.tar.gz 667869 BLAKE2B ed729b6aa1104ca1525877242bc3f2c630d8ee563005ab35854d775197c24352f0a39be13bf4808e4544c50072619da9cd5c36cdbdcbae33fa2fc2016b80ce18 SHA512 3a7a2cc474078dc742fccba2c87710c1e05cec76f0bd66650fa6cb4d6d8e2103241474689d4798da28ae1aeb2caa6e09dd8d1e9d0433c2eba21b202166aa3051
-EBUILD qpdfview-0.4.16.ebuild 2136 BLAKE2B 6f3dd7e20edc47ee6076318b0affe70580f435c1848c819cbaba15b75334b026be8fb69d3abbff6fcb3e53d990e0d9ae0ef3de2979c0373dcb53b4963e7882b2 SHA512 17b67cceb5dd0a3ff56b53f1f7cd2a951c5dc7f3e91b88bf669f54c5258d084da76622e8eacbf5cbbbef8376250dc354f38ee7c5b71ded124ad13263af6e29d6
+EBUILD qpdfview-0.4.16.ebuild 2137 BLAKE2B d0ce86840680b56afd8b925b820d0641a0754776d4054b469c691f5da10db072febd5b04b34b80394bc08f47d6b5b7b58390332c30d445116528cbc238fe2144 SHA512 2d89740ee569287794935eb369c8a035a3ceeceb3e428e740f0b0adbe808f532a336dae9739c789bd4ee71b1a7f87af222ce91c19028bb179275184607489549
 EBUILD qpdfview-0.4.17_beta1.ebuild 2169 BLAKE2B 61d969d7af89373d0d657c00049c7a86a6cb67d2cea7d436f1052e21c0a02ebe7d06024851a6e956b8227d41b90df2cfb862804a09a7f817307f5b2185a88d33 SHA512 14fe234d15e1f6a38a8ba2c744c5f9061c21969f43bab039227636eb69f25fea5f1a91ffb15afe84c3eb92de25ef1c0db693b02a074f365e9069af5ae145ad24
 EBUILD qpdfview-0.4.18_pre.ebuild 2351 BLAKE2B 64beca033eb45d715185360ff9ea653de2f444e0fdfa5bc58e5e37f46fa2e8f03e5674837121e2c61b2f5781281de70bc960d85ff10e763a0467c292f88bd4cc SHA512 560b54fc310413fc34e24f441eb438db5221d211cb57fc318018e27b7913588e3361b056f4102cf922d6f79d955993ab40182158e6ce00ac5394bd82d98f56f0
 MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/qpdfview-0.4.16.ebuild b/app-text/qpdfview/qpdfview-0.4.16.ebuild
index 89e07a090fb5..8ae9621ec5dc 100644
--- a/app-text/qpdfview/qpdfview-0.4.16.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
 
 REQUIRED_USE="?? ( fitz pdf )"
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 2e7f8a3f7806..18abf5fba92b 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -317,5 +317,5 @@ DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f3522
 DIST texlive-module-web.doc-2016.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 EBUILD texlive-core-2016-r6.ebuild 11520 BLAKE2B 2899191b740ab54cc36f171bfc89e3b9084ac1c67c8c23d5cff7d9ed7c909ddc924872f026d0fc4290851146fa1c65dfc2732865f3c41c62b4a7252ca87381c4 SHA512 684240a46ac764bf5a567ea1fdce38db2e43589b8764afcb793c16f87fad5151163efcb6043ad704aef34b66beccd35afc0f8500252fc5cf70917280c6b23fd4
-EBUILD texlive-core-2017-r3.ebuild 11559 BLAKE2B a0870c8189c14fd26d002e8bf104e90b7168e11ad427f9ba7d7a8b53ebbf2577e2963ea155a5f7ece46e8d3bcf9e10cbbd756d60df08d8461c8456b76a3d8b68 SHA512 f57be92b859d5fe58941ae72f4c0f22127a7e126d6a5e706ec02fd2ec6165d2f642dd2503a8c51ca56f090c828889ee88bc5921f3c3f3d21be61d3496e4fb93a
+EBUILD texlive-core-2017-r3.ebuild 11613 BLAKE2B c3faa57e795a21bdb6f552183d354e93476120da5e0c785bb71f77867bdc5112caf2027d0e3f45fa13d8893a7bb020810f989abd50eb1963d9f24fda3eb9cea9 SHA512 f754342529fff4f6b521a0b021044e1c1c1f2bcaf5a930930d10233b783b8de7d5b376fd6384ec362605e9f506fc19a3f6105c995d3fa554cf19a7aa89522923
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
index 6afd4bb89628..ea0bec2af8ff 100644
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r3.ebuild
@@ -99,6 +99,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	sys-libs/zlib
 	>=media-libs/libpng-1.2.43-r2:0=
 	>=app-text/poppler-0.58.0:=
+	<app-text/poppler-0.64.0
 	>=x11-libs/cairo-1.12
 	>=x11-libs/pixman-0.18
 	dev-libs/zziplib
@@ -117,6 +118,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	cjk? ( >=dev-libs/ptexenc-1.3.5 )"
 
 DEPEND="${COMMON_DEPEND}
+	<media-libs/freetype-2.9.1
 	virtual/pkgconfig
 	sys-apps/ed
 	sys-devel/flex
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 1ff85fd7cce9..5b83c6a1cf54 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/cockroach/Manifest b/dev-db/cockroach/Manifest
index 5e84c3d4ded1..d754aca3fc5a 100644
--- a/dev-db/cockroach/Manifest
+++ b/dev-db/cockroach/Manifest
@@ -10,6 +10,7 @@ DIST cockroach-v1.0.3.src.tgz 69127502 BLAKE2B 803f88e19a6128f18024748610c1af3e9
 DIST cockroach-v1.0.src.tgz 68753479 BLAKE2B 6377614e9fee896a0115909b02d8a191a7aabe8da341c98547c0ac496d2e8fcce801e35f93a8a126c9d65c1106e0217359b161825a11597da1db113ca6a51216 SHA512 d74ad9546908535f9a7ad4172a04a5f86f5ed22698bbb005aec7478a52632e0497a966b859fd68b40894eb7ee68bfa80dc4188d198f2f23725b9cadd50a55191
 DIST cockroach-v1.1.2.src.tgz 79607942 BLAKE2B 39ce9db2ada1c9a5727431438d4d8fe0d5a31af3161816ee7af672c69909aa6b4681edabdfabc332c00ba3b0a142ea7d700851c8833b80947fdbcc88b7fa2c7e SHA512 385e33ec30c23d84403938420a2fcd66edff02a5c4b9d6220ce3683d833f065010953fd78ee57120c24f2947509b2fd29eeee2a45fd3ad47c16a6c8d779534d2
 DIST cockroach-v1.1.3.src.tgz 79615899 BLAKE2B 86d9a63a5e5e8f21114dda500f30a007bf64769b76322fae282d06fa9eb63eb8a965bf990378c624ccac66124efadf1a0dfdebbc8dc8c6f04173e20334341e89 SHA512 f6dc4178e91fd47aec1fce658c9d621183f0bdcdc6101b87f8187757ab9b965c27e48d0d628dd9c10a386bc1a2f184d9d03270243baf0ec4758c812caac5fda1
+DIST cockroach-v2.0.1.src.tgz 45511681 BLAKE2B 9d0828e5e6bd41bb5590e58f0e18b8a07169335b9ff1284daf89b48dae6eea3cdb683bf8af703b5bac46978e8c37b4a092c53a3d7e18de626acc2095a7daf2a2 SHA512 ad7c64dc70cde6bbd10cabafe595ce35deeda9284880bebde75e41a4b1355aa85f01fb8c6b6ff0bae498b4b04a8d7d60bafc986c49875cff9ccf0ead0bc481a7
 EBUILD cockroach-1.0-r1.ebuild 1703 BLAKE2B 263b32177c96e6c5f4512c6eb60cbef7310fdbac297f5219f3e3d8ba708befe6ccc7a0eb43467c6dbc4c01542e5eddd899b01d61b0b6aa67fa3950d38b879767 SHA512 f9d54c7b9395e8ef6552211535641b9241df50d922f6c2e8c74c1782538ea25953c8c15fd89bf6ab17c6264b75bcfd23b5fd27ea9b4054f6579a2753b81c9eb3
 EBUILD cockroach-1.0.1.ebuild 1701 BLAKE2B e011a698cd2493fe26d24112a8ae8b9184ff66c7a1bcf25f6933c19374f036781ff093f7d84048c4df219aa93b66b4f3879af68b6835f9c02e62c503d8597841 SHA512 61ded57cbd28008a27b3b8a2e048a89a70be76317d350c29554ac0450de8932c275aedb63f6d032997013abb63b8a29aff4dae107bccf7876d7afe7ed14149df
 EBUILD cockroach-1.0.3.ebuild 1701 BLAKE2B f9e7fb748c2495586fc600dec992a0272cb89a39a48131ae687a469d1ffcda0b6fe5bad83751b514d8f3906c9f6defdfadb3175db34dbf0c9317143865c7cdbb SHA512 b1a0a2adb8555a227bdb9caff6a91efba4c010a82372b5ad446ab2feb9b68a98456b5b60c14513e5aeebae290a56fd936a8c17194821d12f2b910e8e0f3d1979
@@ -17,4 +18,5 @@ EBUILD cockroach-1.0.ebuild 1689 BLAKE2B 1a9afdfb31ac9142f4a21cda3274eea404593ec
 EBUILD cockroach-1.0_rc1.ebuild 1593 BLAKE2B 511ff8271f507e055d792d98f12f1adce3eba73b15d198e4adf33d7ac1ba61eefa5c9a436ae8b1b474aac802e961205a49195187067f53320ffe038308a8df13 SHA512 6f273468fd5b869144d474027dd644a9031c18f1b18525c89775c9d8eacdeb59d64b195216189ebe6a2251973abc500b2f3047fc88af7d97aa9798c0db8fa16a
 EBUILD cockroach-1.1.2.ebuild 1701 BLAKE2B f9e7fb748c2495586fc600dec992a0272cb89a39a48131ae687a469d1ffcda0b6fe5bad83751b514d8f3906c9f6defdfadb3175db34dbf0c9317143865c7cdbb SHA512 b1a0a2adb8555a227bdb9caff6a91efba4c010a82372b5ad446ab2feb9b68a98456b5b60c14513e5aeebae290a56fd936a8c17194821d12f2b910e8e0f3d1979
 EBUILD cockroach-1.1.3.ebuild 1784 BLAKE2B a23a4d6971c40d68bd280917159ef280c534da3339a48ff1d60351ed63f78be331e323a2d311b3a051db072f4dac88dadf7cc460cd2a2f7f59d19dbc7656176d SHA512 48e34da012ea4ffe51278e2d921a6a93e444b9e4a07855664e468d966f867c341c478afa9ea1f41fb31fcb8f6f94e373811e6bea879a4042a3d23f05d24d220b
+EBUILD cockroach-2.0.1.ebuild 1820 BLAKE2B b16dd86cb9bb805db65d47c36bcab1942443942473b96c74c95a53ee55a1878e61247dc58945119bd6a09a1a0ac3bdc5cb9f9ec6fd28db2ab8acdea55b540ca2 SHA512 e8d4fac1f1463ea4643630662d92d187207fcd299bce5c92532ca184fdbf73981e98f07ce5ea56044f255f70a579a46bbfcd202f35a5b1563c0c7b842fddaca2
 MISC metadata.xml 409 BLAKE2B 0fa2933efa8102fa19917f3268b4424257f26efdd94698d22253ed62b562dddc53e09a9312069a9bcf817ccd3f6a0b4423c04c8d8dcbe387e7b30d727e8bdd0c SHA512 e4494324632e55e32fdfe7c1d1b25301b8f7cff3f7475efaf7c6c59d435777eab7245bb200b39b90121babce4e1573038fb0f42e586854a820e1489c1afddd19
diff --git a/dev-db/cockroach/cockroach-2.0.1.ebuild b/dev-db/cockroach/cockroach-2.0.1.ebuild
new file mode 100644
index 000000000000..6549c0aea3b0
--- /dev/null
+++ b/dev-db/cockroach/cockroach-2.0.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MY_PV=v${PV}
+CHECKREQS_MEMORY="2G"
+
+inherit check-reqs toolchain-funcs user
+
+DESCRIPTION="open source database for building cloud services"
+HOMEPAGE="https://www.cockroachlabs.com"
+SRC_URI="https://binaries.cockroachdb.com/cockroach-${MY_PV}.src.tgz"
+
+LICENSE="Cockroach Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=app-arch/xz-utils-5.2.3
+	>=dev-lang/go-1.8.3
+	>=dev-util/cmake-3.8.1"
+
+S="${WORKDIR}/cockroach-${MY_PV}"
+
+QA_EXECSTACK="usr/bin/cockroach"
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Cockroach cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	enewgroup cockroach
+	enewuser cockroach -1 /bin/sh /var/lib/cockroach cockroach
+}
+
+src_compile() {
+	# workaround for https://github.com/cockroachdb/cockroach/issues/20596
+	unset CMAKE_MODULE_PATH
+	emake build
+}
+
+src_install() {
+	dobin src/github.com/cockroachdb/cockroach/cockroach
+insinto /etc/security/limits.d
+newins "${FILESDIR}"/cockroach-limits.conf cockroach.conf
+newconfd "${FILESDIR}"/cockroach.confd-1.0 cockroach
+newinitd "${FILESDIR}"/cockroach.initd-1.0.1 cockroach
+keepdir /var/log/cockroach
+fowners cockroach:cockroach /var/log/cockroach
+if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "The default setup is for the first node of an insecure"
+		ewarn "cluster that only listens on localhost."
+		ewarn "Please read the cockroach manual at the following url"
+		ewarn "and configure /etc/conf.d/cockroach correctly if you"
+		ewarn "plan to use it in production."
+		ewarn
+		ewarn "http://cockroachlabs.com/docs"
+	fi
+}
diff --git a/dev-db/kdb/Manifest b/dev-db/kdb/Manifest
index 7596a3141b93..4cc3aeb9622d 100644
--- a/dev-db/kdb/Manifest
+++ b/dev-db/kdb/Manifest
@@ -1,5 +1,3 @@
-DIST kdb-3.0.2.tar.xz 478576 BLAKE2B 66982ddae77eeca4238de5045729c049ab41a86471d896f8199af58c9ce6a88abffa1b65975b3e138579bb244e18095e95ddddd11c7c79008f18cbffa63a2076 SHA512 e2fcc09d9477b707bc5af23d23ebfedd21ee7445b0de8fa160969795eb608d712d74572618334fcef4aa06095fa69ce9861542851f5609e83287b23ef01fae90
 DIST kdb-3.1.0.tar.xz 543780 BLAKE2B d874765758e245fc939bf88312b064d2dcff3460b2c9e968277e0ce7b8821314273cb3086e821645f9d7605de1a4268e25d11c40f8bf847a8dc98c410bd4d9eb SHA512 f94f1ff87cb5133570f7e9b0ab48202a516eabe1c3f2ed750cd1794800d9b9936bbd62e1479ca6877c293f6473b7f4e2d4a144b928b5bc0f228af327131b43c2
-EBUILD kdb-3.0.2.ebuild 973 BLAKE2B 9d48afdba85f51b9d2f90edc30a48c90beeb2d750bce840e432bf785613740bdd8bc749dd8de07c157f54dd978ebf91f2e6bae2de2ac7eff2ecc8ee8c077ffeb SHA512 5c04d286a7cf2d873d47d05ac71041ab61c8ebffc176f8ee82f3b37c65087592d921922d0b3674bdeb35b9b9516d8843ce6beb384076b61da7847928e93a3041
 EBUILD kdb-3.1.0-r1.ebuild 1051 BLAKE2B fdb334e923fe982490712bb019e3318a1b5a91d2e2aae531db58dcc0c95c05f602f9372f4157215a51922a7859656a5aafd91d7b2f06a87de1bff32fbb616675 SHA512 b0c3b31c9c35bd8cc27d35763baac99952753685beafca43a20c21e528965471f8e01ef7b72aa021a20b2ee166a01a5887d497fac07875dd0811e450503db737
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-db/kdb/kdb-3.0.2.ebuild b/dev-db/kdb/kdb-3.0.2.ebuild
deleted file mode 100644
index 2c4e4c1d9041..000000000000
--- a/dev-db/kdb/kdb-3.0.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit kde5 python-any-r1
-
-DESCRIPTION="Database connectivity and creation framework for various vendors"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="mysql postgres sqlite"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/icu:=
-	mysql? ( virtual/mysql )
-	postgres? (
-		$(add_qt_dep qtnetwork)
-		dev-db/postgresql:*
-	)
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package mysql MySQL)
-		$(cmake-utils_use_find_package postgres PostgreSQL)
-		$(cmake-utils_use_find_package sqlite Sqlite)
-	)
-
-	kde5_src_configure
-}
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 21bc03dc59f4..670e6b0455e0 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -2,5 +2,5 @@ AUX my.cnf-5.5 5244 BLAKE2B f6e22850e34454d7b48566b3e3e1731940933e00611cf5c3c79a
 AUX my.cnf-5.6 5144 BLAKE2B 2f977b6a92524cfabbdd19058430c62dd4d03a0587036f49057eff69fda04c148a4dca8e58abe418a2bdc0fe1ef3c780cf53d7214fb51f13d5a4b2a4f7a3b8e9 SHA512 db4bdde6f82d9bd33026477d89d8191ddc4099586273ca4aa3f2dcd09572f887d03f79c2ce00bf74d01c21a18384b05516982bdcf31a6c458631315ea75c4cab
 DIST mariadb-galera-10.0.34.tar.gz 69661677 BLAKE2B a905e24c217843e04d35393af9eee06e2e42d6b6d4f7202645a795dd17ee60394b19228332dca9f0d078748f5d02893ad3f367c8c449147811abf78e502b7997 SHA512 e0226e6032d5ff0080a97ea486726a44d8e1b977b93c8d07b517be70098df4149d119d325ebcba6c6affa95a586c94ec8f99a5e5a74a7d2314311748029dc7ab
 DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 3e3e19a905961570cea9c1eb14dec3780da80409e996b1aeddb08625da875f5d08798a862cb1b80566b0d8be0d9ec2aab0a390ca90f991203c9871538b11f00a SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5
-EBUILD mariadb-galera-10.0.34.ebuild 5497 BLAKE2B 2daef9bc4a961bc9c8d15ce728144c91a108e3c6deddcb6c0f3f80a82b01f55b25889f8a0c1a32be4fc07e2a12062b4ab4355874f1dbc69de13efc0aed05377d SHA512 a627e03eda10237d5b68f4aebc5014689c197cb510c963801cdb88729ee6fb52d38b532f9e50a563470360e2ef4fae4ebded4d540bf4111b866c12130278eda1
+EBUILD mariadb-galera-10.0.34.ebuild 5513 BLAKE2B 412007d9afe155237e15f4e4368af04034cf1e7844c464693a86d0e220941fccd7cd3ea6e90312fb4dc7e84dc916ae1fb1ac961c5306ab8f69299fe08b42e6f3 SHA512 9517231142d4da14839309bd4a2c0a12b04962e84ccd255030b7fa757b961af58c619f2310e706bb9663cf98d890ca7809df84370daf71ab153994104eb23e39
 MISC metadata.xml 1848 BLAKE2B 8046367163d7adcf0f31b9972486ed3d6fcf157574b775f1ad871c67d28998777fa7b03b10cc20d7fa85adc7ceb7910f90f25480546ac78f3d47d4be2685219f SHA512 57f604c9f265f3b4873b681fda8005a0241bc8474bf966b83209ec56b3de70172a70401f2ac9818068ae79656e78b1dfb13b616f3ddc9254669c1ccdc43749aa
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.34.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.34.ebuild
index 2279222e828d..46f8aa0649d6 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.34.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.34.ebuild
@@ -59,8 +59,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
 		virtual/perl-Time-HiRes )
 	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
 "
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) )"
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) )"
 
 MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
 
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 8da3249ac21e..a0b7acb2b589 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -7,10 +7,12 @@ AUX my.cnf.distro-server 998 BLAKE2B a7f2977a96d394cb7e24d72d82a1c21095c4b55607e
 DIST mariadb-10.0.30.tar.gz 63433598 BLAKE2B ccf5b1650a4134cdcdd99bf52b0e6441f3255a938bddc050418ac8766e8301dadde92e7a349fa6f0b9338304790121ace7d5da9fe8bb86f2ed553f37809c8daa SHA512 b9f4bdf2b19edc661c80b0c19b09979ad765e6a7f76e038436660d29bc05c2c9882c39f557aa407828ba2917632a9a0f6a96090279912e78f04b54ca2d9f14e7
 DIST mariadb-10.0.33.tar.gz 69211872 BLAKE2B 02efa97a75ff13655e9a6d6ba562c4d14bd749b4873ac2f783f32494104f00517c2af63805afa552b6ba707aa412d61b8b3561d5d4d534bf9ad5c6f67b33cfe4 SHA512 9369399553ab336ba1ab20393b69fe5ba49e88ff86d9a448034a9d521e8d85216eb1093e040dd893fc2fb15344da3d57995074bd489be66a3b1457abab097104
 DIST mariadb-10.0.34.tar.gz 69266294 BLAKE2B ee8157d1b4d5d4cc096159efb3a20321486092eb28f35d120ee99b2260e52f46d1803b62df29a4fc905de23aa009dbb4666e8457903d97d5fdb14dcbfdda4b2c SHA512 46539ef37ec3b2fb00e7d546f3bbfe48eb86d0403d33e50b1bca40c145d69ca3ac8ddaa72ddb0c1f0aa41f3177aedfe1c6c0bdb7949d47efe49aed3ed52bd47b
+DIST mariadb-10.0.35.tar.gz 66551252 BLAKE2B 69cc9c78f7c47a4b1760940cb0f395b4053fcc47c1087a0c2af873d4a998ee60915e1f4e64f7fe6474c7c1fa3dabe48a3b6621c67893b20526f01e56b0542e7a SHA512 01fc8d48be3f3847bb222835436ab938c6c5b5ac8ba6cc87b3b6d2a2201b7ab4b152dc1f7d9749c89de90097d50052714ac08aafbbb117fffac32bfb47e74779
 DIST mariadb-10.1.24.tar.gz 61780687 BLAKE2B 38df67a1b26aab559e41f44b129f2e57388634b80a8b10637744c3d11f9cad15329c9a1725cb836f7249352d5bdf9471bc9c3f254e1ef96229716543f235f7ed SHA512 0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c370340000209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9
 DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 40b94ed519522f16ee4687a9c569a0e52632d2aeccf65b87070de31118bf5e719cce78cf36afd4f1386166b14e418e0262ffbc3a61098c95e6ee101faf871ec5 SHA512 c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd
 DIST mariadb-10.1.31.tar.gz 67982786 BLAKE2B 1fabbea67345024157be4be34a50c4e9c73b1a60def452321b6e9209d9fb16aace92e7ab1c37c168e5c9f6c52b623245e9df3171ce3f84e8fd0e840948b3e57f SHA512 db37ddb8ae5daf35b37d5132860c19c4a9b51c40005d05c5107f956ac5b4ecd447375b6f3a09bf59ea5aef2f4009314ed6e969ca2ac516722702b4da286dbd89
 DIST mariadb-10.1.32.tar.gz 68001321 BLAKE2B 8ecdf12b10697576b3550d962c6090726f515e0f1f99f786e2b8882e1b81c053e9e43e423f83afd6955357ef85cd539db6fb1ff613d3c553f2f3801293c7ee07 SHA512 fcaeb8005b08b3ac5b7c070f07fe669593bd8a2eb8ea1bbdcb4d8e9ba4856420039f39542ecf920eec352ee4a26179899f9c6cb1f9f26040f557ae4b4b63660a
+DIST mariadb-10.1.33.tar.gz 65292094 BLAKE2B 3223f9476e946112f7c1d23cc82ff52636801244136343413ae00336173ec58bb4af8dc36e065f6cd27e9aa3f9f999b1d19f9257b928bd92555b34b614b9cf76 SHA512 1d30e06d0c19e338bfbbe6815cf5eee8e1b839b525950f7f54c7cf8f89034658a284df4756f54719ab0f55875546d4713b03bab7dd094ec13291732b069f737e
 DIST mariadb-10.2.14.tar.gz 72607526 BLAKE2B ca0c73e30e15265a7a1599d9bd4b64e030aaf92fcdbe18fda39eaf071c88c90b32a16ea5d9c63130e3853572a30a0c5870e6389e6dcb2a3eb690311cdb9bde3c SHA512 12195cc8c7a97619024d6b8b37558a43f4f543efff257a7a3dbb10e8a6e064ec2f0740554cf50cc83576b74ba355cf00f3c99855bc2bcf68b90c1fa90c850026
 DIST mariadb-10.3.6.tar.gz 71064269 BLAKE2B 681150a26de95cc276276a9b8d0b2c6e4a842dac80f20c2e8b0caeec5823cb956feffb494d18b1f2832e220c392c437424813de7720fb83a5d5c1fca71a4aef9 SHA512 cf146752be5857e702a3c88f42c7b6be3117bd92ac304eb217f902c1ffe478dc3043d3cf6a9a9305b51babb3bafc2612a8e4f5dfa7731cfa53634014d86438d1
 DIST mariadb-5.5.60.tar.gz 45822878 BLAKE2B 150a2d7108db2db18d66b56d961b05f8746f744e9453e341fde21f93bd846a3091a44c5df3baed6774d0ad12b8dc806b9bfdd177b4149f5be9d37af2a298f807 SHA512 eacf6ec57d46b00701b5038a67745174060d592b0e425466149c9a1b6dc1ac0659a36e57e82bf7e9f7865d8eac3dd50d0737630bd6220002d168b5b574437e4c
@@ -22,11 +24,13 @@ DIST mysql-extras-20180308-1938Z.tar.bz2 318238 BLAKE2B 003389434dc52d5e49be77d0
 EBUILD mariadb-10.0.30-r1.ebuild 6874 BLAKE2B f599097904869476a5a30ce264a2c27683ae1c59129bc6c4e4d73d5268fe5788027a2f9056309a9b97fa00881f63b7f8b88560f38272866d0d89767b10f602dd SHA512 370fa3e79b5aea1b89e2136da06a3d7b3a3bcfb49dfdcf030346764fbcee81b4c365e43be6a994e4bc6ad067aba126bd4be66ec94096dca25eb45b8fc0a136bd
 EBUILD mariadb-10.0.33.ebuild 6718 BLAKE2B 46e9980c6d4143e621aee1341b88b8021bc80e42faf54f0f7dd8a9c830ba88939a292016cf07c9e39a2c3c2addcd7de6d7724d3404cab8daae4002fa81a98f7f SHA512 f46c1b1e827d283d930ad6a4059b4d3e8f8ab5cf9bbf33c0f985646119b000eca0474f2447d0bf6dd22243b859de2496e29c5b9b862ab3f8610cf5fb3a674bcd
 EBUILD mariadb-10.0.34.ebuild 6719 BLAKE2B 207819cf6c1801e61b35d45f554398db561359cb0520dda02125e2dbe249ae44214cd35481cbd00bc71fc18a66eedacf6d290451a8e9658dfe259c6f6994e00e SHA512 151cb1497b83db5ead56643e41467469e1abd8390e30bac31a49d75889f4fc37c6a354f0f226f66f02feb36f558b43e7592ff718bca94c085da18e6674e40fab
-EBUILD mariadb-10.1.24-r1.ebuild 7175 BLAKE2B 6d92e08b3197423710e91f0f56e1fff64b694204e40d4a89ceeee742395965067f4ca4dd301a832db5db9804237e6f9aa5da2b6840fdddfc80aee768ce32c804 SHA512 3c164ee1598deb014be1dad3ab4f11d20e4a560cb19b34f407db51ddaedb7a24f8c9910a7d4f40adc6f552c9db5594248e273c8cca13e9a3a6cef26bd83b23c7
-EBUILD mariadb-10.1.29.ebuild 7305 BLAKE2B b5828f97361eb989638654f3399e1a036c12356c5cb90c2e62caf1055497b6f0e1c4f3587d1fe599d2da4cb1059c5aa676109e0aad88306d8136753c22c87854 SHA512 a0b25e416d701f557a017c4b6c454c6359406da3c43da0dda3c892020961b27888412582a892fedce4484c4412ce774fab45f868074b7ac053ba530339288337
-EBUILD mariadb-10.1.31-r1.ebuild 7804 BLAKE2B 67d90c7ef1ef2f1f93be7772a7d7495f0c7f3d24079ea2c4784357cd269b3e154a03ae9d9e96a68e10ee466adf41fdfaf509f3c7a497d990e1f38abcdab22d35 SHA512 b307c86ff8908afd2ad7b3969f7e98b3397407e0df669a1d0ae75d8a7cf29ba59c1ac556d182284f86fbb722f758f022e1877ec33ecfae449302448b803a0f18
-EBUILD mariadb-10.1.32.ebuild 7746 BLAKE2B e180454e92e0d59b5d4aa2c4bebd4df0e7dbdc4cee8f48b008efaba06086a7a221d89926356afc97187386527a332d7f59c0d15e1dbe8ae113050354026e4c72 SHA512 f54f62ac128d9b03bef2f67eb2e35cdcf85f22b212388263c86bbf16108196cb689c08f67d7fe2cc1c259921357bf6aac364954a321e45ff710fb58493399c85
-EBUILD mariadb-10.2.14.ebuild 32954 BLAKE2B e88b0bf8492b22ad896af8c2934c7d21433d9a6da44d8f0e9dd40395fdcaae7336833dbe1f26ca0ac407a8399e084e77dcdb1d48401478204a424b5c1533a2dc SHA512 a1ddf8ceabf13882ea2fd962181e0a7003b00211143b194ecfc3668ba8631db8ef1fde99b00527bdfede2225ddff75e6ee97afc082841075f56eafd27c79fe01
-EBUILD mariadb-10.3.6_rc.ebuild 33323 BLAKE2B 0619ee1f8972e1d3b56a20967494ef0f0cb512021452aba0d6c0e31828311864b989e1862efc754c6a184ab7d3dab4fae950b6ebc29f998d96c6a6bbb6397b8b SHA512 0d0e8e52c7c50a850c91896d5a7a53fc169803b3b5a3f141c42d9edc2d67e8fc1a2851c0e08e6fcaf721f53728d6d614c2e6228346efbc8b616ad69d18954d9a
+EBUILD mariadb-10.0.35.ebuild 6762 BLAKE2B 847296154e6ad3e3f4ec37bb773755cd395817a8360da0dbc8a7e2b54fd865dd548e65d6291bdde7001b0a8a4c7422538e02128a50562654f28a3a3e006953fc SHA512 80ada9ea2cdf2884b36e49c13d8161e0e2b099f7b2f727d2123a5f20404761ec60289b4b5dd5ac4283718ed231e2c22f4263feb694466b8c0421b9a51660ff0c
+EBUILD mariadb-10.1.24-r1.ebuild 7191 BLAKE2B 345cfd4108bc191b749989d44bcb39842225011411d7cc8ea55b85941affe2f12e938911b958f7223bd4fbd6cc8b88d1c972cfb6c586f1dbe42a9e78184e243a SHA512 50e37053275b85e2fb6464a6e1e81434ec365e4963bddd73037663f7878d4110b5bbac1700cc35c4c5c559cd5fe6de303b5f81718887fa655786bcc3209fd08e
+EBUILD mariadb-10.1.29.ebuild 7321 BLAKE2B 55e437ba42c4b02edb500952e54827c8a168c30e310ad1ca5373075a053dadcab325716bd2b9cea20d1fd8ee618604b45778e5fe7008a133dc7bf8bb20d4ab24 SHA512 e40f6a200fc6914603ff5b4ca8e4e4c645a169e79bc96904a67a264c0172b83b3c54ab4f8394ee7ccb560e468500692544201c07df97cf64c1907185fd3d4276
+EBUILD mariadb-10.1.31-r1.ebuild 7820 BLAKE2B 1e1ce7d9733467b79e71ca16f2d124f6644ff744b43734d20e104198e35259a2b736b9b7963ae9cd84d22279d5d0b00ecd3449671d20d7b66e95b02ffb0b7e87 SHA512 d74968950d6aeb0d37b406afb7e914cd9d071d51000a095c150068cec60fedd50356dc22b30705e016eb6b76062a05253e8272142922d500d978b4214b7e9b13
+EBUILD mariadb-10.1.32.ebuild 7762 BLAKE2B adcd84563e2e168b1a0b492b72e4c5db4268f89b4eef4a201f4e77e2c98a0d90c9587ea321783126dc99fd0addae1d6d69ab50f40b180da1ddc0b4546b68936d SHA512 7b673aaebe26d928a14dd7eee57cc6cfbbc549d4673e02dda9ccc91d9579f269f4e57146bc2dbcc5c32050459e8dea533d84f58c7655236865044fb1387cabcc
+EBUILD mariadb-10.1.33.ebuild 7802 BLAKE2B 20dda9f5fc8efe81c19784252fb13683933b79d2edd5e85703b2df42fbdb504b406327fa17a651f561c6aab5b9439bca69e260ca863ff050f41d849ca7243ad5 SHA512 f0b1447659f98f3f6b5867caa9623fa14e05a5a687a242e6d5f49738765e4cfdad56b118def26c831711d62988d77e5560bfc85762b4ffdf096d5e306f4e1d6d
+EBUILD mariadb-10.2.14.ebuild 32970 BLAKE2B 8b1ca349b93799a0ac273092287c0c5085aacd85badb16e6cb0cbc1f7acef22c57e6fffcec7497c5ab02932910db772f86159139d8cea0a597f40d087de0ceb0 SHA512 1a112e9401a9cb3fe458852816ca6a799d9941724ab989cdff3ca7f36661dcee99f0961b0bc773ae47a5d12bde5f809b1f6eb63a947b87331218a2faab55021a
+EBUILD mariadb-10.3.6_rc.ebuild 33339 BLAKE2B 5c62a08062212b83f649e2aaae97827b1323667a180a145ac4325ed7b8592576fe1f6e04ea3ab36a51d00a12918ba2bf1a095816ef7a760d32d7bbf07baf94e4 SHA512 515355b9b8c940407a2b2b3f2620480a0641059cbe93405825412108b39222d73a5e4857f9c8fe94c2dd9af971af65af79bddcc4130cc10090971d3650f3a65d
 EBUILD mariadb-5.5.60.ebuild 4254 BLAKE2B ee31137be4020cdb3626a93981eb2c667b4c9f8a543d52e272f4c2721f8ded71305a1caab6319a3a7cad25cbdf17a736abae3eb01062ffe5cc54c66da1b9703d SHA512 9d9ffc8ca65d6e4f7a64f4e6c1477096d46404d3a4401db1687ab5507452bbf4afb294667a2b01f7db8ba6953b8d935a40211fb006273462723846b960248920
 MISC metadata.xml 3172 BLAKE2B 9b546b51359c0881ee5ce452c89e788ff27300471433fb9d1eb28b3f72d47cd84787eac1d7fd536a8133aa56dd4dd9c1139afb4b3e83b463ce12b7d6cb0fa35f SHA512 143381d9443b778b4f8fb5545c6e8ac59e54eaba20458eecb757e292650a1fd5a470ded204f25c173f456cc222bd32f8b9885e00ecb00c9b4abfd639c9e98391
diff --git a/dev-db/mariadb/mariadb-10.0.35.ebuild b/dev-db/mariadb/mariadb-10.0.35.ebuild
new file mode 100644
index 000000000000..ae3a0089276b
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.35.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20170926-1321Z"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+PATCHES=(
+	"${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
+	"${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.33.patch"
+	"${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
+	"${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch"
+)
+COMMON_DEPEND="
+	!bindist? ( >=sys-libs/readline-4.1:0=	)
+	server? (
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+			sys-libs/zlib[minizip]
+		)
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( virtual/pam:0= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.41-r1:3=[${MULTILIB_USEDEP}]
+	openssl? ( !>=dev-libs/openssl-1.1 )
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+	${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+	/usr/include/mysql/private/probes_mysql_nodtrace.h
+	/usr/include/mysql/private/probes_mysql_dtrace.h )
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	mysql-multilib-r1_pkg_setup
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+	mysql-multilib-r1_pkg_preinst
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+	mysql-multilib-r1_src_prepare
+}
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+			-DWITH_PCRE=system
+	)
+	if use server ; then
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			MYSQL_CMAKE_NATIVE_DEFINES+=(
+				-DWITHOUT_FEDERATED=1
+				-DWITHOUT_FEDERATEDX=1 )
+		fi
+
+		# Connect with Zip is currently broken and does not compile
+		# Reported upstream https://jira.mariadb.org/browse/MDEV-11809
+
+		MYSQL_CMAKE_NATIVE_DEFINES+=(
+			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
+			$(mysql-cmake_use_plugin sphinx SPHINX)
+			$(mysql-cmake_use_plugin tokudb TOKUDB)
+			$(mysql-cmake_use_plugin pam AUTH_PAM)
+			$(mysql-cmake_use_plugin extraengine SEQUENCE)
+			$(mysql-cmake_use_plugin extraengine SPIDER)
+			$(mysql-cmake_use_plugin extraengine CONNECT)
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			-DWITHOUT_MROONGA=1
+		)
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if use server ; then
+
+		# Bug #213475 - MySQL _will_ object strenously if your machine is named
+		# localhost. Also causes weird failures.
+		[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might run out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql main.bootstrap
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+
+#main.bootstrap \
+		for t in connect.drop-open-error ; do
+#			main.mysql_client_test_comp \
+#			binlog.binlog_statement_insert_delayed main.information_schema \
+#			main.mysqld--help \
+#			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+#			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}" || die
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd || die
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mariadb/mariadb-10.1.24-r1.ebuild b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
index 6340ea651b31..1e63d720f7b6 100644
--- a/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
@@ -74,8 +74,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
 		virtual/perl-Time-HiRes )
 	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
 "
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
 
 MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
 	/usr/include/mysql/private/probes_mysql_nodtrace.h
diff --git a/dev-db/mariadb/mariadb-10.1.29.ebuild b/dev-db/mariadb/mariadb-10.1.29.ebuild
index 0d36f069a0e8..4418e76ddbe2 100644
--- a/dev-db/mariadb/mariadb-10.1.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.29.ebuild
@@ -76,8 +76,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
 		virtual/perl-Time-HiRes )
 	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
 "
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
 
 MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
 	/usr/include/mysql/private/probes_mysql_nodtrace.h
diff --git a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
index c8a9ce24bc7b..7b86ca62c035 100644
--- a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
@@ -79,8 +79,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
 		virtual/perl-Time-HiRes )
 	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
 "
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
 
 MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
 	/usr/include/mysql/private/probes_mysql_nodtrace.h
diff --git a/dev-db/mariadb/mariadb-10.1.32.ebuild b/dev-db/mariadb/mariadb-10.1.32.ebuild
index b0ac461ad4d9..c436772d9d76 100644
--- a/dev-db/mariadb/mariadb-10.1.32.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.32.ebuild
@@ -78,8 +78,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
 		virtual/perl-Time-HiRes )
 	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
 "
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
 
 MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
 	/usr/include/mysql/private/probes_mysql_nodtrace.h
diff --git a/dev-db/mariadb/mariadb-10.1.33.ebuild b/dev-db/mariadb/mariadb-10.1.33.ebuild
new file mode 100644
index 000000000000..ce4d15d2d12d
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.33.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180308-1938Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga numa odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch
+	"${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+	"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+	"${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch
+	"${MY_PATCH_DIR}"/20029_all_mariadb-10.1.31-enable-numa.patch
+)
+
+COMMON_DEPEND="
+	mroonga? ( app-text/groonga-normalizer-mysql )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	server? (
+		backup? ( app-arch/libarchive:0= )
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+			sys-libs/zlib[minizip]
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		numa? ( sys-process/numactl )
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( virtual/pam:0= )
+		systemd? ( sys-apps/systemd:= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.41-r1:3=
+	openssl? ( !>=dev-libs/openssl-1.1.0 )
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+	${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+	galera? (
+		sys-apps/iproute2
+		=sys-cluster/galera-${WSREP_REVISION}*
+		sst-rsync? ( sys-process/lsof )
+		sst-mariabackup? ( net-misc/socat[ssl] )
+		sst-xtrabackup? ( net-misc/socat[ssl] )
+	)
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+	/usr/include/mysql/private/probes_mysql_nodtrace.h
+	/usr/include/mysql/private/probes_mysql_dtrace.h )
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	mysql-multilib-r1_pkg_setup
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+	mysql-multilib-r1_pkg_preinst
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+	mysql-multilib-r1_src_prepare
+}
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+			-DWITH_PCRE=system
+	)
+	local MYSQL_CMAKE_EXTRA_DEFINES=(
+			-DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
+	)
+	if use server ; then
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			MYSQL_CMAKE_NATIVE_DEFINES+=(
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO )
+		fi
+
+		MYSQL_CMAKE_NATIVE_DEFINES+=(
+			-DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			# Build failure and autodep wrt bug 639144
+			-DCONNECT_WITH_MONGO=OFF
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga YES NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ $UID -eq 0 ]]; then
+		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+	# Enable parallel testing, auto will try to detect number of cores
+	# You may set this by hand.
+	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log}
+
+	# Run mysql tests
+	pushd "${TESTDIR}" || die
+
+	touch "${T}/disabled.def"
+	# These are failing in MariaDB 10.0 for now and are believed to be
+	# false positives:
+	#
+	# main.mysql_client_test, main.mysql_client_test_nonblock
+	# main.mysql_client_test_comp:
+	# segfaults at random under Portage only, suspect resource limits.
+
+	local t
+	for t in plugins.cracklib_password_check plugins.two_password_validations ; do
+		_disable_test  "$t" "False positive due to varying policies"
+	done
+
+	for t in main.mysql_client_test main.mysql_client_test_nonblock \
+		main.mysql_client_test_comp ; do
+			_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || eerror "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.14.ebuild
index d866c8cf098e..893927aa1797 100644
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.14.ebuild
@@ -140,11 +140,11 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 "
 # For other stuff to bring us in
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
 	!client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )
 	 server? ( ~virtual/mysql-5.6[static=]
-		 galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
+		 galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]] ; then
diff --git a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild b/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
index 420372960c2d..1f583f11a9d2 100644
--- a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
@@ -149,11 +149,11 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 "
 # For other stuff to bring us in
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
 	!client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )
 	 server? ( ~virtual/mysql-5.6[static=]
-		 galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
+		 galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]] ; then
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 46bae5cf636b..faf385eacd1c 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -15,27 +15,37 @@ AUX postgresql.service-9.6-r1 1477 BLAKE2B 2a652d5b2892f3a52f484fcc0b4f4dad09cf4
 AUX postgresql.tmpfiles 39 BLAKE2B 25a5725af53c8e4e4009887e998172dd863ce218a5438351194548c4fc8ea15308dfba3602d5a922cf49b46015198268a4a4528119d8a74dcef4cc4c1767c052 SHA512 498060f2a597cf374f4fb31deaa2d6c5b00edef68efc0e71b82bfc20b717ae12518ba18fcb455a0c518ebba1a0868f38321470616151d02fa79b889a66dcb9f8
 DIST postgresql-10.1.tar.bz2 19669989 BLAKE2B 2fbe782023b6d55c6fadaba38e517c60038b3b7b0a14fa8793043f7b9c4719a692440f286bb1f898045b5f56ef1c064f97f36e821990755077dc8d9bb0dbd639 SHA512 06050d353aa43f32e0de0199d833d8a4652aff893b718b1c40ed31837838f73fe4d977ac0f2164ab97b3eeff4aae3409f440601740898a893877d96bc0ed1882
 DIST postgresql-10.3.tar.bz2 19959653 BLAKE2B ba3b05f53b0f879b18d6d0649bf819697c77a066b49d941a96d13a4741854b01aeb0c8b868d6550a08ad52572c9463c968660aa83c16cbaa5b4bf7a89387a524 SHA512 05cf82d3483bdf38734e6ff0fef6b80e7f8fd3cb5ea6792ffe222a599d97d1a29638970bf28ebf5bd1f877e8dcd9986d88f5c5e5379e74fe79ce83e20d2babba
+DIST postgresql-10.4.tar.bz2 20201838 BLAKE2B 6d1cdc44547740c8f9fbc2e989364640409c6d2a365568b75731277dd0fba473ce07e2ee27e8ebfad507a6ce0ab3d3a44156c0e3a069d96d320771d8a97ba82f SHA512 b7c0d2fdc724e2eb1cda9fc1eb01b47352bbe6ba6357b3e898b7f5990fd78499c8c68dcb3aa9bde7821d71b5882d8856131384e899f8055d89d51cdfdbc9e663
 DIST postgresql-9.2.24.tar.bz2 16552576 BLAKE2B 15e1fcc72830630c6c919113ed53c30c08f97c2543e678cac914b86456434d036f2efc262810e8f7ca0be714a8f690592a271ea5f6fb39777e73e94a9555e0ee SHA512 a6f043e5ef5e12e23c1c43b26a5ecafce62f3a86f38b5b85e7cb0cb7aa376d40e460a526baf67ae40de40525e4744fb5e48650ee5e007db4ce9742fcf548bd56
 DIST postgresql-9.3.20.tar.bz2 17197360 BLAKE2B 2b07f6ee78294a490a8902d0129ac6b5e729e2d9a30631becc193cb7561294354a779ffc62bd61e807b1f540f01ce095e8ae4ad77adf2ea135389143809c9d48 SHA512 40098661bf00b64ad2d773b242613c44fe269b5ae984ad8990f85ce705b27138b127493c507103052fb6705d52f2e63a1df6692c7024d43c3c6b18154f2ef407
 DIST postgresql-9.3.22.tar.bz2 17022938 BLAKE2B 198705e438717d0d9e12c73e0c0e3eff0ba89ea50a1b183de70f065e13c153c164890fe56bc6ec13b0cb9617df4f66894c122eeddaf9303b9a02b8e08b19b085 SHA512 667ff496172626d2fe35c6795935fb07f4f7967a3b0631dd3b96278f8dc00b3d08794f091a5ab060a45d6f2a861e0f10f0e9660f9e343ab34eeabd693104c47f
+DIST postgresql-9.3.23.tar.bz2 17033683 BLAKE2B f02ad25f6b8755a9a57c3a6dcb63b78672e29473b061ad1616be2fb97fbfd83fe0dc9fc9fda66ac0231fb30fb13f9ef8975ba5a9701d83f33495bcf2c2651b4a SHA512 bb2d54312de728aa0379ea5bc6385036bbe69d3b7f85bbd78c210840eed19ace29840849caf38d0689e21130a0c94818a362b3927805d8eded53b68e240a52b0
 DIST postgresql-9.4.15.tar.bz2 17921677 BLAKE2B a41c81c7acc92265a6558c26370ff2afd258922a7158bbf40f8b1d6c7a3dbfb548502f42d646c96982dd5a87e5991f9d03046ae91e216704b97691666966d795 SHA512 be69f184cf18fb4c611d31a128f3593dc537551606f1db84a3ce9899b72f546876f05b29792435c3780c6c2b571759f4db2c172d62b2c012bd58574df80b4eb1
 DIST postgresql-9.4.17.tar.bz2 17807762 BLAKE2B 7640c29a71c6aeff47d9b43dd1e4f52edac4295b646b34da3a0ed9c26a8a826061bfd892e9907b62f31b7f01ee3aaf437c88d79b84d1d786d608dcd088309ecf SHA512 9ac03d460e521dcd142ac463dd5bb0f3e3f47333367bf8d61499ec7e8d0129d338c6f111667d0006df0c8ced9ae8a337d4c1b40eb5f55e6bc8dd5a24dfd376f0
+DIST postgresql-9.4.18.tar.bz2 17828085 BLAKE2B 346584e7d74264a7d58b3793cfd6247ae3cad3bb946bedec8df8d97278ffe6f8e881d31ad50e9f5d622aa4ae9b9711b36258bb60d520bb9a1d458af63c343e9e SHA512 2e64c3130c3dfc5183a77d72f61714bea34bfe549f55720eee25046e00b913a7effec3d7e43a021766ac957c1fa3c8c5e6c26ccbd8be1b434ae618e1fe9daab6
 DIST postgresql-9.5.10.tar.bz2 18701419 BLAKE2B bdd9a191f4de2ba1cb501476a5eabb377b60899b524f50e5baa1f47b95ce491634b7e69a9c37017614f48789d2b97fdff98e0b12ea06611d1ca76988a8db62c8 SHA512 24e31adabb0b88be882ab0440c560f0e4d5d69203be0581ca0ce22316555d92219ea0a2fd5254f12b2508bd3e58bbe0f1a7c8837228c96d9d5f00caac45af95a
 DIST postgresql-9.5.12.tar.bz2 18589538 BLAKE2B 4246eb2bf5fe2e3bb48bdc411ebd3c87015570f0be4d8b1ed2a0f2ed20a8374e3244fa0aa17f9145f4f951c88f5b0717a4dd2186bf1621ce3334789f5f8dd50f SHA512 ab81bc95fd587f76a1986db5616b63d861b84da0eb9e54478f5298248a81d7a608d1bb1a9e30662c8190d05630106ddb3bb6413c34b003de948417214d342654
+DIST postgresql-9.5.13.tar.bz2 18600185 BLAKE2B 7560f08648ec1417d304aa8c53c3220d7a4b2fdaf2cb4920a0196273466d1dbab4c12dbceb3dc9a136458c0089dd5f5dc595c95353584d49da0d2ab6e7903bba SHA512 807b22aabee38326934213de04b782a6b22cd8fe5c5bfd8b6cfa44281924527a715dcd78adbee276746446a7b05036b4714b00a16c650027543dcbafe1888082
 DIST postgresql-9.6.6.tar.bz2 19605724 BLAKE2B efdb13a4e32133b31a0ee368aed9bf76f0511596a2d77ade60129c2c76b0ba2c7dafad532cf09ae007d7110175a153968cfa151cf8aa7008b59d36ed00ed18ed SHA512 ac2f0fe6ef7c4e14f85cd7592d1306d9657b7f35efa6f43a089d7785ab970b8c25aa1e66d83df056c23513d6dbac0a9f54717b3d85758560d02e7f8141914ebc
 DIST postgresql-9.6.7.tar.bz2 19504886 BLAKE2B 04ed26987f3a38826b7e04bf364d8f59fc93aa700fdf74b4fc6afdb2fcf12697945c8354e49507af9c4d48fcc05173182cb164778c97845bf84250fd9e5ad882 SHA512 6a66cdd5b74ea6dc95628b89bb7663555370be56b3e938f635950628ad5d77443ac8f40c747be1fc1cfc19ca8b0a27f41e52fe4db83a43c7a7bab9bb076c7844
 DIST postgresql-9.6.8.tar.bz2 19528927 BLAKE2B 6aab5dbe4b13e1624befc33c2fa5241804dff71879e2d60c166db19c2fe015cd19cfc35054e6aede82bfe6b83a7146b6d2eedaabb94111c163da732526ff1723 SHA512 6b7595c0046308c725d77360b156e979d6bc469b78ac6500f631112f19b2607ca2d816781f8c5fd3bd835c48e079e79ada7af687fbd306a8fec5e160f20dd211
+DIST postgresql-9.6.9.tar.bz2 19566222 BLAKE2B e92a5ffaa8f4400364a174fc21ab11bb18c96dce9be721e6073ff7ad21b828859c2ac5fe8da81cad6a3d2a63a62d8fcb067d4bb02a9d23903525ad1f78955470 SHA512 3ce2a8f3a017d9c0bd0f1b475a9ee02bcb6a4119b0d436757911f444f49f5024bb1a1be07ce16a79e71af77799de1bf952b32279b4566bae075f23a50b8545c6
 EBUILD postgresql-10.1.ebuild 13697 BLAKE2B d356373a27d27fdd2447f93691847816fd089019206d7371cbd6c84a513b6d490b20278232769fe1de63d60d6bdd1e0ff9afce5fbf7b0da66296a57167d689df SHA512 65bbb3d9d6e64dbf46d8d24c0aacaa930c417b262fa01442cdb09820bf47d37e81fa272e5afe808cb96bd5a3fdad3d23540c1d08a2d5a8de8bb6e8f4b0a3db11
 EBUILD postgresql-10.3.ebuild 13691 BLAKE2B 8414d44a4af307caa14e06d3b34e631ff4a1ae5a1a5c9311dc57f5d97998f3743c9bab734d03d8246f6966b3e57f0df94f1c403e6247213fe160d65da781ffeb SHA512 582ae144d826eaf3bda9a8a170caf5b75d7e7fdf362e2f38e605e150b4978fea72be0f4b0e28b9a531aa3f88c3b4ed317e2fa1fa5f397b463a431f295964fb72
+EBUILD postgresql-10.4.ebuild 13698 BLAKE2B 1a836945073f8d6bbb1edec840a188e322765567463df31dbee81c18e1fdcf1f4d0a9165f7a9666efc94bd82cee4cdc5d17f87256a9867647908c1865ab60d7c SHA512 b6596e599263774973f38a5158d2e679e82b5081e685e60d186c36ecf564e1328d123e5f0b6e6849e66a9ba8dee810d8073482d86acc321117e3f9602e619a0b
 EBUILD postgresql-9.2.24.ebuild 13483 BLAKE2B ef135a71dfb8f2349c106ddfa34c164058567dbc516d269487dba7b686200ea43e22ca18d5259d6ec321bbff4eb3c369faab14bdce558ecbaed424469732f53e SHA512 0220041ff150b574f7b2a7de0aa902813251abc192521e343f17d8b4aba1cdfb4c95545c8432372dd6bbf0b16c9f0628079dcfadd1c519f840be9b51bbca5444
 EBUILD postgresql-9.3.20.ebuild 13742 BLAKE2B 8c6a98061068a6ee781f77fa994c683d80c2c7a1fc4ba7b7cf08a8a4932ff6b7d2522563a9da03b537034da7ecc84b3ab4974b5d1cbdbdab9d64f0e24779cc9c SHA512 21a54b6e8d4483bd15b464e6ab23cc04dbfe2b38fda30131b0d5c26a6cb156aca3ddd09b7228b32b64e4edadd9f24fe0a779efa9f04e633078a4153fcb11086f
 EBUILD postgresql-9.3.22.ebuild 13744 BLAKE2B 18192645bd6ca52355673ab8f9567293250fdc4c802165d78c61ba1d1a3a1b92e7e6c2a67fa1754e1ad800d792030d358bcdda99b52159d9cfaeb58e20ac4122 SHA512 3b5143ae3600b936124ca2a008c538e0563d08ccc589a3177fe0dc5d25c35b379b9d704dbede0cfedb0ffbb293515f4625701291df6f31cff376fcf39f6393ea
+EBUILD postgresql-9.3.23.ebuild 13751 BLAKE2B 1730adadd67e5b93b7d3e3dd8db055e5c7e3f7e91db5069dc29075c6ab2dd96fa70df8b1c579e66425deb6dff8c19edc11b29c9634b4b5d2480a12d68bdd283f SHA512 bf08d33c60165edc38490d72c3694f1cbef6410ba5ad15dd3688dc809a6f944c01deaef2e6b78028771997ff627868c115f37bd229f46a3d89f064702ae2e187
 EBUILD postgresql-9.4.15.ebuild 14552 BLAKE2B 5e343b4b7c24bfe2cab725491f41c4ec7eb12ca81595e268325adedad80e1266737ce3a18b5d4bd2dae8b3ebaf11b0ae55bed298aa9263eade7e2e7da00b3ff7 SHA512 afa0b8c349c8bd9c10b512f02c8dd16e6857d1a52acaa3ec7d695eb4ca3b7273c2cdcdc7b4b20f7c005570e4bdfd78126c890b6eaa60088ff9170cb5ec1b9595
 EBUILD postgresql-9.4.17.ebuild 14554 BLAKE2B e24143470f9844174c241473671f9b422a3080d740048b532e9dda0cc8f347cd087845b01014b8ca3f6a3f96ed8389ed5cffd9f83c0bde6adc95ad02361da842 SHA512 4a5fc54ceb68528483bac90469ce1fa009e49a4f5148426633fff9f9b96799c1cd18aeb514931963905cd81d876d9c952fddd84405562b1dfbf8054e4cacd76c
+EBUILD postgresql-9.4.18.ebuild 14561 BLAKE2B 5256dc5e253fc837649426959ba6a710ef3b2a234b4088b46db08a35b2bacf5d45fba2357bd66c5c6e11a9e138d71d5495806d544fa4b60aca0a554656df1a61 SHA512 40d3a1aed466df25a5c855c420bced8741bd0d7cde03693ab7325c3d24fa64fda20db15c49e5f5b84b84468990f07ce1fd233d3e52e9b1ab9d8f28a3dffac0e4
 EBUILD postgresql-9.5.10.ebuild 14780 BLAKE2B 988e6270060614715936959b06867137f0629884d98cb50643d7d0fc4314c8192fa4205125bb376b3d9ac8d0b17cbceabd89b79671e9bd78017ca13a7c40ecc2 SHA512 26f93ac88c51609e62ea3d2dce5dbbc63cf8ad52ac76f029a437befd907d17d5b343a77a651c362b3292f8cb81784c480febe3909431a2f24ac51b9335d0b149
 EBUILD postgresql-9.5.12.ebuild 14782 BLAKE2B 778b7eddd38fbd46b772d4b8c26d131d5ba74c2aed3a3b601151f97548947759b546b58d9d926c3e5309c0dfb29acad4cb5ae4c207c33ec6ef85b59af6fb590a SHA512 fc2d167d0058c1134d0e40b57e7ba22846307aa56e091467ed8ea339235c5728b9ed969aac6c55196201af83ebc38f4739f531a5e069e19ecb82ebfcf723072b
+EBUILD postgresql-9.5.13.ebuild 14789 BLAKE2B d58a0098ea848973501beaa11e1842ca3cb9b1a0885c13966b51c12d6631f7060fd078219472402f55068cbcc64028d021687d7251540da618b1fb5693951924 SHA512 42bb6d13163d4cbd9ccbbd6dd1089fe8174a84df3d37d6d2ffbc3c2d65036ffbf75a3c7e022419b2cba7de7b4d9226fa77fb3d7985f8a9c9bc4ff5ff94d3d795
 EBUILD postgresql-9.6.6.ebuild 14922 BLAKE2B 25182d0ccbf475123d876bc4ad825b9b5049b7bd8edd8e96ef7390ab8d371515df12cc95426ba503366e81fe04be01c3a4c40a688caeb60fdb972f8f5e7c8ec4 SHA512 385e3c883cfe4926be01f760205a4c0827f6f20c0e465a082cd474e7b68c2a9977a2ebe4acc90c04171ff32f265abedcd12d225dcc3215981fe59216b1dbf6a2
 EBUILD postgresql-9.6.7.ebuild 14927 BLAKE2B 1cba06e2425db4f19790ca672da27626850f16ca33b372ea140b561c65b8d5523657c4e88d82281cb551390f6247a79d3bbc2d859a28812d85c752fba1d2dc57 SHA512 6ba1b0fead0c121700f090c73e3d1b05faa8d69c4cb6f3fb73ec90fef20f0c7610c5adf0fea0c2934689ee9310aa2f975594198a5d434ab9ccf6f6a1159024cd
 EBUILD postgresql-9.6.8.ebuild 14924 BLAKE2B 8d176dcd6d821460338ee10e7ffcde99b7a41f65b934f0c71c4402239e848098af82fd81b3b37b0cc115b8c15378019028a5e8c7b5cc13cfbeb6e3cdc25ddc0b SHA512 23f6c89751d424c85b9babecd74a552af3d2edb65c6db079d2c3502aa7ecb42c476cb689fc1986fd65bffba52908fb13f3b36646417dc8174a50bb51ba6778f5
+EBUILD postgresql-9.6.9.ebuild 14931 BLAKE2B 4987e4eed2a0eda2fb2a6a997648e60dffcf80b3b3ed0e06ae9f20bcc4257b460fa4add991c3baf8785c0abe9a5cda6b5a50f668b94aed951be6c19e80d577cb SHA512 6b8a5982697a8b4dbf6722330829f260af5715925d68ab0a6190b0a16b7669eb947b81fe35f332c70122bb820bc8342bcdc92a7c3420e4a88da3122e27542824
 EBUILD postgresql-9999.ebuild 13544 BLAKE2B 2a1f9c50e21e7b9981adb38d18d4814903578a461d81f8a250fccc73b5680232f9d53d3c56486e65007b90a954f31939775ce5e4bcc621672e8b29e0ee332b0d SHA512 7c579c0a60b1e10e2d0c254fc9f60f2908db3634371d359c88ebf0acf581eaadf24ba5e8d3ee0ebd4aa05d840a97d0df74385578c0d792ee7ba87402b6931813
 MISC metadata.xml 751 BLAKE2B 4628a6d379a41b4646be34dfcfca2be58bc93b883ccd6f4d21a426aacb34dd7d5347c5f9d61f9211f4f91bff67d2d5935b203959ab0790c74031944a9ab799f6 SHA512 726f30ec991194427b2dbcdf650778dbe0f169cb305d569918404d403deef397aef7ec3f1a5269c15f7ec7fc5506dc534203323379f1d0acc475eeb8d75d0cf1
diff --git a/dev-db/postgresql/postgresql-10.4.ebuild b/dev-db/postgresql/postgresql-10.4.ebuild
new file mode 100644
index 000000000000..aeb8a7a0850f
--- /dev/null
+++ b/dev-db/postgresql/postgresql-10.4.ebuild
@@ -0,0 +1,460 @@
+# 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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT=$(get_major_version)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl python +readline
+	  selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+wanted_languages() {
+	local linguas="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru
+		sk sl sv tr zh_CN zh_TW"
+	local enable_langs lingua
+
+	for lingua in ${linguas} ; do
+		has ${lingua} ${LINGUAS-${lingua}} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-10.2-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.3.23.ebuild b/dev-db/postgresql/postgresql-9.3.23.ebuild
new file mode 100644
index 000000000000..9bd6eb22b922
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.3.23.ebuild
@@ -0,0 +1,450 @@
+# 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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+wanted_languages() {
+	local linguas="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru
+		sk sl sv tr zh_CN zh_TW"
+	local enable_langs lingua
+
+	for lingua in ${linguas} ; do
+		has ${lingua} ${LINGUAS-${lingua}} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		$(use_with uuid ossp-uuid) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT/.}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}tmp"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.2" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Find all of the slot-specific symlinks, if any, in /usr/bin (e.g.,
+	# /usr/bin/psql96). They may have been created by the
+	# postgresql.eselect module, but they're handled within this ebuild
+	# now. It's alright if we momentarily delete /usr/bin/psql as it
+	# will be recreated by the eselect module in pkg_ppostinst(). This
+	# is only necessary for 9.7 and earlier. 10 and later were never
+	# handled in this manner.
+	local canonicalise
+	if type -p realpath > /dev/null; then
+		canonicalise=realpath
+	elif type -p readlink > /dev/null; then
+		canonicalise='readlink -f'
+	else
+		# can't die, subshell
+		die "No readlink nor realpath found, cannot canonicalise"
+	fi
+
+	local l
+	# First remove any symlinks in /usr/bin that may have been created
+	# by the old eselect
+	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
+			rm "${l}" || ewarn "Couldn't remove ${l}"
+		fi
+	done
+
+	# Then move the symlinks created by the ebuild to their proper place.
+	for l in "${ED}"/usr/bin/*tmp ; do
+		mv "${l}" "${l%tmp}" \
+			|| ewarn "Couldn't rename $(basename ${l}) to $(basename ${l%tmp})"
+	done
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.4.18.ebuild b/dev-db/postgresql/postgresql-9.4.18.ebuild
new file mode 100644
index 000000000000..2f448ba1c0c0
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.4.18.ebuild
@@ -0,0 +1,482 @@
+# 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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+wanted_languages() {
+	local linguas="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru
+		sk sl sv tr zh_CN zh_TW"
+	local enable_langs lingua
+
+	for lingua in ${linguas} ; do
+		has ${lingua} ${LINGUAS-${lingua}} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-9.4.10-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT/.}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}tmp"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.2" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Find all of the slot-specific symlinks, if any, in /usr/bin (e.g.,
+	# /usr/bin/psql96). They may have been created by the
+	# postgresql.eselect module, but they're handled within this ebuild
+	# now. It's alright if we momentarily delete /usr/bin/psql as it
+	# will be recreated by the eselect module in pkg_ppostinst(). This
+	# is only necessary for 9.7 and earlier. 10 and later were never
+	# handled in this manner.
+	local canonicalise
+	if type -p realpath > /dev/null; then
+		canonicalise=realpath
+	elif type -p readlink > /dev/null; then
+		canonicalise='readlink -f'
+	else
+		# can't die, subshell
+		die "No readlink nor realpath found, cannot canonicalise"
+	fi
+
+	local l
+	# First remove any symlinks in /usr/bin that may have been created
+	# by the old eselect
+	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
+			rm "${l}" || ewarn "Couldn't remove ${l}"
+		fi
+	done
+
+	# Then move the symlinks created by the ebuild to their proper place.
+	for l in "${ED}"/usr/bin/*tmp ; do
+		mv "${l}" "${l%tmp}" \
+			|| ewarn "Couldn't rename $(basename ${l}) to $(basename ${l%tmp})"
+	done
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.5.13.ebuild b/dev-db/postgresql/postgresql-9.5.13.ebuild
new file mode 100644
index 000000000000..4e1148a89f37
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.5.13.ebuild
@@ -0,0 +1,488 @@
+# 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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+wanted_languages() {
+	local linguas="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru
+		sk sl sv tr zh_CN zh_TW"
+	local enable_langs lingua
+
+	for lingua in ${linguas} ; do
+		has ${lingua} ${LINGUAS-${lingua}} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-9.5.5-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT/.}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}tmp"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.2" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Find all of the slot-specific symlinks, if any, in /usr/bin (e.g.,
+	# /usr/bin/psql96). They may have been created by the
+	# postgresql.eselect module, but they're handled within this ebuild
+	# now. It's alright if we momentarily delete /usr/bin/psql as it
+	# will be recreated by the eselect module in pkg_ppostinst(). This
+	# is only necessary for 9.7 and earlier. 10 and later were never
+	# handled in this manner.
+	local canonicalise
+	if type -p realpath > /dev/null; then
+		canonicalise=realpath
+	elif type -p readlink > /dev/null; then
+		canonicalise='readlink -f'
+	else
+		# can't die, subshell
+		die "No readlink nor realpath found, cannot canonicalise"
+	fi
+
+	local l
+	# First remove any symlinks in /usr/bin that may have been created
+	# by the old eselect
+	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
+			rm "${l}" || ewarn "Couldn't remove ${l}"
+		fi
+	done
+
+	# Then move the symlinks created by the ebuild to their proper place.
+	for l in "${ED}"/usr/bin/*tmp ; do
+		mv "${l}" "${l%tmp}" \
+			|| ewarn "Couldn't rename $(basename ${l}) to $(basename ${l%tmp})"
+	done
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	if use alpha && use server ; then
+		ewarn "PostgreSQL 9.5+ no longer has native spinlock support on Alpha platforms."
+		ewarn "As a result, performance will be extremely degraded."
+	fi
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.6.9.ebuild b/dev-db/postgresql/postgresql-9.6.9.ebuild
new file mode 100644
index 000000000000..1d5a335c5909
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.6.9.ebuild
@@ -0,0 +1,493 @@
+# 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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+wanted_languages() {
+	local linguas="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru
+		sk sl sv tr zh_CN zh_TW"
+	local enable_langs lingua
+
+	for lingua in ${linguas} ; do
+		has ${lingua} ${LINGUAS-${lingua}} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+server? ( systemd? ( sys-apps/systemd ) )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-${SLOT}.3-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT/.}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}tmp"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Find all of the slot-specific symlinks, if any, in /usr/bin (e.g.,
+	# /usr/bin/psql96). They may have been created by the
+	# postgresql.eselect module, but they're handled within this ebuild
+	# now. It's alright if we momentarily delete /usr/bin/psql as it
+	# will be recreated by the eselect module in pkg_ppostinst(). This
+	# is only necessary for 9.7 and earlier. 10 and later were never
+	# handled in this manner.
+	local canonicalise
+	if type -p realpath > /dev/null; then
+		canonicalise=realpath
+	elif type -p readlink > /dev/null; then
+		canonicalise='readlink -f'
+	else
+		# can't die, subshell
+		die "No readlink nor realpath found, cannot canonicalise"
+	fi
+
+	local l
+	# First remove any symlinks in /usr/bin that may have been created
+	# by the old eselect
+	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
+			rm "${l}" || ewarn "Couldn't remove ${l}"
+		fi
+	done
+
+	# Then move the symlinks created by the ebuild to their proper place.
+	for l in "${ED}"/usr/bin/*tmp ; do
+		mv "${l}" "${l%tmp}" \
+			|| ewarn "Couldn't rename $(basename ${l}) to $(basename ${l%tmp})"
+	done
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index a3a19601d3d0..7a9d072f7495 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 086d3af7a38e..ee166bdc38db 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,26 +1,5 @@
-AUX sdcc-2.8.0-flags.patch 2103 BLAKE2B 1e03695a3cb6b1c86b05600b174f7e2e1a75f65a55afbcce048dc69d9fe1f853b977629f96f44410bcfe8eb3f26de686493c1b61b7d870df6961ca5c572bebd9 SHA512 a3a0a3768ac98cfcce3e660263a1f076cd50a557bf16b9f80fb20450875b7da16567f96b208acd77b73d669ac8a6a096d1e150f0bc0c7935b58642b30e7b74fe
-AUX sdcc-2.8.0-gcc44.patch 313 BLAKE2B 8f6ad6aa6e0c51dfe69e393fd9048a805060f92d72531d178265f3608f848a11c49288f019d1f17014e0bca5667ff3eac691f7f17cf77e0e665087ebc9b6f696 SHA512 6b1bbcd93153c099cc562f69fe8cff872b325af84bbcd0f96b2db834a2e4ff4ab1f33393b77e40c6a20744cf4d1aa89a4a536d52347cabc6ce4b5f93bdb366e5
-AUX sdcc-2.9.0-build.patch 2443 BLAKE2B 9c85d66a1ecd5cb14e055ff86b805348dd6162779a36e93d932d0a5009460e5d03f55811a5d3c23dac1342c03493f9a647c44d00bb4fad0c3d13ccab3d9fcf04 SHA512 8666e05a5992c586c1af71dfd4f6234a231641fb01c09ac3dce2c83d1c88a1228ebb7b2543fe8b47fbb6aead86d9f62c80f5031e6f6080ca70ae5779681ff1e8
-AUX sdcc-2.9.0-gcc44.patch 419 BLAKE2B c83a945fc00a1bab0454a2e257411d8d1c0c796c6082671f1f84a6538bb1ea76b39711fde3c81fdeed2a091e51a87395fa9aab37b5a35bf83b689f19178626a9 SHA512 161cf235fb17c73ffe1d8c8d54853f2743025a77a554d4623907e8199b3858f4fbae3a6f2657f88edf490e2655e908cc22c6d217de4f1c5f42d0743e310706c1
-AUX sdcc-2.9.0-getline.patch 308 BLAKE2B 70a02ab18dd9222a0e40ce455f98d5b6bfe467b493e24752695557306aba5b8438b4a80a1de228c599ca1e2ea2fa954e2eac64249da06f7fa37fabd47d6b01b9 SHA512 49c064d1d6253c248538ed199d2ad10e30fe3bc1df0d707f37f9c5780b55a3c418fa9d2e74e87cb60b2fafba6f074736e817d249846d2ebe927601edaeae5bfd
-AUX sdcc-2.9.0-headers.patch 7919 BLAKE2B fbef947a85b07a185a581b31d7d338047ffd5bc4510148c0ec2e694191798d42b7c6fc0be99118955a58bdf3da97f3c8f32b1dc9de34d04d03eb897250850b01 SHA512 93fa9c2fd1a6ac2a3c0f941535a3d545f25d6e315e720481cc30d3c7d1fd4d3043448413b541d6ebc6f87d49d331779fca807c23eee863c23c037e5379d3b36b
-DIST sdcc-doc-2.6.0.tar.gz 1026186 BLAKE2B 67c764db614240b8d870ae98c3e4eb0e85735ce42165a7c2d7fb929053008a9101d455e11d1a20ce8c4a3462200a0e7d0ba2ec5c7ea1a025d444772ac5fc1a02 SHA512 3cffb2ac4bbe65539951b134f89449341bff9f5682ec344c244b28efea5fe96c753caa873f26c75b8fc0a19f48404ae0a43f05e41eabafe66fd0f493b4065f97
-DIST sdcc-doc-2.7.0.tar.bz2 1211113 BLAKE2B 4435ba6e75e6037e1e267adca65ba029ccfc87a677fb7c13bc090c04a91485205def7f3e702c439b9b54514fc0fd14dd2175bcfff7c07933101b114b2fd9b6e8 SHA512 2ed6503551b7c9e3e674a3bf391e731c2fa838f3978761982ab1a072d47b449b73e6efe3b05967bcdfe623c2fc933503702912721b90df95dab9b332dfacad9a
-DIST sdcc-doc-2.8.0.tar.bz2 1363271 BLAKE2B 0dc5ea0d55cdfda2578324337fa43757fa256c064663b9cfbfa9eb098e8dcdc7a1472c2ab7288c478cbc515e3fd2b11acbaed49599f24376bf4bfcf537b8af02 SHA512 201fcb0ffb96649507dcb0489789e7a89cb30705e9eae3f40b6ce907df3464439488d1369f7d5557873e28bcd44a2af82bb3dab2f02adbf0d6ea88a711bb5d9b
-DIST sdcc-doc-2.9.0.tar.bz2 1388379 BLAKE2B 385b0a44adb55c09b54161b6f84c8c7f5b57dd3e1b525cdda7daef67dd4f75cabf62432038a30b06cd0045acf0da5c30eb1d0c76e3b35830ffc5492d54a3e25d SHA512 c0214437dada2d2acc3590d8a82b077cd841a93da7fe76cc259adea0da67e6ea0ced14dc80c5ce05261aa5d7e2f345f8cf994dafa4e38bd404b00fd6b5b2d168
-DIST sdcc-doc-20060502.tar.gz 1027650 BLAKE2B 104a5614870910a80ad83ee963f3e8636ca7064515905a3b05d3e80225f10bf81b05be88684cc6aaff788ae121003ff1b60a80c32081d52972e049f3ca652f38 SHA512 aba51493c76a019fb439fa8ff2f645bc519bdb9ded30a2871d51f2dd6eedc7315f826e28d5efed0eae731060c22b82071025cec5ae4407c5f6acdd2c18292ff2
 DIST sdcc-doc-3.5.0.tar.bz2 1000775 BLAKE2B 30cd31990788060ebc792d98b072d4d72ce72176bf09374084246bfe02a8164ab083fb9cfe7fb6ee246b523dce7163d494f2161eb7537f972408f03bc9541426 SHA512 43de0c19ad538b4495218b04e5ab6a886fd9945c8a82c400e9a53314547f5d6ab0529989274faecc2d954f35f8fe60f338f09f93536b62a305203d2119df597e
-DIST sdcc-src-2.6.0.tar.gz 4229518 BLAKE2B 3c30ed93154c86d8f4721917372bd850b957ed6408bf253051da42d4497637fe8c753a0a481dee07dfa51f289153936b7b5b2970e942d1aa698d01e00c9e8ab8 SHA512 d5802ad7804c771c25b72b5038cdc291d3e67a618fde6a9d03235954a6a133e0ecc42f26eabcc933806e54457e44efea81dc79ac03cb547556da41dec3eff1e6
-DIST sdcc-src-2.7.0.tar.bz2 3405687 BLAKE2B b7379f783cb1e805059210d46395fb5acfdd331249fef7aeeab66c6b3fcb95d77b7fa146d97b83d0c6659d83fe37734dfc4d7cb59fee3abd45d8e10271628f84 SHA512 95625aadf386f0da65f4ddb856fd7da8a333ed884e308993a0897a205561438b60d2836a60e33a849f6b6ab5dd938b822072641866596897f48fa62a4c536dd3
-DIST sdcc-src-2.8.0.tar.bz2 3460693 BLAKE2B 9481fa90dfa0fd0e84396f54795c78f7bc95b4f0c0220042fe5506b14193c6067f77f5a9b683fd9bebc0797a9d8c7a20f20cc7556c1853c84f39ed774a2b7f1e SHA512 91f43ea275f4c27e5c475a9dbfe5e9c7d5804a530151420473cbc65a48ca15c65a6e38628e0bf927d89cd8ddb6b6030d5d65aa9cba7963e23ac18bde42951fd5
-DIST sdcc-src-2.9.0.tar.bz2 3764926 BLAKE2B ec8289f5204e45e2fdd2ca379cad9e6f65749452888e3373bd073d25fda5df9dae3fe2663a1380b9d292754f318f84f506a73136f44df33d45f079ba5f5fa6c4 SHA512 0703f46db590fa3248c104d5045b0807fc18898aec13a8f5f762ff4e573f3fc199590050fd82c665ae71cd586081fe88db671dcc498770d736650be0dcf32b0e
-DIST sdcc-src-20060502.tar.gz 4145716 BLAKE2B 7f08dc0f04b3fc0b6b294b996901c32232547fb1d406d8bcba42b62eb4ec3db159a292c4eba18664653e30c71eddfc3efbcffbe92d1895f32085f1c90abad13c SHA512 0817f14871822874a3e4b5d8be68df56c7f19444c283d4cd4aa8436af6984631dd0f8322080380d227bbc8d931e6cbc84a81cfbced20cd56f2765cdaf1d552cd
 DIST sdcc-src-3.5.0.tar.bz2 10504517 BLAKE2B 16102ebd55026826100b453db20e00fa599ce6ad72f1466c32deb7211f09188048f35ac8ddd5987b7a3ad5fad79f2e2ee833da60e22a26b107c5e9e0e7c9be09 SHA512 a5842945da065ab566b7e073782e92f851da48c160990d49b76ab4773fe1c14286cab399fb7f2456432e4043ee7ce07c3b149aeb103c51f85a33fdc5f8798f4e
-EBUILD sdcc-2.5.0_p20060502.ebuild 1567 BLAKE2B db7eab4940b6d46bdace39c809b9dcf63bad2bb1d26bad80b7988f4dff5cc9859db70c17e5810ddb22ef2cad5b72100520a1b90d041757fc0e7c418ed9610d2d SHA512 e51ef7b32f6d36f4defdc0e4fb4aa1d1ac9f3abe6a53c24d27c7e3e93ec783708798fd7b6c1682b4602a11d38edc5d23ad6ca892e594ebbac90eaa76d8390c42
-EBUILD sdcc-2.6.0.ebuild 1468 BLAKE2B 10a84e0728ca0343981d6ff4cd22c9f2a336a27301e26518d7e80fc5473995b968a5c71adbb55b27a8a030a9d4a8b3d556aa4614ed401533baced48b92bdaeab SHA512 29d1801a05599bd0c310afd1b30025da520d4215018af8cb3f89398d839383fd24d5f300d67c051ab7563776d23d904a42d45957d2fd6fee050ef0b3f24aaa0f
-EBUILD sdcc-2.7.0.ebuild 1470 BLAKE2B ad8b6076b3ff33e857643f4ba06f5bbf4faccdadbb6a4160b37dce7ae9e36f76eec3cd4b2ccac05456b1043570e883f2331d639eec3ea7ae164656e68b201445 SHA512 de47f0fa86ed5b4a77814413a153dde896e306925315d7bfff6057ff219f5e592f5a99f8d0e924a11bcdd20ac6bd4deda29960385b8a1fe8ec2e03afd788253b
-EBUILD sdcc-2.8.0.ebuild 1980 BLAKE2B 775d37e432c98ec52cb4e765b53b38441d78c2a7c371bc29bb25d7937ebe95aa2f611296462771a9ea2e57d768b74cc4223de4f4a90efb109405624122c5b786 SHA512 d9b472c34c9b5dfe7534a186b45b7221cca26eef1df6fd7acc1de3ab5e3ca4b7720f6585366429570e2901f0456e523f824f44914b9af235c35d4c0655d2b0e5
-EBUILD sdcc-2.9.0.ebuild 2271 BLAKE2B 4a84bbdc52d067fc0b666d55f2d2f75b17d1713471d5186e611fb9a63ad8f2a5ff3270719aae6f5cbe727e321bc8d68b79a521d3de84a58b2aa269974f49f07c SHA512 db6d5ddeb10b3e6ff83e8a71ae1c4db4afd921774ea2f4a2068e993aed458d53a8274c04bfa8a7d09dce5199fed0cc833357104524c57715d41e1cdfcae5302f
 EBUILD sdcc-3.5.0.ebuild 3263 BLAKE2B e52602faa59a8fd9ca9303725dbc5e05f37d90278810eb8aaa8f3c50cf1812d0ecb82ed539a387271a882679a2e3e2632d6162a7a2d69b270d21a1b718665603 SHA512 9a0674bbaf3b347a81862dcdc88c418077f4fbab509b616c31973605a9941096646378ba84c23a7853d067c2b1d3dca27ee6f644de5e3fdcbc6e3c0fce4dfbf1
 EBUILD sdcc-9999.ebuild 3265 BLAKE2B dc989a0a9e967c92726eaddda5b485b4611be831e06b638f4d7f9b918ceb6ac505186ede1b6dbf13b8715842e6b6b57f9505f1961223760d35b187896dd99e37 SHA512 c0cb7a7361d6de1796beec9db92285aab07748ffb80b003811f3d29694a2cf084e3f1fcd7980cefeaf1d719e199ae64a6b364221bf05a8adf48c955090e4d409
 MISC metadata.xml 2212 BLAKE2B 23e83037b2a6e932760e7f0eafdd34230c035dd5a5833335db0ea9c4c1e04e62e69a920e2c2f3492d45ddc014c76450ad05b4d7794d66cca261e294ac20555a0 SHA512 4af2667ae3006548904e9e13894a49c277744d6876e0a99c99e8ea2e89c9e3fc277cf851ae0856b3c3b64f41ef7fd7c255f1bb4f9f42de8917aad7c59e25a0f0
diff --git a/dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch b/dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch
deleted file mode 100644
index cd920e988d9b..000000000000
--- a/dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -Nadur sdcc-orig/configure.in sdcc/configure.in
---- sdcc-orig/configure.in	2008-04-20 15:24:14.000000000 +0200
-+++ sdcc/configure.in	2008-04-20 15:27:18.000000000 +0200
-@@ -320,17 +320,6 @@
- M_OR_MM=$sdcc_cv_MM
- AC_SUBST(M_OR_MM)
- 
--# This is the first time when CFLAGS are set/modified!!
--adl_DD_COPT(CC, ggdb)
--if test "$sdcc_cv_CCggdb" = "yes"; then
--  CFLAGS="-ggdb ${CFLAGS}"
--fi
--
--adl_DD_COPT(CC, pipe)
--if test "$sdcc_cv_CCpipe" = "yes"; then
--  CFLAGS="-pipe $CFLAGS"
--fi
--
- 
- # Checks for typedefs, structures, and compiler characteristics.
- # ===========================================================================
-diff -Nadur sdcc-orig/debugger/mcs51/configure.in sdcc/debugger/mcs51/configure.in
---- sdcc-orig/debugger/mcs51/configure.in	2008-04-20 15:24:19.000000000 +0200
-+++ sdcc/debugger/mcs51/configure.in	2008-04-20 15:26:53.000000000 +0200
-@@ -148,17 +148,6 @@
- M_OR_MM=$sdcc_cv_MM
- AC_SUBST(M_OR_MM)
- 
--# This is the first time when CFLAGS are set/modified!!
--adl_DD_COPT(CC, ggdb)
--if test "$sdcc_cv_CCggdb" = "yes"; then
--  CFLAGS="-ggdb ${CFLAGS}"
--fi
--
--adl_DD_COPT(CC, pipe)
--if test "$sdcc_cv_CCpipe" = "yes"; then
--  CFLAGS="-pipe $CFLAGS"
--fi
--
- 
- # Set standard installation paths
- # ===========================================================================
-diff -Nadur sdcc-orig/sim/ucsim/configure.in sdcc/sim/ucsim/configure.in
---- sdcc-orig/sim/ucsim/configure.in	2008-04-20 15:24:11.000000000 +0200
-+++ sdcc/sim/ucsim/configure.in	2008-04-20 15:26:06.000000000 +0200
-@@ -514,28 +514,6 @@
- M_OR_MM=$ucsim_cv_MM
- AC_SUBST(M_OR_MM)
- 
--# This is the first time when CFLAGS are set/modified!!
--
--DD_COPT(CXX, ggdb)
--DD_COPT(CXX, gstabs)
--if test "$ucsim_cv_CXXgstabs" = "yes"; then
--   gopt="-gstabs+ -g3"
--elif test "$ucsim_cv_CXXggdb" = "yes"; then
--     gopt="-ggdb -g3"
--else
--     gopt="-g"
--fi
--if test "$CXXFLAGS"x = x ;then
--        CXXFLAGS="$gopt"
--else
--        CXXFLAGS="$CXXFLAGS $gopt"
--fi
--
--DD_COPT(CXX, pipe)
--if test "$ucsim_cv_CXXpipe" = "yes"; then
--  CXXFLAGS="$CXXFLAGS -pipe"
--fi
--
- PICOPT=""
- SHAREDLIB="no"
- DD_COPT_NO_IGNORE(CXX, fPIC)
diff --git a/dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch b/dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch
deleted file mode 100644
index 8d0ddf045195..000000000000
--- a/dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ur sdcc.orig/sim/ucsim/cmd.src/cmdlex.cc sdcc/sim/ucsim/cmd.src/cmdlex.cc
---- sdcc.orig/sim/ucsim/cmd.src/cmdlex.cc	2004-07-16 19:32:30.000000000 +0300
-+++ sdcc/sim/ucsim/cmd.src/cmdlex.cc	2009-08-10 11:09:58.000000000 +0300
-@@ -1,3 +1,5 @@
-+#include <stdio.h>
-+
- #line 2 "cmdlex.cc"
- 
- #line 4 "cmdlex.cc"
diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch
deleted file mode 100644
index b944b00d83a5..000000000000
--- a/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-fix parallel build issues
-
---- sdcc/device/lib/Makefile.in
-+++ sdcc/device/lib/Makefile.in
-@@ -347,37 +347,21 @@
- 	  cp -f $(PORT)/bin/*.* $(SDCCPORTDIR); \
- 	fi
- 
--$(LIB_FILES): $(OBJECTS_FLOAT) $(OBJECTS_INT) $(OBJECTS_LONG) $(OBJECTS_SDCC)
- ifeq ($(LIB_TYPE), SDCCLIB)
--	../../bin/sdcclib -a $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
--	../../bin/sdcclib -a $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT)
--	../../bin/sdcclib -a $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG)
--	../../bin/sdcclib -a $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
-+mklib = ../../bin/sdcclib -a $@ $^
- else ifeq ($(LIB_TYPE), AR)
--	ar -Scq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
--	ar -Scq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT)
--	ar -Scq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG)
--	ar -Scq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
-+mklib = ar -Scq $@ $^
- else ifeq ($(LIB_TYPE), RANLIB)
--	ar -Scq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libfloat.lib
--	ar -Scq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libint.lib
--	ar -Scq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/liblong.lib
--	ar -Scq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libsdcc.lib
-+mklib = ar -Scq $@ $^ && $(top_builddir)/bin/asranlib $@
- else
--	rm -f $(SDCCPORTDIR)/libfloat.lib
--	for i in $(notdir $(basename $(OBJECTS_FLOAT))); do echo $$i >> $(SDCCPORTDIR)/libfloat.lib; done
--	cp $(OBJECTS_FLOAT) $(SDCCPORTDIR)
--	rm -f $(SDCCPORTDIR)/libint.lib
--	for i in $(notdir $(basename $(OBJECTS_INT))); do echo $$i >> $(SDCCPORTDIR)/libint.lib; done
--	cp $(OBJECTS_INT) $(SDCCPORTDIR)
--	rm -f $(SDCCPORTDIR)/liblong.lib
--	for i in $(notdir $(basename $(OBJECTS_LONG))); do echo $$i >> $(SDCCPORTDIR)/liblong.lib; done
--	cp $(OBJECTS_LONG) $(SDCCPORTDIR)
--	rm -f $(SDCCPORTDIR)/libsdcc.lib
--	for i in $(notdir $(basename $(OBJECTS_SDCC))); do echo $$i >> $(SDCCPORTDIR)/libsdcc.lib; done
--	cp $(OBJECTS_SDCC) $(SDCCPORTDIR)
-+mklib = for i in $(notdir $(basename $^)); do echo $$i; done >> $@; cp $^ $(SDCCPORTDIR)
- endif
- 
-+$(SDCCPORTDIR)/libfloat.lib: $(OBJECTS_FLOAT); $(mklib)
-+$(SDCCPORTDIR)/libint.lib: $(OBJECTS_INT); $(mklib)
-+$(SDCCPORTDIR)/liblong.lib: $(OBJECTS_LONG); $(mklib)
-+$(SDCCPORTDIR)/libsdcc.lib: $(OBJECTS_SDCC); $(mklib)
-+
- clean_intermediate:
- 	rm -f $(SDCCPORTDIR)/*.lst $(SDCCPORTDIR)/*.sym
- 
diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch
deleted file mode 100644
index fb4ac7918c51..000000000000
--- a/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-like fix already in upstream
-
-* sim/ucsim/cmd.src/cmdlex.cc: regenerated,
-  fix for parch #3038644: Fix for GCC-4.4 compile error
-
---- trunk/sdcc/sim/ucsim/cmd.src/cmdlex.cc	2010/08/04 15:21:39	5910
-+++ trunk/sdcc/sim/ucsim/cmd.src/cmdlex.cc	2010/08/04 17:17:09	5911
-@@ -85,6 +85,7 @@
- #include <errno.h>
- #include <cstdlib>
- #include <cstring>
-+#include <cstdio>
- /* end standard C++ headers. */
- 
- #ifdef __cplusplus
diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch
deleted file mode 100644
index f7ca6237cf57..000000000000
--- a/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-upstream has reworked their code, so just do a minimal hack for the older ver
-
-http://bugs.gentoo.org/270621
-
---- sdcc/as/link/getline.h
-+++ sdcc/as/link/getline.h
-@@ -30,6 +30,9 @@
- 
- #include <stdio.h>
- 
-+#undef getline	/* just in case */
-+#define getline sdcc_getline
-+
- #ifdef __cplusplus
- extern "C"
- {
diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch
deleted file mode 100644
index 58d10299aa8f..000000000000
--- a/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-fix from upstream for implicit decls
-
---- trunk/sdcc/debugger/mcs51/sdcdb.c	2009/09/20 11:50:19	5517
-+++ trunk/sdcc/debugger/mcs51/sdcdb.c	2010/04/14 16:18:37	5813
-@@ -34,6 +34,10 @@
- #include <readline/readline.h>
- #include <readline/history.h>
- #endif  /* HAVE_LIBREADLINE */
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <sys/wait.h>
- 
- #ifdef SDCDB_DEBUG
- int   sdcdbDebug = 0;
-@@ -1609,7 +1609,7 @@ static void parseCmdLine (int argc, char **argv)
-             }
- 
-             if (strncmp(argv[i],"-cd=",4) == 0) {
--                chdir(argv[i][4]);
-+                chdir(&argv[i][4]);
-                 continue;
-             }
- 
---- trunk/sdcc/debugger/mcs51/config.h.in
-+++ trunk/sdcc/debugger/mcs51/config.h.in
-@@ -15,6 +15,10 @@
- 
- #undef HAVE_LIBREADLINE
- 
-+#undef HAVE_UNISTD_H
-+
-+#undef HAVE_SYS_WAIT_H
-+
- #endif
- 
- /* End of config.h */
-
-fix from upstream for collision between "link" in unistd.h and local "link"
-
---- trunk/sdcc/debugger/mcs51/symtab.h	2006/09/16 14:10:20	4379
-+++ trunk/sdcc/debugger/mcs51/symtab.h	2010/04/14 16:18:37	5813
-@@ -106,13 +106,13 @@
-     short    num_elem;     /* # of elems if type==array  */
-     short    ptr_const :1;   /* pointer is constant        */
-     short    ptr_volatile:1; /* pointer is volatile        */
--    struct link *tspec;     /* pointer type specifier      */
-+    struct st_link *tspec;     /* pointer type specifier      */
- } declarator ;
- 
- #define DECLARATOR   0
- #define SPECIFIER    1
- 
--typedef struct link {
-+typedef struct st_link {
-     unsigned class : 1      ;  /* DECLARATOR or SPECIFIER    */
-     unsigned tdef  : 1      ;  /* current link created by    */
-     /* typedef if this flag is set*/
-@@ -121,8 +121,8 @@
-         declarator     d     ;  /* if CLASS == DECLARATOR     */
-     } select ;
- 
--    struct link    *next    ;  /* next element on the chain  */
--} link ;
-+    struct st_link    *next    ;  /* next element on the chain  */
-+} st_link ;
- 
- typedef struct symbol {
-     char     *name               ;
-@@ -136,8 +136,8 @@
-     unsigned addr               ;  /* address if the symbol */
-     unsigned eaddr              ;  /* end address for functions */
-     char     addr_type          ;  /* which address space   */
--    link     *type              ;  /* start of type chain        */
--    link     *etype             ;  /* end of type chain          */
-+    st_link  *type              ;  /* start of type chain        */
-+    st_link  *etype             ;  /* end of type chain          */
-     char     scopetype         ;  /* 'G' global, 'F' - file, 'L' local */
-     char     *sname             ;  /* if 'F' or 'L' then scope name */
-     char     *rname             ;  /* real name i.e. mangled beyond recognition */
-@@ -242,6 +242,6 @@
- DEFSETFUNC(moduleWithName);
- DEFSETFUNC(moduleWithCName);
- DEFSETFUNC(moduleWithAsmName);
--unsigned int getSize (link *);
-+unsigned int getSize (st_link *);
- 
- #endif
-	
---- a/sdcc/debugger/mcs51/symtab.c
-+++ b/sdcc/debugger/mcs51/symtab.c
-@@ -31,7 +31,7 @@ DEFSETFUNC(symWithRName);
- /*------------------------------------------------------------------*/
- /* getSize - returns size of a type chain in bits                   */
- /*------------------------------------------------------------------*/
--unsigned int   getSize ( link *p )
-+unsigned int   getSize ( st_link *p )
- {
-     /* if nothing return 0 */
-     if ( ! p )
-@@ -127,8 +127,8 @@ static char  *parseTypeInfo (symbol *sym, char *s)
-     /* bp now points to '}' ... go past it */
-     s = ++bp;
-     while (*s != ')') { /* till we reach the end */
--        link *type;
--        type = Safe_calloc(1,sizeof(link));
-+        st_link *type;
-+        type = Safe_calloc(1,sizeof(st_link));
-         if (*s == ',') s++;
- 
-         /* is a declarator */
---- a/sdcc/debugger/mcs51/cmd.c
-+++ b/sdcc/debugger/mcs51/cmd.c
-@@ -327,8 +327,8 @@ static char *warranty=
- "POSSIBILITY OF SUCH DAMAGES.\n";
- #endif
- 
--static void printTypeInfo(link *);
--static void printValAggregates (symbol *,link *,char,unsigned int,int);
-+static void printTypeInfo(st_link *);
-+static void printValAggregates (symbol *,st_link *,char,unsigned int,int);
- static  int printOrSetSymValue (symbol *sym, context *cctxt,
-                                 int flg, int dnum, int fmt,
-                                 char *rs, char *val, char cmp);
-@@ -2323,7 +2323,7 @@ int cmdListSrc (char *s, context *cctxt)
-     return 0;
- }
- 
--static unsigned long getValBasic(symbol *sym, link *type, char *val)
-+static unsigned long getValBasic(symbol *sym, st_link *type, char *val)
- {
-     char *s;
-     union
-@@ -2347,7 +2347,7 @@ static unsigned long getValBasic(symbol *sym, link *type, char *val)
-     {
-             if (IS_INTEGRAL(type))
-         {
--            link *etype;
-+            st_link *etype;
-             if ( type->next )
-                 etype = type->next;
-             else
-@@ -2460,7 +2460,7 @@ static void printFmtInteger(char *deffmt,int fmt, long val,
- /*-----------------------------------------------------------------*/
- /* printValBasic - print value of basic types                      */
- /*-----------------------------------------------------------------*/
--static void printValBasic(symbol *sym, link *type,
-+static void printValBasic(symbol *sym, st_link *type,
-                           char mem, unsigned addr,int size, int fmt)
- {
-     union {
-@@ -2484,7 +2484,7 @@ static void printValBasic(symbol *sym, link *type,
-         else
-         if (IS_INTEGRAL(type))
-         {
--            link *etype;
-+            st_link *etype;
-             if ( type->next )
-                 etype = type->next;
-             else
-@@ -2534,10 +2534,10 @@ static void printValFunc (symbol *sym, int fmt)
- /*-----------------------------------------------------------------*/
- /* printArrayValue - will print the values of array elements       */
- /*-----------------------------------------------------------------*/
--static void printArrayValue (symbol *sym,  link *type,
-+static void printArrayValue (symbol *sym,  st_link *type,
-                              char space, unsigned int addr, int fmt)
- {
--        link *elem_type = type->next;
-+        st_link *elem_type = type->next;
-         int i;
- 
-         fprintf(stdout,"{");
-@@ -2558,7 +2558,7 @@ static void printArrayValue (symbol *sym,  link *type,
- /*-----------------------------------------------------------------*/
- /* printStructValue - prints structures elements                   */
- /*-----------------------------------------------------------------*/
--static void printStructValue (symbol *sym, link *type,
-+static void printStructValue (symbol *sym, st_link *type,
-                               char space, unsigned int addr, int fmt)
- {
-         symbol *fields = SPEC_STRUCT(type)->fields;
-@@ -2581,7 +2581,7 @@ static void printStructValue (symbol *sym, link *type,
- /*-----------------------------------------------------------------*/
- /* printValAggregates - print value of aggregates                  */
- /*-----------------------------------------------------------------*/
--static void printValAggregates (symbol *sym, link *type,
-+static void printValAggregates (symbol *sym, st_link *type,
-                                 char space,unsigned int addr, int fmt)
- {
- 
-@@ -2606,7 +2606,7 @@ static int printOrSetSymValue (symbol *sym, context *cctxt,
-     static char fmtChar[] = " todx ";
-     static int stack = 1;
-         symbol *fields;
--    link *type;
-+    st_link *type;
-     unsigned int  addr;
-     int size, n;
-     char *s, *s2;
-@@ -2808,7 +2808,7 @@ static void printStructInfo (structdef *sdef)
- /*-----------------------------------------------------------------*/
- /* printTypeInfo - print out the type information                  */
- /*-----------------------------------------------------------------*/
--static void printTypeInfo(link *p)
-+static void printTypeInfo(st_link *p)
- {
-     if (!p)
-         return ;
diff --git a/dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild b/dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild
deleted file mode 100644
index bac1374e0bf5..000000000000
--- a/dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_PV=${PV/*_p/}
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-SRC_URI="http://sdcc.sourceforge.net/snapshots/sdcc-src/${PN}-src-${MY_PV}.tar.gz
-	doc? ( http://sdcc.sourceforge.net/snapshots/docs/${PN}-doc-${MY_PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND=">=dev-embedded/gputils-0.13.2
-	dev-libs/boehm-gc"
-RDEPEND="!dev-embedded/sdcc-svn
-	!dev-embedded/sdcc-svn"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix conflicting variable names between Gentoo and sdcc
-	find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g  {} \; || die "sed failed"
-	find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g  {} \; || die "sed failed"
-	find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g  {} \; || die "sed failed"
-
-	# --as-needed fix :
-	sed -i -e "s/= @CURSES_LIBS@ @LIBS@/= @CURSES_LIBS@ @LIBS@ -lcurses/" sim/ucsim/gui.src/serio.src/Makefile.in || die "sed failed"
-}
-
-src_compile() {
-	econf --enable-libgc docdir=/usr/share/doc/${PF} || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	dodoc ChangeLog
-	if use doc ; then
-		cp -pPR "${WORKDIR}"/doc/* "${D}"/usr/share/doc/${PF}/
-	fi
-	find "${D}"/usr/share/doc/${PF}/ -name *.txt -exec gzip -f -9 {} \;
-	find "${D}"/usr/share/doc/${PF}/ -name */*.txt -exec gzip -f -9 {} \;
-}
diff --git a/dev-embedded/sdcc/sdcc-2.6.0.ebuild b/dev-embedded/sdcc/sdcc-2.6.0.ebuild
deleted file mode 100644
index ce41e43289bc..000000000000
--- a/dev-embedded/sdcc/sdcc-2.6.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.gz
-	doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-embedded/gputils-0.13.2
-	dev-libs/boehm-gc"
-RDEPEND="!dev-embedded/sdcc-svn"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix conflicting variable names between Gentoo and sdcc
-	find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g  {} \; || die "sed failed"
-	find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g  {} \; || die "sed failed"
-	find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g  {} \; || die "sed failed"
-
-	# --as-needed fix :
-	sed -i -e "s/= @CURSES_LIBS@ @LIBS@/= @CURSES_LIBS@ @LIBS@ -lcurses/" sim/ucsim/gui.src/serio.src/Makefile.in || die "sed failed"
-}
-
-src_compile() {
-	econf --enable-libgc docdir=/usr/share/doc/${PF} || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	dodoc ChangeLog
-	if use doc ; then
-		cp -pPR "${WORKDIR}"/doc/* "${D}"/usr/share/doc/${PF}/
-	fi
-	find "${D}"/usr/share/doc/${PF}/ -name *.txt -exec gzip -f -9 {} \;
-	find "${D}"/usr/share/doc/${PF}/ -name */*.txt -exec gzip -f -9 {} \;
-}
diff --git a/dev-embedded/sdcc/sdcc-2.7.0.ebuild b/dev-embedded/sdcc/sdcc-2.7.0.ebuild
deleted file mode 100644
index 089966f34339..000000000000
--- a/dev-embedded/sdcc/sdcc-2.7.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-embedded/gputils-0.13.2
-	dev-libs/boehm-gc"
-RDEPEND="!dev-embedded/sdcc-svn"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix conflicting variable names between Gentoo and sdcc
-	find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g  {} \; || die "sed failed"
-	find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g  {} \; || die "sed failed"
-	find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g  {} \; || die "sed failed"
-
-	# --as-needed fix :
-	sed -i -e "s/= @CURSES_LIBS@ @LIBS@/= @CURSES_LIBS@ @LIBS@ -lcurses/" sim/ucsim/gui.src/serio.src/Makefile.in || die "sed failed"
-}
-
-src_compile() {
-	econf --enable-libgc docdir=/usr/share/doc/${PF} || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	dodoc ChangeLog
-	if use doc ; then
-		cp -pPR "${WORKDIR}"/doc/* "${D}"/usr/share/doc/${PF}/
-	fi
-	find "${D}"/usr/share/doc/${PF}/ -name *.txt -exec gzip -f -9 {} \;
-	find "${D}"/usr/share/doc/${PF}/ -name */*.txt -exec gzip -f -9 {} \;
-}
diff --git a/dev-embedded/sdcc/sdcc-2.8.0.ebuild b/dev-embedded/sdcc/sdcc-2.8.0.ebuild
deleted file mode 100644
index 0694d18904a7..000000000000
--- a/dev-embedded/sdcc/sdcc-2.8.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boehm-gc doc"
-
-DEPEND=">=dev-embedded/gputils-0.13.2
-	boehm-gc? ( dev-libs/boehm-gc )"
-RDEPEND="!dev-embedded/sdcc-svn"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix conflicting variable names between Gentoo and sdcc
-	find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g  {} \; || die "sed failed"
-	find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g  {} \; || die "sed failed"
-	find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g  {} \; || die "sed failed"
-
-	# Fix automagic C{,XX}FLAGS
-	epatch "${FILESDIR}"/${P}-flags.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-
-	# We'll install doc manually
-	sed -i -e '/SDCC_DOC/d' Makefile.in || die "sed failed"
-	sed -i -e 's/all install-doc/all/' as/Makefile.in || die "sed failed"
-	sed -i -e 's/ doc//' sim/ucsim/packages_in.mk || die "sed failed"
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable boehm-gc libgc) \
-		--disable-doc \
-		|| die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-
-	insinto /usr/share/doc/${PF}
-	if use doc ; then
-		cd "${WORKDIR}"/doc
-		dohtml -r *.html ucsim
-		rm -rf *.html ucsim
-		dohtml as/asxhtm.html
-		rm -f as/asxhtm.html
-		rm -f INSTALL.txt
-	else
-		dohtml as/doc/asxhtm.html
-		rm -f as/doc/asxhtm.html
-		mv as/doc as/as || die "Failed to rename as/doc"
-		doins -r as/as
-		mv sim/ucsim/doc sim/ucsim/ucsim || die "Failed to rename sim/ucsim/doc"
-		dohtml -r sim/ucsim/ucsim
-		rm -f INSTALL.txt Makefile* *.mk
-		cd doc
-	fi
-	doins -r *
-	prepalldocs
-}
diff --git a/dev-embedded/sdcc/sdcc-2.9.0.ebuild b/dev-embedded/sdcc/sdcc-2.9.0.ebuild
deleted file mode 100644
index 2a6ad593874e..000000000000
--- a/dev-embedded/sdcc/sdcc-2.9.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
-	inherit subversion autotools
-	docs_compile() { return 0; }
-else
-	SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
-		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~amd64 ~x86"
-	docs_compile() { return 1; }
-fi
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+boehm-gc doc"
-RESTRICT="strip"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline
-	>=dev-embedded/gputils-0.13.7
-	boehm-gc? ( dev-libs/boehm-gc )
-	!dev-embedded/sdcc-svn"
-DEPEND="${RDEPEND}"
-if docs_compile ; then
-	DEPEND+="
-		doc? (
-			>=app-office/lyx-1.3.4
-			dev-tex/latex2html
-		)"
-fi
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	# Fix conflicting variable names between Gentoo and sdcc
-	find \
-		'(' -name 'Makefile*.in' -o -name configure ')' \
-		-exec sed -r -i \
-			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
-			{} + || die
-
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	epatch "${FILESDIR}"/${P}-getline.patch
-	epatch "${FILESDIR}"/${P}-headers.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-
-	# We'll install doc manually
-	sed -i -e '/SDCC_DOC/d' Makefile.in || die
-	sed -i -e 's/all install-doc/all/' as/Makefile.in || die
-	sed -i -e 's/ doc//' sim/ucsim/packages_in.mk || die
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	ac_cv_prog_STRIP=true \
-	econf \
-		$(use_enable boehm-gc libgc) \
-		$(docs_compile && use_enable doc || echo --disable-doc)
-}
-
-fsrc_compile() {
-	emake || die
-	if docs_compile && use doc ; then
-		cd doc
-		local d
-		for d in cdbfileformat sdccman test_suite_spec ; do
-			lyx -e html ${d} || die
-		done
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc doc/*.txt doc/*/*.txt
-	find "${D}" -name .deps -exec rm -rf {} +
-
-	if use doc ; then
-		docs_compile || cd "${WORKDIR}"/doc
-		dohtml -r *
-	fi
-
-	# a bunch of archives (*.a) are built & installed by gputils
-	# for PIC processors, but they do not work with standard `ar`
-	# & `scanelf` utils and they're not for the host.
-	env RESTRICT="" prepstrip "${D%/}"/usr/bin
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a6104a50c139..195a517549aa 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/bff/Manifest b/dev-lang/bff/Manifest
index 51e24101caa6..5caa08a1fc13 100644
--- a/dev-lang/bff/Manifest
+++ b/dev-lang/bff/Manifest
@@ -2,5 +2,5 @@ DIST bff-1.0.3.1.tar.gz 2617 BLAKE2B 30a23882fe0d7740bfe0a3e2d75e91130feb4b3da69
 DIST bff-1.0.5.tar.gz 4833 BLAKE2B 9e3b44da9cd001552119e25764b171c86027755583f79a13b1d1035ecbab134df0aa31234c1479370599dd56a76a7f1c67eff61d2c1189430bab6a9a22f629d8 SHA512 78e481f6f371421ce6f046041fe6d48be2e11000ddda82f60244c0100665469c4aff4f151d297bb533140d723f68d5a3844e0c29a256b022ac93cafbd2abe9fd
 DIST mandelbrot.b 11669 BLAKE2B 7f128f7a30faa7d445353da5305424b7a6fa8f8048c955680411bbfda136796721111bd0824e72f679ec83d22c3865866c57b5b272440b5318b090facdb35706 SHA512 3a1950f8be61fd33e563fe17dbc1297deae3ec2d276a6895e4bbb7d55c5bcf33ec7e9024d9776ad5c9c29b25c55bd08dea71403a60f9478fb3b80c22303d0862
 EBUILD bff-1.0.3.1.ebuild 908 BLAKE2B 5fab650fed7a68c289622d99cc847143fe4839e38ab69c835631aa4b30772deb42380ca1f6b2fe442cdf654436047677679bc1dfc695311d815b061f12365c3b SHA512 babc366241752c4f571169f66a10b83a9717fe7874c3177d288db5584a58c1397ff6239509a0bff05debcb517eb6e85280136d41566e697585e0efeaa2db812d
-EBUILD bff-1.0.5.ebuild 779 BLAKE2B c9374ecc04d572269fb2f7067db6a3694506cff111c6d78e9c07331c236f45d357cd0e2956bd77c3ab028c168d3c83b77d797c30d1e1784734d5c57712f0f3a0 SHA512 ce37685cc20c35a37f41189b0efbdefce1c4931bcbda1f6aa9b350e3e98d845fc0884a63249f8a8727dbf928c2fb1864321148d688edb563e14a70e2eea49fae
+EBUILD bff-1.0.5.ebuild 778 BLAKE2B 8a1accd3809accc014a2cea3208e306ee223efa3c45f6b8f7d1e7efef5c41c2921ca6cc9530c40205d5bb01fb8ff5a68b460509929e6028f3181954437829f8b SHA512 f2798b8ea848d52ada18c1a8ff6f2070b8bc2a1208a00c280073437ac57e0ad0ba5e6fb58b5db2df3fe427868e5ae554b2fcab70f4adb6056cbc0fadfd0e2b04
 MISC metadata.xml 358 BLAKE2B 475e8fa2af079096f259abc30d2f886eb2b568182394c5fa3a1c081754be7d151a3d10564315d6006232d6f2e7e68103337377db045c13a4fca1e05723d5ff0d SHA512 dc6a26609f65e38ec703c857c686e555170ad4021a994c3a39af131a9f3a38d6207a70558aae46dc5927dda8a9f735795d879a1ac4088ffeac5d09a068627f9c
diff --git a/dev-lang/bff/bff-1.0.5.ebuild b/dev-lang/bff/bff-1.0.5.ebuild
index 1492e01be1c2..ee9b8d706a87 100644
--- a/dev-lang/bff/bff-1.0.5.ebuild
+++ b/dev-lang/bff/bff-1.0.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/apankrat/bff"
 SRC_URI="https://github.com/apankrat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ia64 m68k ~ppc ppc64 s390 sh x86"
+KEYWORDS="amd64 arm ia64 m68k ppc ppc64 s390 sh x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 8585c8e03548..79d6c4566d75 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -39,6 +39,7 @@ DIST ghc-8.0.2-src.tar.xz 10687760 BLAKE2B 3b2a487c115680342ce308ff1a42d2b6fa6fb
 DIST ghc-8.2.1-src.tar.xz 10736016 BLAKE2B 60993cfc9569e83b0c383591ef30a7280e0138fbb7bd696ad62d87e68dcbccf31c0b8ba211b6647922b8595c7aec2c783648f12c67da53e0766b71c7d7c923fc SHA512 d9aa2aa7f9414db8f4e51d6c275694b46df515e68331a1a2b6018256333a2c63ebd877b75ee90407ecce5be672ec9afc6bebd62aadbf8ae06b94f1760d1736be
 DIST ghc-8.2.2-src.tar.xz 10753272 BLAKE2B 6fd792390d3df20f84836466705c3f3c931ba2d594dcbe2b808ea0ae284460000b443df8aae74903eabf05ff9064d68a303086cf888ea68222eb1c60959c8f21 SHA512 6549416f470b599973d409fa45f59c25b07e6a94798cef1a19ad432547dc225338cf4dbc4a4793114b4a417798a3b59b122b92b020251074405c5302b7ffe799
 DIST ghc-8.4.1-src.tar.xz 11301528 BLAKE2B 6dcf467d04cace856b68315c85b80f19b517dcbc8ae6e2a08c60afa141c9e0261e012738452c9ca208f9fc40c48bd1a0817e5e0fe9f4737383cd7b44ca65c8d9 SHA512 f8ae11f498bf2911fb92635534c6906c96f1fbe5072c7b7447bd3f69e408026b674564515af02a8aaddc57ee6905ce78d10005b12478a39c220580aaec13a9f7
+DIST ghc-8.4.2-src.tar.xz 11313140 BLAKE2B d6fe90f3c68b137c6029bf08918a51ff43c210ba0485aca8d77541cd455f6f9c94287cd011ecd710a8e5a14a27e8a27c04c517417c5748966afd63a5ba6ed19e SHA512 aeb17c986c597762381d9887679eb0eec194c2938a92b5a33e66b4c80002ead02d672b4aa968e1061ab5652b74e46a3c9f9e3d58d5be4a0ae47aa8aed288cf1f
 DIST ghc-bin-7.10.3-alpha.tbz2 183558856 BLAKE2B 2bb02aafa49c6a91bec016e8bec2d07257d602e53c9df55792ec6fbbf8e2e46de1d5f3f72c0ccf74d6bd7f7987f53412063ccb02ae85455fce11fa928cbf5291 SHA512 08709fe9b4036ab41715c9a637a2a160104e3ab9e0ed9efaaf73428e3cfe19619e50c42b72c60bbbd27be2b9c2ea68f63d72c1a27d4519756e7c0d909f724230
 DIST ghc-bin-7.10.3-amd64.tbz2 112040431 BLAKE2B 3e59b70ca309a1cd704266c54a7983f9a58362bf700ced89c5649c780c664c650ec091e14026a7b84e339d2ebff39eba1772eebcd9fb4b99b9c99d179453d5cc SHA512 e1554b3944edbe8e16537de5a29132dc6a22d780d9a700cdc9b76387b94191164398d6f2242bf8199527802572e2bb02545569d4f0930a0ee0dbfdeb25978558
 DIST ghc-bin-7.10.3-ia64.tbz2 238680956 BLAKE2B 08593718d376051edfb0c86131e54dafc5c15056757fbeef90c653a7d217e49ff34ffaf7cd4083144c9277e73a290b822a0f889aaf806341375708e4b92654b2 SHA512 3694011aec8a6dc37889418b318993cb82f9b46a5175dd837713f396c8f59a19a920e0b0669fe3b4ec37d5bd8837c115264c0a8fc97c5a4ce06a3bdd52fcfce5
@@ -66,6 +67,8 @@ DIST ghc-bin-8.2.2-i686-pc-linux-gnu.tbz2 96638908 BLAKE2B b470f838e77330969f162
 DIST ghc-bin-8.2.2-x86_64-pc-linux-gnu.tbz2 97696152 BLAKE2B b481cfea186220ee402f9f215dd48b002288766b643f3d8352579735347136c6349d242a9a56728d88ce80f72367dc9fdb6e40c47a0331910dadbb9a4998e17b SHA512 531df6505e8987fb5c5cc0aac59adc6aa153a4757b96936d3f09f27f3614589ff41c227568b780114b2e87c6c8656f2c88683cce86925628d12723f14b893eff
 DIST ghc-bin-8.4.1-i686-pc-linux-gnu.tbz2 116995839 BLAKE2B f94f2206d603d57f7fa64bdf63bcd2528019284fbf6641273ea1d8c62324e2f0b26b2cfa50c6ef96e12beba550bcedd17aa824e7cf9a27c794e962526326e105 SHA512 8167ea80fa627a1b55d28363513ac79985229326019288e7334cc87c3017d39781f4d129081d62da112420152a41d23d2dffb0c13721b80cca72d2a21fbd2c0a
 DIST ghc-bin-8.4.1-x86_64-pc-linux-gnu.tbz2 117369638 BLAKE2B 583db924a50a3d7d261d2f392a74e0ff487ee662af055ac292ff1943534fb305d6c9f6f0045ba4bdd5afa268d75beb50f64b4760e49cddabe1f56776a5f4769f SHA512 801f4ecd538c7a035a0f573f301769984814fa3ce4cf5b09a914ba012bebe0583b6695a6a93f92c7e6e2b7d58caf812a1214b5b778d7b7835d7eab988ad69ba0
+DIST ghc-bin-8.4.2-i686-pc-linux-gnu.tbz2 117083472 BLAKE2B 7dac18523ed693efb0ec42b31bf7b910e6bb8289cdc13eb309bdb30230fc87fbb060baf41eb4f18af2bb265b42e6aca535ceb70cf0fe09046b0e4650f11bb37c SHA512 f9799bdf7a2a66d1db34b828860203872d7398bab2d667e8982c9ee89301654c3f7f54705b639df2d7adebcfb7a05e071b83d994f5e52a72f604b62098be51cd
+DIST ghc-bin-8.4.2-x86_64-pc-linux-gnu.tbz2 117604406 BLAKE2B 644ef535497eb73a2d1ceaab7ff96228e8d4021c09bc061a3f397dc27b3b86bd6d5300736e478671cee0a160bfaa5aa4611f06012285079b40973f468b59664a SHA512 7bf4bcdce954319422b8b8f09e56294012fac145662ba3de1c7765ed86ae9f8b61dcf6dd8febcf85d60db8d1a26edcaf4e89c3644ffa24c7b5b5c41a14105936
 DIST hoopl-3.10.2.0.tar.gz 241940 BLAKE2B 0ed7bf80486767c81415f99da8780a525401c388dea0b3f380bbecceae9cc7f66d8b5d0d7b31f8cb41796309b7a93adb113485efd14882f8af321989ce900a9b SHA512 083baa8a5eb53247aff8d5b9b2144e0f63adb9400934297bbd80bfcec607dd90a34def4301045a60472ef10b0fb90ab84692fc08f786e7f806c28afdab1ef66a
 DIST transformers-0.4.3.0.tar.gz 28632 BLAKE2B 92cabcb654bb11854a3bffbb1262f5cd62eda1aff447157086a61ebc451ebf2fddec53b6a2cc058174f24f0f0e32df671d3717e30a542c8dc90cb87e327d990c SHA512 c3ec0893ebba4fbd6087c3202e919552c4a9bff3350b5c0589e7ebb18751a515d98b8cac15b0a3252906ea72b5a0eb09b7fe88c8da88b09d6ce4fbf0f50b2780
 EBUILD ghc-7.10.3.ebuild 21684 BLAKE2B b5b4c381925d8f01414f90226055fe3ef62b591fab0b7af845cd70437a11aee55b44acb68d991b99ee436553215f1fe2d078cd431ab53ea1c09661b11df55b38 SHA512 f4b67c2e0eab5cc15eb0d76700e887e3d55e22fc0b4571df7f041a022a02f112b3dae825fb096ef54ca15e440f18edcfe9a4a5f69dfb4ae1b446b7448f369951
@@ -74,4 +77,5 @@ EBUILD ghc-8.0.2.ebuild 21420 BLAKE2B 3e3b56d6e1956a4b9001413e759b65669ae82d50c0
 EBUILD ghc-8.2.1.ebuild 24769 BLAKE2B efcd5670929fe91f3b5a059644c8a4848943c6f7065c4b2b347d14af9745eb867bd217d81c9ef822ef816f05e10b6d2d466eb2d15c7f5b35bfe3e2388a976022 SHA512 efa3294d0f540d7a53b3a92fbc15a8a095e517a60a1d9b1ed36bd73551f9ad690afb24ac88b9c8db430b1506318b12abcf4eb077470ce111bc1db93f6212e6f8
 EBUILD ghc-8.2.2.ebuild 24681 BLAKE2B fa04dd32410a955f956863e738afb01e60fb568173404e7c067b0a615f48e28ed25d2ca1f4f8237042e9f25db3819d04488f2a327584fc457ace78fcb04b9d96 SHA512 e7b5686858076a15bcb14d6818c6616e2cc3197e0e241367d3cf38cedb7cdace091fb9b21ba978b05cb908a3c8a7723f84512f4b94abed797957c83cc147c1cf
 EBUILD ghc-8.4.1.ebuild 24554 BLAKE2B 16baefdcd7b248aa4f1f7106fff7fcb68851766088097fb244ba453a727e664772f03ca7123a21f073d55c1cffda98312b1f76b7b406c5118cffa7caba94b994 SHA512 7623527874b88f6a26d15f16eba30d442ff03d0414a2e905a7da2bba2028a85cbcbf879de685722fb5983799df64b98cfe7442ac4881db4a6cc3154270907b65
+EBUILD ghc-8.4.2.ebuild 24540 BLAKE2B 44d0067fadf246610a3d4bb070b5c9c8fe083d09ac7ec7b46578c98d17ae3e22745e80db48bfd2607c02df9e0885f298fea90e7520e9de5f44593dbc7d7f7a32 SHA512 5306a3126188d0b63d8afee0621be1508df25a9b569be1bffce0d7d88feaa43dc302a33e3154eccf6852f6a1cc3159acc5975ba059038a42e0961df33e74cd6f
 MISC metadata.xml 562 BLAKE2B 98c9bbd3aff50f05f27fe1682524254728413e53820650c91dc0eab26beecb2b682032d4b2d9c99a339059a2d8c4d007711d0dfbd3e47e5306fa4b5304f6b01d SHA512 dff79157435350067f74ae396556346d087e8146e61afe2b9739217b5d0dce6a589dd87705c7626d0c1c16da29613d9f465d357c283fb6c6df2332fec2b269be
diff --git a/dev-lang/ghc/ghc-8.4.2.ebuild b/dev-lang/ghc/ghc-8.4.2.ebuild
new file mode 100644
index 000000000000..4fe09376cf48
--- /dev/null
+++ b/dev-lang/ghc/ghc-8.4.2.ebuild
@@ -0,0 +1,755 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# to make make a crosscompiler use crossdev and symlink ghc tree into
+# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
+inherit multilib pax-utils toolchain-funcs versionator prefix
+inherit check-reqs
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="http://www.haskell.org/ghc/"
+
+# we don't have any binaries yet
+arch_binaries=""
+
+# sorted!
+#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
+#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
+arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
+#arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+
+# various ports:
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
+# 0 - yet
+yet_binary() {
+	case "${ARCH}" in
+		#alpha) return 0 ;;
+		#arm64) return 0 ;;
+		#arm) return 0 ;;
+		amd64) return 0 ;;
+		#ia64) return 0 ;;
+		#ppc) return 0 ;;
+		#ppc64) return 0 ;;
+		#sparc) return 0 ;;
+		x86) return 0 ;;
+		*) return 1 ;;
+	esac
+}
+
+GHC_PV=${PV}
+#GHC_PV=8.4.1.20180329 # uncomment only for -alpha, -beta, -rc ebuilds
+GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
+
+SRC_URI="!binary? ( http://downloads.haskell.org/~ghc/${PV/_/-}/${GHC_P}-src.tar.xz )"
+S="${WORKDIR}"/${GHC_P}
+
+[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
+
+BUMP_LIBRARIES=(
+	# "hackage-name          hackage-version"
+)
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+#KEYWORDS="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc ghcbootstrap ghcmakebinary +gmp profile"
+IUSE+=" binary"
+
+RDEPEND="
+	>=dev-lang/perl-5.6.1
+	dev-libs/gmp:0=
+	sys-libs/ncurses:0=[unicode]
+	!ghcmakebinary? ( virtual/libffi:= )
+"
+
+# This set of dependencies is needed to run
+# prebuilt ghc. We specifically avoid ncurses
+# dependency with:
+#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
+PREBUILT_BINARY_DEPENDS="
+	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+"
+# This set of dependencies is needed to install
+# ghc[binary] in system. terminfo package is linked
+# against ncurses.
+PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
+	sys-libs/ncurses:0/6
+"
+
+RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-python/sphinx
+		>=dev-libs/libxslt-1.1.2 )
+	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )"
+
+PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
+
+REQUIRED_USE="?? ( ghcbootstrap binary )"
+
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+is_native() {
+	[[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
+}
+
+# returns tool prefix for crosscompiler.
+# Example:
+#  CTARGET=armv7a-unknown-linux-gnueabi
+#  CHOST=x86_64-pc-linux-gnu
+#    "armv7a-unknown-linux-gnueabi-"
+#  CTARGET=${CHOST}
+#    ""
+# Used in tools and library prefix:
+#    "${ED}"/usr/bin/$(cross)haddock
+#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+
+cross() {
+	if is_crosscompile; then
+		echo "${CTARGET}-"
+	else
+		echo ""
+	fi
+}
+
+append-ghc-cflags() {
+	local persistent compile assemble link
+	local flag ghcflag
+
+	for flag in $*; do
+		case ${flag} in
+			persistent)	persistent="yes";;
+			compile)	compile="yes";;
+			assemble)	assemble="yes";;
+			link)		link="yes";;
+			*)
+				[[ ${compile}  ]] && ghcflag="-optc${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${assemble} ]] && ghcflag="-opta${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${link}     ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				;;
+		esac
+	done
+}
+
+# $1 - lib name (under libraries/)
+# $2 - lib version
+# example: bump_lib "transformers" "0.4.2.0"
+bump_lib() {
+	local pn=$1 pv=$2
+	local p=${pn}-${pv}
+	local f
+
+	einfo "Bumping ${pn} up to ${pv}"
+
+	for f in ghc.mk GNUmakefile; do
+		mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
+	done
+	mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
+	mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
+}
+
+update_SRC_URI() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		SRC_URI+=" mirror://hackage/package/${pn}/${pn}-${pv}.tar.gz"
+	done
+}
+
+update_SRC_URI
+
+bump_libs() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		bump_lib "${pn}" "${pv}"
+	done
+}
+
+ghc_setup_cflags() {
+	# TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N>
+	if ! is_native; then
+		export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
+		export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
+		einfo "Crosscompiling mode:"
+		einfo "   CHOST:   ${CHOST}"
+		einfo "   CTARGET: ${CTARGET}"
+		einfo "   CFLAGS:  ${CFLAGS}"
+		einfo "   LDFLAGS: ${LDFLAGS}"
+		einfo "   prefix: $(cross)"
+		return
+	fi
+	# We need to be very careful with the CFLAGS we ask ghc to pass through to
+	# gcc. There are plenty of flags which will make gcc produce output that
+	# breaks ghc in various ways. The main ones we want to pass through are
+	# -mcpu / -march flags. These are important for arches like alpha & sparc.
+	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
+	strip-flags
+	strip-unsupported-flags
+
+	# Cmm can't parse line numbers #482086
+	replace-flags -ggdb[3-9] -ggdb2
+
+	GHC_FLAGS=""
+	GHC_PERSISTENT_FLAGS=""
+	for flag in ${CFLAGS}; do
+		case ${flag} in
+
+			# Ignore extra optimisation (ghc passes -O to gcc anyway)
+			# -O2 and above break on too many systems
+			-O*) ;;
+
+			# Arch and ABI flags are what we're really after
+			-m*) append-ghc-cflags compile assemble ${flag};;
+
+			# Sometimes it's handy to see backtrace of RTS
+			# to get an idea what happens there
+			-g*) append-ghc-cflags compile ${flag};;
+
+			# Ignore all other flags, including all -f* flags
+		esac
+	done
+
+	for flag in ${LDFLAGS}; do
+		append-ghc-cflags link ${flag}
+	done
+
+	# GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build.
+	# Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported
+	# options to gcc.
+	if is_native; then
+		# hardened-gcc needs to be disabled, because our prebuilt binaries/libraries
+		# are not built with fPIC, bug #606666
+		gcc-specs-pie && append-ghc-cflags persistent compile link -nopie
+		tc-is-gcc && version_is_at_least 6.3 $(gcc-version) && if ! use ghcbootstrap; then
+			# gcc-6.3 has support for -no-pie upstream, but spelling differs from
+			# gentoo-specific '-nopie'. We enable it in non-bootstrap to allow
+			# hardened users try '-pie' in USE=ghcbootstrap mode.
+			append-ghc-cflags compile link -no-pie
+		fi
+
+		# prevent from failing to build unregisterised ghc:
+		# http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
+		use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
+	fi
+}
+
+# substitutes string $1 to $2 in files $3 $4 ...
+relocate_path() {
+	local from=$1
+	local   to=$2
+	shift 2
+	local file=
+	for file in "$@"
+	do
+		sed -i -e "s|$from|$to|g" \
+			"$file" || die "path relocation failed for '$file'"
+	done
+}
+
+# changes hardcoded ghc paths and updates package index
+# $1 - new absolute root path
+relocate_ghc() {
+	local to=$1
+
+	# libdir for prebuilt binary and for current system may mismatch
+	# It does for prefix installation for example: bug #476998
+	local bin_ghc_prefix=${WORKDIR}/usr
+	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
+	# backup original script to use it later after relocation
+	local gp_back="${T}/ghc-pkg-${GHC_PV}-orig"
+	cp "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
+
+	if [[ ${bin_libdir} != $(get_libdir) ]]; then
+		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
+		# moving the dir itself is not strictly needed
+		# but then USE=binary would result in installing
+		# in '${bin_libdir}'
+		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+
+		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+			"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
+			"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
+			"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
+			"${WORKDIR}/usr/bin/hsc2hs" \
+			"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
+			"$gp_back" \
+			"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
+	fi
+
+	# Relocate from /usr to ${EPREFIX}/usr
+	relocate_path "/usr" "${to}/usr" \
+		"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
+		"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
+		"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
+		"${WORKDIR}/usr/bin/hsc2hs" \
+		"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
+		"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
+
+	# this one we will use to regenerate cache
+	# so it should point to current tree location
+	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
+
+	if use prefix; then
+		hprefixify "${bin_libpath}"/${PN}*/settings
+	fi
+
+	# regenerate the binary package cache
+	"$gp_back" recache || die "failed to update cache after relocation"
+	rm "$gp_back"
+}
+
+ghc-check-reqs() {
+	# These are pessimistic values (slightly bigger than worst-case)
+	# Worst case is UNREG USE=profile ia64. See bug #611866 for some
+	# numbers on various arches.
+	CHECKREQS_DISK_BUILD=8G
+	CHECKREQS_DISK_USR=2G
+	# USE=binary roughly takes
+	use binary && CHECKREQS_DISK_BUILD=4G
+
+	"$@"
+}
+
+pkg_pretend() {
+	ghc-check-reqs check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ghc-check-reqs check-reqs_pkg_setup
+
+	# quiet portage about prebuilt binaries
+	use binary && QA_PREBUILT="*"
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use ghcbootstrap; then
+		ewarn "You requested ghc bootstrapping, this is usually only used"
+		ewarn "by Gentoo developers to make binary .tbz2 packages."
+
+		[[ -z $(type -P ghc) ]] && \
+			die "Could not find a ghc to bootstrap with."
+	else
+		if ! yet_binary; then
+			eerror "Please try emerging with USE=ghcbootstrap and report build"
+			eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
+			die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Create the ${S} dir if we're using the binary version
+	use binary && mkdir "${S}"
+
+	# the Solaris and Darwin binaries from ghc (maeder) need to be
+	# unpacked separately, so prevent them from being unpacked
+	local ONLYA=${A}
+	case ${CHOST} in
+		*-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
+	esac
+	unpack ${ONLYA}
+}
+
+src_prepare() {
+	ghc_setup_cflags
+
+	if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
+		# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
+		# See bug #313635.
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${WORKDIR}/usr/bin/ghc-${GHC_PV}"
+
+		# allow hardened users use vanilla binary to bootstrap ghc
+		# ghci uses mmap with rwx protection at it implements dynamic
+		# linking on it's own (bug #299709)
+		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/bin/ghc"
+	fi
+
+	if use binary; then
+		if use prefix; then
+			relocate_ghc "${EPREFIX}"
+		fi
+
+		# Move unpacked files to the expected place
+		mv "${WORKDIR}/usr" "${S}"
+		eapply_user
+	else
+		if ! use ghcbootstrap; then
+			case ${CHOST} in
+				*-darwin* | *-solaris*)
+				# UPDATE ME for ghc-7
+				mkdir "${WORKDIR}"/ghc-bin-installer || die
+				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
+				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
+				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
+				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
+				popd > /dev/null
+
+				pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
+				# fix the binaries so they run, on Solaris we need an
+				# LD_LIBRARY_PATH which has our prefix libdirs, on
+				# Darwin we need to replace the frameworks with our libs
+				# from the prefix fix before installation, because some
+				# of the tools are actually used during configure/make
+				if [[ ${CHOST} == *-solaris* ]] ; then
+					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+				elif [[ ${CHOST} == *-darwin* ]] ; then
+					local readline_framework=GNUreadline.framework/GNUreadline
+					local gmp_framework=/opt/local/lib/libgmp.10.dylib
+					local ncurses_file=/opt/local/lib/libncurses.5.dylib
+					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
+						install_name_tool -change \
+							${readline_framework} \
+							"${EPREFIX}"/lib/libreadline.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${gmp_framework} \
+							"${EPREFIX}"/usr/lib/libgmp.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${ncurses_file} \
+							"${EPREFIX}"/usr/lib/libncurses.dylib \
+							${binary} || die
+					done
+					# we don't do frameworks!
+					sed -i \
+						-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
+						-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
+						rts/package.conf.in || die
+				fi
+
+				# it is autoconf, but we really don't want to give it too
+				# much arguments, in fact we do the make in-place anyway
+				./configure --prefix="${WORKDIR}"/usr || die
+				make install || die
+				popd > /dev/null
+				;;
+				*)
+				relocate_ghc "${WORKDIR}"
+				;;
+			esac
+		fi
+
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${S}/ghc/ghc.wrapper"
+
+		cd "${S}" # otherwise eapply will break
+
+		eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
+		eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
+		eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
+
+		# a bunch of crosscompiler patches
+		# needs newer version:
+		#eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
+
+		# mingw32 target
+		pushd "${S}/libraries/Win32"
+			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
+		popd
+
+		bump_libs
+
+		eapply_user
+		# as we have changed the build system
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if ! use binary; then
+		# initialize build.mk
+		echo '# Gentoo changes' > mk/build.mk
+
+		# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
+		echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
+		echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
+
+		# We also need to use the GHC_FLAGS flags when building ghc itself
+		echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
+		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
+		echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
+		# Speed up initial Cabal bootstrap
+		echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
+
+		# We can't depend on haddock except when bootstrapping when we
+		# must build docs and include them into the binary .tbz2 package
+		# app-text/dblatex is not in portage, can not build PDF or PS
+		echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
+		echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
+		echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
+
+		# this controls presence on 'xhtml' and 'haddock' in final install
+		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
+
+		# not used outside of ghc's test
+		if [[ -n ${GHC_BUILD_DPH} ]]; then
+				echo "BUILD_DPH = YES" >> mk/build.mk
+			else
+				echo "BUILD_DPH = NO" >> mk/build.mk
+		fi
+
+		# Any non-native build has to skip as it needs
+		# target haddock binary to be runnabine.
+		if ! is_native; then
+			# disable docs generation as it requires running stage2
+			echo "HADDOCK_DOCS=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+		fi
+
+		if is_crosscompile; then
+			# Install ghc-stage1 crosscompiler instead of
+			# ghc-stage2 cross-built compiler.
+			echo "Stage1Only=YES" >> mk/build.mk
+		fi
+
+		# allows overriding build flavours for libraries:
+		# v   - vanilla (static libs)
+		# p   - profiled
+		# dyn - shared libraries
+		# example: GHC_LIBRARY_WAYS="v dyn"
+		if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
+			echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
+		fi
+		echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
+
+		# Get ghc from the unpacked binary .tbz2
+		# except when bootstrapping we just pick ghc up off the path
+		if ! use ghcbootstrap; then
+			export PATH="${WORKDIR}/usr/bin:${PATH}"
+		fi
+
+		echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk
+
+		# don't strip anything. Very useful when stage2 SIGSEGVs on you
+		echo "STRIP_CMD = :" >> mk/build.mk
+
+		local econf_args=()
+
+		# GHC embeds toolchain it was built by and uses it later.
+		# Don't allow things like ccache or versioned binary slip.
+		# We use stable thing across gcc upgrades.
+		# User can use EXTRA_ECONF=CC=... to override this default.
+		econf_args+=(
+			AR=${CTARGET}-ar
+			CC=${CTARGET}-gcc
+			# these should be inferred by GHC but ghc defaults
+			# to using bundled tools on windows.
+			Windres=${CTARGET}-windres
+			DllWrap=${CTARGET}-dllwrap
+			# we set the linker explicitly below
+			--disable-ld-override
+		)
+		case ${CTARGET} in
+			arm*)
+				# ld.bfd-2.28 does not work for ghc. Force ld.gold
+				# instead. This should be removed once gentoo gets
+				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
+				econf_args+=(LD=${CTARGET}-ld.gold)
+			;;
+			sparc*)
+				# ld.gold-2.28 does not work for ghc. Force ld.bfd
+				# instead. This should be removed once gentoo gets
+				# a fix for missing --no-relax support bug:
+				# https://sourceware.org/ml/binutils/2017-07/msg00183.html
+				econf_args+=(LD=${CTARGET}-ld.bfd)
+			;;
+			*)
+				econf_args+=(LD=${CTARGET}-ld)
+		esac
+
+		if [[ ${CBUILD} != ${CHOST} ]]; then
+			# GHC bug: ghc claims not to support cross-building.
+			# It does, but does not distinct --host= value
+			# for stage1 and stage2 compiler.
+			econf_args+=(--host=${CBUILD})
+		fi
+
+		if use ghcmakebinary; then
+			# When building booting libary we are trying to
+			# bundle or restrict most of external depends
+			# with unstable ABI:
+			#  - embed libffi (default GHC behaviour)
+			#  - disable ncurses support for ghci (via haskeline)
+			#    https://bugs.gentoo.org/557478
+			#  - disable ncurses support for ghc-pkg
+			echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
+			echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
+		elif is_native; then
+			# using ${GTARGET}'s libffi is not supported yet:
+			# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
+			econf_args+=(--with-system-libffi)
+			econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+		fi
+
+		einfo "Final mk/build.mk:"
+		cat mk/build.mk || die
+
+		econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot
+
+		if [[ ${PV} == *9999* ]]; then
+			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
+			GHC_P=${PN}-${GHC_PV}
+		fi
+	fi # ! use binary
+}
+
+src_compile() {
+	if ! use binary; then
+		# Stage1Only crosscompiler does not build stage2
+		if ! is_crosscompile; then
+			# 1. build/pax-mark compiler binary first
+			emake ghc/stage2/build/tmp/ghc-stage2
+			# 2. pax-mark (bug #516430)
+			pax-mark -m ghc/stage2/build/tmp/ghc-stage2
+			# 2. build/pax-mark haddock using ghc-stage2
+			if is_native; then
+				# non-native build does not build haddock
+				# due to HADDOCK_DOCS=NO, but it could.
+				emake utils/haddock/dist/build/tmp/haddock
+				pax-mark -m utils/haddock/dist/build/tmp/haddock
+			fi
+		fi
+		# 3. and then all the rest
+		emake all
+	fi # ! use binary
+}
+
+src_install() {
+	if use binary; then
+		use prefix && mkdir -p "${ED}"
+		mv "${S}/usr" "${ED}"
+	else
+		[[ -f VERSION ]] || emake VERSION
+
+		# -j1 due to a rare race in install script:
+		#    make --no-print-directory -f ghc.mk phase=final install
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
+		#        -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644  utils/hsc2hs/template-hsc.h \
+		#           "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
+		#    /usr/bin/install: cannot create regular file \
+		#           '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
+		emake -j1 install DESTDIR="${D}"
+
+		# Skip for cross-targets as they all share target location:
+		# /usr/share/doc/ghc-9999/
+		if ! is_crosscompile; then
+			dodoc "distrib/README" "ANNOUNCE" "LICENSE" "VERSION"
+		fi
+
+		# rename ghc-shipped files to avoid collision
+		# of external packages. Motivating example:
+		#  user had installed:
+		#      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
+		#      dev-haskell/transformers-0.4.2.0
+		#  then user tried to update to
+		#      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
+		#  this will lead to single .conf file collision.
+		local shipped_conf renamed_conf
+		local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+		for shipped_conf in "${package_confdir}"/*.conf; do
+			# rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
+			renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
+			mv "${shipped_conf}" "${renamed_conf}" || die
+		done
+
+		# remove link, but leave 'haddock-${GHC_P}'
+		rm -f "${ED}"/usr/bin/$(cross)haddock
+
+		if ! is_crosscompile; then
+			newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
+			newbashcomp utils/completion/ghc.bash         ghc
+		fi
+	fi
+
+	# path to the package.cache
+	local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+	PKGCACHE="${package_confdir}"/package.cache
+	# copy the package.conf.d, including timestamp, save it so we can help
+	# users that have a broken package.conf.d
+	cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
+
+	# copy the package.conf, including timestamp, save it so we later can put it
+	# back before uninstalling, or when upgrading.
+	cp -p "${PKGCACHE}"{,.shipped} \
+		|| die "failed to copy package.conf.d/package.cache"
+}
+
+pkg_preinst() {
+	# have we got an earlier version of ghc installed?
+	if has_version "<${CATEGORY}/${PF}"; then
+		haskell_updater_warn="1"
+	fi
+}
+
+pkg_postinst() {
+	ghc-reregister
+
+	# path to the package.cache
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+
+	# give the cache a new timestamp, it must be as recent as
+	# the package.conf.d directory.
+	touch "${PKGCACHE}"
+
+	if [[ "${haskell_updater_warn}" == "1" ]]; then
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+		ewarn "You have just upgraded from an older version of GHC."
+		ewarn "You may have to run"
+		ewarn "      'haskell-updater'"
+		ewarn "to rebuild all ghc-based Haskell libraries."
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+	fi
+}
+
+pkg_prerm() {
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+	rm -rf "${PKGCACHE}"
+
+	cp -p "${PKGCACHE}"{.shipped,}
+}
+
+pkg_postrm() {
+	ghc-package_pkg_postrm
+}
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index 9378cd4ec6b0..cb82610170a5 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -7,5 +7,6 @@ DIST nasm-2.13.03.tar.xz 806636 BLAKE2B 36187dac080dac17efbc1a2319d989bcb0f883fe
 EBUILD nasm-2.11.08.ebuild 823 BLAKE2B 64af7fad9db5b624979c00c8f2216b9f2e605fc17f97c47b12a59fed64a1e9b7dd6b98bd4a48e101e91dc334d030ab3ce8b28556ffdbbb005a0353dfad9c74dd SHA512 d91efdd2f128087650e692210f2f6b50caae8b1364d255854b1592d0cd2e411859d66e2ed2d698de8e4550e8b0c306d73261fa23d344b4b472b241d5928f4ff5
 EBUILD nasm-2.12.01.ebuild 826 BLAKE2B ebd3bd03148dd4612e8f0615fa82809d8826e749a7af456b31cce8d5c48ff41bda9a52b5bea38617be2be78f4ea3730d5fc25fa8e1665f3bb94aefbf0ee58704 SHA512 011a6594157b7bd2df8203dd523edf2bd9159e8c606ba0e59a9ebf75a127c0b6c32be00e95f989b274714ab4cdef881b36e9151d475aac7c882806045333671f
 EBUILD nasm-2.13.01.ebuild 859 BLAKE2B 9e66ae05b81672299dee18933e85ad0f3da471a04561500fddbb6f8b58ebe2d5d432082eb0b17d058ba62331b49735ae609169e393884105176bd8fac0fc5bd9 SHA512 92d299438a47fe68ca92cc584fecf89c492d17cb6d41937245232b924dea3f4cd3e21155e44b77ec522105f50a8150350a495ada9d4ac37db84a099fc757aeaf
+EBUILD nasm-2.13.03-r1.ebuild 1066 BLAKE2B a430e6e66bd1425b1145a0ff96da56b10575bade7e515524e8354156f3824e8676524aa6479e31e638e473b8a1da99e2687aa5de0c51e626399b49200f20ec9b SHA512 bc95785f7f3d1763f6c3d2f5b9b194d146452095f0536f4c80c4f9a8714c868431ac9a1613ea2d9b0f04f852bc1786f0d84901a458e1ba281d3f200f38f2f4b9
 EBUILD nasm-2.13.03.ebuild 861 BLAKE2B 88b267d30f1236cd8eb4a48e3ae3010559dcc75f60721e226ae8e744e7403869ffc1c9f797683db92b766a4f25bef0d6ca10b75273eff463ee16ef782d93eb9e SHA512 c303a574124afffbef1ab71ce8185c60f4f597c241582bda93dedc7eed9dcd9a08b997a91a08e58c5c0b39a96fcf27d044a33da4898311c1ec4b3613d23a8a25
 MISC metadata.xml 869 BLAKE2B 6acbe39b23e071849e6afd42da7ec5a56f017b708745e5efd09a288775da944fbb1185cead3ceaa573398f5874115139834584323e5b4cff360cf6cd9cca4ccd SHA512 a6bf522dfa6c43ea58a432577fbc31bcc9d262f7262c16d165b3cbacf8394a6d9e6d1eea9480cdb27b692cacada0c5fba3906e913259c2809a48159bce53e5bf
diff --git a/dev-lang/nasm/nasm-2.13.03-r1.ebuild b/dev-lang/nasm/nasm-2.13.03-r1.ebuild
new file mode 100644
index 000000000000..e050fffc1e94
--- /dev/null
+++ b/dev-lang/nasm/nasm-2.13.03-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="groovy little assembler"
+HOMEPAGE="http://www.nasm.us/"
+SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+# [fonts note] doc/psfonts.ph defines ordered list of font preference.
+# Currently 'media-fonts/source-pro' is most preferred and is able to
+# satisfy all 6 font flavours: tilt, chapter, head, etc.
+DEPEND="
+	dev-lang/perl
+	doc? (
+		app-text/ghostscript-gpl
+		dev-perl/Font-TTF
+		dev-perl/Sort-Versions
+		media-fonts/source-pro
+		virtual/perl-File-Spec
+	)
+"
+
+S=${WORKDIR}/${P/_}
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.13.01-fix-docdir.patch
+	"${FILESDIR}"/${PN}-2.13.01-gcc-8.patch
+)
+
+src_configure() {
+	strip-flags
+	default
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install_rdf $(usex doc install_doc '')
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 2bd7286cbf70..1ce1f8a96f90 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -5,7 +5,7 @@ AUX mbstring-oniguruma-6.8.patch 1488 BLAKE2B 181aacdd5fc01e5b11246d624cd88a5d31
 AUX php-5.6-no-bison-warnings.patch 1428 BLAKE2B d37bc7a1ae803aa4a14d32f0ca5613b7bc82610248d6de5ef7b6078fdcfa944cd1c245aa919137ff0d6968c8621b5acf2638386307c46fdbb8c98eba991eb674 SHA512 8f751c638c833d535e022434cd8ace5c175703bf61dfab7bea3e52d9419700e2b85c4cca40da9ab6056e8fd9c0bc1fab55810bb1193bed14ce0a50ce653fe62b
 AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd
 AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8
-AUX php-freetype-2.9.1.patch 7609 BLAKE2B f1dbcf00f4097b303ebca5275d2d188ef6d8deba0349c07fa8406f41571b14fcce3879070c8fc51e9318c9d267542a661126ce56b8ce7d74d40a4fbbf2612c45 SHA512 b3ae8a2dddd39e46c791934546d290f54a0c6d0d4a1fd7b06f06b6accc71f72d7289e04f04cb41ace619c663ccf81b19855433709ef87be495aefb86a28a2062
+AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae766060d51f93446a6293a2f607339faba484c7b0b2f9318a5c5442da3c09e25aeda20dbc5e3258bf1009f8625b4 SHA512 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875
 DIST php-5.6.33.tar.xz 12465256 BLAKE2B a33ce429c1565e6304031304168aa63ce82fa6c0968fc5ef09f5955e43c04ebe112db92475a999f39d997e2a3c9724ece60902ef0db84e2599d97d0e42ce57d2 SHA512 c494721594511f79a103ea3c73c5035aa0fcbca626710a0b85d2395693caf6762edefa3347cd0f8567b186f98c0df7f83cd4c698b158f0f72aa62aabbbb4e297
 DIST php-5.6.34.tar.xz 12465748 BLAKE2B 6b12f52a04d6b645d78f3d00617386a72fafffda24850e10f545464c9d0ca55321e91a292c3eb83409d0a303c4e37c2a686f547d86227c280ec78b428e73a92e SHA512 9aa02f943d6949a28ad96df5e75eec3ecab3731824400d0a0a8ccba9dee95b7af6421b38b86f352a45c778019ebfb1e6161a03256e4ef712341a9e0bad596ae7
 DIST php-5.6.35.tar.xz 12466396 BLAKE2B 96757fc064c139f238329c51741538fdbdefd04abad59c37565e1882a5a7df7d3755cf496561336b25748a968fb18dbf9d542a54a672f553f4be5ead292141cc SHA512 dd7d891954aa7f8e83eecb265e1bb01dfd357092dad0cfc5a3f441bea069f7181cd79330653b178d4953ac1ee8570d7f4c21acc8fc67975dd7dc1413eaebf0af
diff --git a/dev-lang/php/files/php-freetype-2.9.1.patch b/dev-lang/php/files/php-freetype-2.9.1.patch
index 3ddf8d1154da..02dfd9ce3cd4 100644
--- a/dev-lang/php/files/php-freetype-2.9.1.patch
+++ b/dev-lang/php/files/php-freetype-2.9.1.patch
@@ -1,6 +1,6 @@
 --- a/ext/gd/config.m4	2018-04-24 11:09:54.000000000 -0400
 +++ b/ext/gd/config.m4	2018-05-04 15:18:49.867283889 -0400
-@@ -186,21 +186,35 @@
+@@ -186,21 +186,36 @@
  AC_DEFUN([PHP_GD_FREETYPE2],[
    if test "$PHP_FREETYPE_DIR" != "no"; then
  
@@ -17,6 +17,7 @@
 +      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
 +      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
 +      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
++      FREETYPE2_DIR="found"
 +
 +      AC_MSG_RESULT(from pkgconfig: version $FREETYPE2_VERSION found)
 +    else
@@ -49,7 +50,7 @@
      AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
 --- a/configure	2018-04-24 11:10:05.000000000 -0400
 +++ b/configure	2018-05-04 15:18:45.626367913 -0400
-@@ -34348,21 +34348,78 @@
+@@ -34348,21 +34348,79 @@
  
    if test "$PHP_FREETYPE_DIR" != "no"; then
  
@@ -107,6 +108,7 @@
 +      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
 +      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
 +      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
++      FREETYPE2_DIR="found"
 +
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgconfig: version $FREETYPE2_VERSION found" >&5
 +$as_echo "from pkgconfig: version $FREETYPE2_VERSION found" >&6; }
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index cd18fa949c15..9ca3a7f2b095 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/OpenSRF/Manifest b/dev-libs/OpenSRF/Manifest
index b5422af2353f..140ebaf42810 100644
--- a/dev-libs/OpenSRF/Manifest
+++ b/dev-libs/OpenSRF/Manifest
@@ -1,7 +1,4 @@
-AUX OpenSRF-1.2.0-buildfix.patch 5565 BLAKE2B 1711b645bbd65d6081f4a30694a1c9b993d04caaa0546847bddac76800fde4af4665951302292d29a93a93d26f8b1ecc2dc8ca744534ff02338f95d23f30771c SHA512 febe3759fd4923f686bfc46f8d8f18bd463521e0ff930d0259533f173f11cb42842c3ddfe2930b52648873aad45b19eff1d5f328a8237f7e8f94eba63a35830f
 AUX OpenSRF-2.1.1-buildfix.patch 3436 BLAKE2B 9aff428ea42562bddbbc59f063d2902e55ee1c5f14fbb0a49b801840d8fc8ac02f703e8d4f95139bd90a54c689e1cd4fa9d5a4b23e9e56b8f16dbf4c6ad622db SHA512 5db2d704a3d539c1c57ee3b5d4e0965f60c23134c68746ab84655d698388e10b7d611dff0e25db4c633fce462816c4d76afae9d74acdee5a95baeb99528e2b5b
-DIST OpenSRF-1.2.0.tar.gz 1096952 BLAKE2B 87e1b125463db9cb90737b2c4b5821de6ea01d6229e936b8edd9f8883b72bf0b4006916243c06c31383e68a3b2a806207ca2385476e95b01c11ac810aa47a8b6 SHA512 f6ee045b32464316eefb457dc74bd08f3a613fcd22ea54ea719a1762b38ea14972d75802d2a542f3c7489c86cea25cb6a9de61662031104b0c0b3634e1d09cd1
 DIST opensrf-2.1.1.tar.gz 1058060 BLAKE2B 83c702727d21bea4683530857cd67037bde9eab94b91a801f64ebe70f5ad3b4994eea956cb9aaf531fbc663d4e9cb3242740f1941604a69aceaab8e396ae0e0e SHA512 5294ae2c9410ae52964067cd9090f9b7b5424e96f1731868cd896c1928ef1e89729af4a83f804f491bf2da0c6d129149105309afa18531b184098ebff2820306
-EBUILD OpenSRF-1.2.0.ebuild 3583 BLAKE2B 203a53ce8b001e684170fac945ce1f77b07cb7c402dfa401899d5f6747a523d0bf75b31012816fbbddc83d3f16dd6958fd3f67976ac5e0912ee5a87baf6bffdf SHA512 594295b75ef2f9b12ac2383af47bfffc023c3016f8726dbd5d5bef3c4046ce99f091e607b2c9a25347700adbcda7341d4c8ab4d511a353c3aec614a7e4d5c904
-EBUILD OpenSRF-2.1.1.ebuild 3729 BLAKE2B 3f66f5f636cb75935a929ed6ca634e4da3b0b66e92319c4cecaaaedd3080b780b711181cce4d2e0ee142544692444b6a252b7d356e72ef705299a9cf7bc11a22 SHA512 5c1fd4aa3c3e66a7d434fa1d9b83b5bb8dfdd913bdee83ec8ab4b84192a2256fd4cb006c158b1ae71a9c5c1f947f69ade123ef874545137d91ecddb6068cd1c8
+EBUILD OpenSRF-2.1.1.ebuild 3650 BLAKE2B 1b4fce57366084438d4e5b9bd296a1fb26845deb22ffd3df580d5d39aa4484b04d6db7240465c691c6abb6facde8e4fb7949911ed0ac3e3bcb82fa5e6115cd44 SHA512 20a963a4ab4ebb19fb86920bff737967a73d4af15e82b5b2a22d5f1852f5b43bffec3bf823535d32cf2a49f2e6acfc226a207fa402fc91dc450b0350eeab80a6
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild b/dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild
deleted file mode 100644
index b6ea23b6ef85..000000000000
--- a/dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib flag-o-matic apache-module autotools perl-module
-
-DESCRIPTION="Framework for the high-level development of the Evergreen ILS software"
-HOMEPAGE="http://open-ils.org/"
-SRC_URI="http://open-ils.org/downloads/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="postgres +sqlite"
-DEPEND=">=www-servers/apache-2.2.9
-		>=dev-db/libdbi-drivers-0.8.2
-		>=dev-db/libdbi-0.8.2
-		net-im/ejabberd
-		dev-libs/libmemcache
-		dev-perl/Cache-Memcached
-		dev-perl/Class-DBI-AbstractSearch
-		sqlite? ( dev-perl/DBD-SQLite )
-		postgres? ( dev-perl/DBD-Pg )
-		virtual/perl-Digest-MD5
-		dev-perl/JSON-XS
-		dev-perl/Net-Server
-		dev-perl/UNIVERSAL-require
-		dev-perl/Unix-Syslog
-		dev-perl/XML-LibXML
-		"
-
-PERL_S="${S}/src/perl"
-
-APXS2_S="${S}/src/gateway/.libs/"
-APACHE2_MOD_FILE="${APXS2_S}/osrf_json_gateway.so ${APXS2_S}/osrf_http_translator.so"
-#APACHE2_MOD_CONF="42_${PN}"
-#APACHE2_MOD_DEFINE="FOO"
-#DOCFILES="docs/*.html"
-need_apache2_2
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	perl_set_version
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.0-buildfix.patch
-	eautoreconf
-}
-
-#src_compile() {
-#	LIBXML2_CFLAGS=$(xml2-config --cflags)
-#	LIBXML2_CFLAGS="${LIBXML2_CFLAGS//*-I}"
-#	LIBXML2_HEADERS="${LIBXML2_CFLAGS// *}"
-#	APR_HEADERS=$(apr-1-config --includedir)
-#	APACHE2_HEADERS=$(apxs2 -q INCLUDEDIR)
-#	sed -i \
-#		-e '/^export PREFIX=/s,/.*,/usr,' \
-#		-e '/^export BINDIR=/s,/.*,${PREFIX}/bin,' \
-#		-e "/^export LIBDIR=/s,/.*,\${PREFIX}/$(get_libdir)," \
-#		-e '/^export PERLDIR=/s,/.*,${LIBDIR}/perl5,' \
-#		-e '/^export INCLUDEDIR=/s,/.*,${PREFIX}/include,' \
-#		-e '/^export ETCDIR=/s,/.*,/etc,' \
-#		-e '/^export SOCK=/s,/.*,/var/run/opensrf,' \
-#		-e '/^export PID=/s,/.*,/var/run/opensrf,' \
-#		-e '/^export LOG=/s,/.*,/var/log,' \
-#		-e '/^export TMP=/s,/.*,/tmp,' \
-#		-e '/^export APXS2=/s,/.*,/usr/sbin/apxs2,' \
-#		-e "/^export APACHE2_HEADERS=/s,/.*,${APACHE2_HEADERS}," \
-#		-e "/^export APR_HEADERS=/s,/.*,${APR_HEADERS}," \
-#		-e "/^export LIBXML2_HEADERS=/s,/.*,${LIBXML2_HEADERS}," \
-#		install.conf
-#	emake verbose || die "Failed to build"
-#}
-src_configure() {
-	econf \
-		--with-apxs=/usr/sbin/apxs2 \
-		--sysconfdir=/etc/opensrf \
-		--localstatedir=/var \
-		|| die "econf failed"
-	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_configure || die "perl-module_src_configure failed"
-}
-
-src_compile() {
-	emake || die "main emake failed"
-	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_compile || die "perl-module_src_compile failed"
-}
-
-src_install() {
-	einfo "Doing src_install"
-	#emake install-verbose DESTDIR="${D}" || die "Failed to install"
-	emake install DESTDIR="${D}" || die "Failed to install"
-	apache-module_src_install || die "apache-module_src_install failed"
-	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_install || die "perl-module_src_install failed"
-	cd "${S}"
-
-	# Docs
-	dodoc README doc/*
-}
-
-src_test() {
-	emake check || die "emake check failed"
-	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_test || die "perl-module_src_test failed"
-}
-
-pkg_config() {
-	:
-	#JABBER_SERVER=${JABBER_SERVER:=localhost}
-	#JABBER_PORT=${JABBER_PORT:=5222}
-	#PASSWORD=${PASSWORD:=osrf}
-	#einfo "Using Jabber server at ${JABBER_SERVER}:${JABBER_PORT}"
-	#einfo "Adding 'osrf' and 'router' users with password ${PASSWORD}"
-	#cd "${ROOT}"/usr/share/doc/${PF}/examples
-	#for user in osrf router ; do
-	#	perl register.pl ${JABBER_SERVER} ${JABBER_PORT} ${user} ${PASSWORD} \
-	#		|| die "Failed to add $user user to server"
-	#done
-}
diff --git a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
index 66eff92d51a2..7080fd53a102 100644
--- a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
+++ b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils multilib flag-o-matic apache-module autotools perl-module
 
 DESCRIPTION="Framework for the high-level development of the Evergreen ILS software"
-HOMEPAGE="http://open-ils.org/"
+HOMEPAGE="https://open-ils.org/"
 MY_PN="opensrf" # upstream lowercased the tarball in 2.x
 MY_P="${MY_PN}-${PV}"
-SRC_URI="http://open-ils.org/downloads/${MY_P}.tar.gz"
+SRC_URI="https://open-ils.org/downloads/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="postgres +sqlite"
 DEPEND=">=www-servers/apache-2.2.9
 		>=dev-db/libdbi-drivers-0.8.2
 		>=dev-db/libdbi-0.8.2
 		net-im/ejabberd
-		dev-libs/libmemcache
+		dev-libs/libmemcached
 		dev-perl/Cache-Memcached
 		dev-perl/Class-DBI-AbstractSearch
 		sqlite? ( dev-perl/DBD-SQLite )
@@ -86,14 +86,14 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "main emake failed"
+	emake
 	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_compile || die "perl-module_src_compile failed"
 }
 
 src_install() {
 	einfo "Doing src_install"
 	#emake install-verbose DESTDIR="${D}" || die "Failed to install"
-	emake install DESTDIR="${D}" APXS2_INSTALL="-i" || die "Failed to install"
+	emake install DESTDIR="${D}" APXS2_INSTALL="-i"
 	apache-module_src_install || die "apache-module_src_install failed"
 	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_install || die "perl-module_src_install failed"
 	cd "${S}"
@@ -103,7 +103,7 @@ src_install() {
 }
 
 src_test() {
-	emake check || die "emake check failed"
+	emake check
 	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_test || die "perl-module_src_test failed"
 }
 
diff --git a/dev-libs/OpenSRF/files/OpenSRF-1.2.0-buildfix.patch b/dev-libs/OpenSRF/files/OpenSRF-1.2.0-buildfix.patch
deleted file mode 100644
index 33963fe30436..000000000000
--- a/dev-libs/OpenSRF/files/OpenSRF-1.2.0-buildfix.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -Nuar OpenSRF-1.2.0.orig/Makefile.am OpenSRF-1.2.0/Makefile.am
---- OpenSRF-1.2.0.orig/Makefile.am	2008-10-27 05:07:06.000000000 +0000
-+++ OpenSRF-1.2.0/Makefile.am	2012-11-12 20:53:22.079732392 +0000
-@@ -115,14 +115,14 @@
- SUBDIRS = src
- 
- jserver:
--	make -s -C src jserver
-+	$(MAKE) -s -C src jserver
- 
- jserver-install:
--	make -s -C src jserver-install
-+	$(MAKE) -s -C src jserver-install
- 
- javascript-install:
--	make -s -C src javascript-install
-+	$(MAKE) -s -C src javascript-install
- 
- install-data-hook:
--	cp @srcdir@/src/gateway/apachetools.h @includedir@/opensrf/apachetools.h
-+	cp @srcdir@/src/gateway/apachetools.h $(DESTDIR)@includedir@/opensrf/apachetools.h
- 
-diff -Nuar OpenSRF-1.2.0.orig/src/gateway/Makefile.am OpenSRF-1.2.0/src/gateway/Makefile.am
---- OpenSRF-1.2.0.orig/src/gateway/Makefile.am	2008-08-18 19:14:00.000000000 +0000
-+++ OpenSRF-1.2.0/src/gateway/Makefile.am	2012-11-12 20:53:22.079732392 +0000
-@@ -16,16 +16,25 @@
- 
- AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS)
- AM_LDFLAGS = -L$(LIBDIR) -L@top_builddir@/src/libopensrf
-+APACHE_DEPS = apachetools.c apachetools.h
-+LIBS=libopensrf.so
-+TARGETS = osrf_json_gateway.la osrf_http_translator.la
- 
--install-exec-local: 
--	if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \
--		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
--		>> `apxs2 -q SYSCONFDIR`/httpd.conf; \
--	fi
--	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_json_gateway.c apachetools.c apachetools.h libopensrf.so
--	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_http_translator.c apachetools.c apachetools.h libopensrf.so
--	$(APXS2) -i -a @srcdir@/osrf_json_gateway.la
--	$(APXS2) -i -a @srcdir@/osrf_http_translator.la
-+all: $(TARGETS)
-+
-+osrf_json_gateway.la: osrf_json_gateway.c $(APACHE_DEPS)
-+	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) $^ $(LIBS)
-+	
-+osrf_http_translator.la: osrf_http_translator.c $(APACHE_DEPS)
-+	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) $^ $(LIBS)
-+
-+#install-exec-local:  $(TARGETS)
-+#	if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \
-+#		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
-+#		>> `apxs2 -q SYSCONFDIR`/httpd.conf; \
-+#	fi
-+#	$(APXS2) -i -a osrf_json_gateway.la
-+#	$(APXS2) -i -a osrf_http_translator.la
- 
- clean-local:
- 	rm -f @srcdir@/osrf_http_translator.la @srcdir@/osrf_http_translator.lo @srcdir@/osrf_http_translator.slo @srcdir@/osrf_json_gateway.la @srcdir@/osrf_json_gateway.lo @srcdir@/osrf_json_gateway.slo
-diff -Nuar OpenSRF-1.2.0.orig/src/java/Makefile.am OpenSRF-1.2.0/src/java/Makefile.am
---- OpenSRF-1.2.0.orig/src/java/Makefile.am	2008-07-17 18:15:09.000000000 +0000
-+++ OpenSRF-1.2.0/src/java/Makefile.am	2012-11-12 20:53:22.079732392 +0000
-@@ -48,8 +48,8 @@
- 	rm files;
- 
- install-data-local:
--	mkdir -p $(LIBDIR)/java
--	cp opensrf.jar $(LIBDIR)/java
-+	mkdir -p $(DESTDIR)$(LIBDIR)/java
-+	cp opensrf.jar $(DESTDIR)$(LIBDIR)/java
- 
- dep_clean:
- 	rm -rf deps
-diff -Nuar OpenSRF-1.2.0.orig/src/libopensrf/Makefile.am OpenSRF-1.2.0/src/libopensrf/Makefile.am
---- OpenSRF-1.2.0.orig/src/libopensrf/Makefile.am	2009-04-08 02:48:02.000000000 +0000
-+++ OpenSRF-1.2.0/src/libopensrf/Makefile.am	2012-11-12 20:53:22.079732392 +0000
-@@ -99,6 +99,7 @@
- opensrf_c_SOURCES = opensrf.c
- opensrf_c_DEPENDENCIES = libopensrf.la
- 
-+osrf_json_test_DEPENDENCIES = libopensrf.la libosrf_json.la
- osrf_json_test_SOURCES = osrf_json_test.c $(JSON_TARGS) $(JSON_DEP) $(JSON_TARGS_HEADS) $(JSON_DEP_HEADS)
- 
- noinst_LTLIBRARIES = libosrf_json.la
-diff -Nuar OpenSRF-1.2.0.orig/src/Makefile.am OpenSRF-1.2.0/src/Makefile.am
---- OpenSRF-1.2.0.orig/src/Makefile.am	2009-05-31 19:49:00.000000000 +0000
-+++ OpenSRF-1.2.0/src/Makefile.am	2012-11-12 20:53:52.475676800 +0000
-@@ -17,7 +17,7 @@
- export OPENSRF	= opensrf
- export BINDIR	= @bindir@
- export LIBDIR	= @libdir@
--jsdir = $(LIBDIR)/javascript
-+jsdir = $(datarootdir)/opensrf/javascript
- export OSRF_JAVA_DEPSDIR = @OSRF_JAVA_DEPSDIR@
- etcdir = $(ETCDIR)
- 
-@@ -33,7 +33,7 @@
- MAYBE_JA = java
- endif
- 
--SUBDIRS = libopensrf c-apps router srfsh jserver gateway perl $(MAYBE_PY) $(MAYBE_JA)
-+SUBDIRS = libopensrf c-apps router srfsh jserver gateway $(MAYBE_PY) $(MAYBE_JA) # perl is now seperate
- 
- dist_bin_SCRIPTS = @top_srcdir@/bin/opensrf-perl.pl
- bin_SCRIPTS = @top_srcdir@/bin/osrf_config @top_srcdir@/bin/osrf_ctl.sh 
-@@ -41,11 +41,11 @@
- dist_sysconf_DATA = @top_srcdir@/examples/opensrf.xml.example @top_srcdir@/examples/opensrf_core.xml.example @top_srcdir@/examples/srfsh.xml.example 
- 
- install-exec-local:
--	mkdir -p $(VAR)
--	mkdir -p $(PID)
--	mkdir -p $(LOG)
--	mkdir -p $(SOCK)
--	mkdir -p $(jsdir)
-+	mkdir -p $(DESTDIR)$(VAR)
-+	mkdir -p $(DESTDIR)$(PID)
-+	mkdir -p $(DESTDIR)$(LOG)
-+	mkdir -p $(DESTDIR)$(SOCK)
-+	mkdir -p $(DESTDIR)$(jsdir)
- 
- install-exec-hook:
- 	sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/opensrf.xml.example'
-@@ -54,9 +54,9 @@
- 	sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '$(DESTDIR)@sysconfdir@/opensrf_core.xml.example'
- 	sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example'
- 	sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example'
--	cp -r @srcdir@/javascript/* $(jsdir)/
-+	cp -r @srcdir@/javascript/* $(DESTDIR)$(jsdir)/
- 
- uninstall-hook:
--	rm @includedir@/opensrf/apachetools.h
--	rm -R $(jsdir)
-+	rm $(DESTDIR)@includedir@/opensrf/apachetools.h
-+	rm -R $(DESTDIR)$(jsdir)
- 
diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index 3552f5154dc9..6257971767c1 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -1,5 +1,5 @@
 DIST libffcall-2.0.tar.gz 938605 BLAKE2B 1e6fcae8f1dcaad52ca84d0dcf97f8dde5bb8153244bbb9047dbab5f6a1dade0a00f149507e6bb14225369a7081cadb069d23c8bc7cdcfaec937d7b9d47d08c1 SHA512 d75aa1df97b14692a9137745bae5b24c4d8f739cb1c7f854e7ed47e4a77a49759122abd6b0e445efa56381f47932c13cd21a154b2783649afb9c7a39e73fea04
 DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
 EBUILD ffcall-2.0.ebuild 1486 BLAKE2B 5d10f52e50730d59a1c6923fc04220e9335780279ff38568109585dd190ae26294a60ab70442f0102c44b230629337a1126ce11d7890e374039e383743891b50 SHA512 b3f368154157db13f660a1aa9cb1f7dca813c8d2921f1038b456cf3c15c79a9752eeb219dafc2753ba11e4891e1a47fd66692c76a8d25290b1f2c51102d07eb3
-EBUILD ffcall-2.1.ebuild 1523 BLAKE2B dd4e60e71b5b812f6a818d3acce35d0f4490994113c0d4ed7165512fc8213105b710dbe5e5c212f50aabf17e07576d6fe37f8a9d137707bdf927fd4ce762cfa7 SHA512 34a9f2ab5a6b508119c657175ea64cdeb1c90e1c2b36e4ac10ec9ab7778b231bf724c14e568f70b95c3ae0c26b0fecc1f8944644d27f005f4e7545fb9e437398
+EBUILD ffcall-2.1.ebuild 1522 BLAKE2B 09b4c6c157fc8a6963a4aac59d32e3142e848f5bf1552438bfdc075b8981cdcbb7529005aaf816b6727ddef9bd8b02c444aae18176a3d4093dce451c8b9b1c1c SHA512 31ce9f9bd6c896144ad2cee3af1bf1c232c75b3a307ad15c3e9dcba12300a535fde62284e1b34f8eac7a75e2c4c7c78107d43132fd3bd587d2633af27b1c47a5
 MISC metadata.xml 858 BLAKE2B a47a659baa99a77ae0caae149918d698ab357a691fd1c57dfe9671ab5631da54b15daaa96fe45b251f800fcb00da5e3c6e87e30eec2bc960301fa6f818cb34da SHA512 e64e471f2fdcc289c678bfc4fe3d2f652062907f9ff18d0350c0907b3d9bfa4e92c76bf04d1b2f0fb3f820f917ec4e3bd7d997a0d5e2eb270ac10516cb58f971
diff --git a/dev-libs/ffcall/ffcall-2.1.ebuild b/dev-libs/ffcall/ffcall-2.1.ebuild
index b4762103c805..70c88eb5e84f 100644
--- a/dev-libs/ffcall/ffcall-2.1.ebuild
+++ b/dev-libs/ffcall/ffcall-2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz"
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/${MY_PV}
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 13dda2f1836c..d20689bd1bde 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -4,7 +4,7 @@ AUX fribidi-0.19.6-page-size-header.patch 852 BLAKE2B b0109ff6e21fd816e42afc568c
 DIST fribidi-0.19.5.tar.bz2 625034 BLAKE2B 74929614cc07a574ffaddcde4bcbfd09dd107362a9f82502b940f6be08bf61a2004237429695184d1c59667a3689d5e01787586cdbc536fb17c3c093b7fb22a2 SHA512 0a1216d3ff23f76dd90a1fa5b1eadd1276cfedc07bd636e345df23911d2e23bc3780a5ba2e32f2025b517f7137135fb3de6d337f872932466efe480ece364e43
 DIST fribidi-0.19.6.tar.bz2 639022 BLAKE2B cf17ec580d93807e7720f7833bcac2e5ffaa16dd52505e1a3158d6d6fc6af5111ad11d75b15c7837185d04b48f18ca72b6b903962b084c5a7f5fbcc0bcf7f1bb SHA512 0661cf8e0985edfd5bf02c8de32432bf2faacadcaf35aef4e039a28f802a0468288e76b60231ebe7b54f909bd4d3ecc31a1fc94e83d434ae16dd21de6089629e
 DIST fribidi-0.19.7.tar.bz2 648299 BLAKE2B 496d010f29dd8fc3d349ad3f89d60a596dfceaa5350663442d5965cb09bc7a23e2ab8a876d7ca5b05ec3f4c5e178060cae2b493ccc46a6cdfc022d139e778259 SHA512 4bfdda43d961030a8a2ae2c98d2ca5d43c1b59633fa0987920c5537ec69f3f624204ceacc4c474d878cbb417ee2d9e708dfe169cfce6ad584d2f2d5122678b63
-EBUILD fribidi-0.19.5-r1.ebuild 1230 BLAKE2B cf5f46a1240ee129f9f1af9dc2323f2a9570ccab11b850951e1ebcbd11376e9530a506a5dd7fdf055c7083a12f79b414d0d0db4c84e91c3bbefec01c6b91872e SHA512 15eca6f872310d9696b0e0cb8e79db49a8da5cc85bba9e091e2f9df177a46b3426097f5b4053fe350a9ebd76061cb1050dc159787ef6ea29f29e59ecdf619b6f
-EBUILD fribidi-0.19.6.ebuild 1293 BLAKE2B 81200058d75a4c001988985ab0111e89f886c01bb992296aa3ac428751dcd1975d2415cbf3b15af0e902e21ce89cf64a06063308ab7fa0e60181abe7536b5b3f SHA512 71705b88c5c96e590f5a436908e820cae45a18ffeb8457e676ec24af689a06fa9b534e670677c48b4949e66b7c9a933b5c629eca561eeb301d8705c361de013c
-EBUILD fribidi-0.19.7.ebuild 1170 BLAKE2B afdbb051e88088c26ccb0d393206f40422237d79ffd3ef56afce10c634ad1775c75da066b3f868e64e01565c845345b19d3cc552640f84fefca043b50f2d89f0 SHA512 7b681b63fab1b860c6c60ed6c421d1342ecce37ff8c7b7c6816928e01a4d8bb9586aefefd7969da660d8f92d148154bf7c4742f89e597341299bdb97ea8f20f9
+EBUILD fribidi-0.19.5-r1.ebuild 1258 BLAKE2B 073108631a3d3db4e98a79e60dee5dabc34ed2701a819e814135fc223dc920d19e920b7447b995983fcdf2aa9d47b967142c0682124fbe72d93497b8e1357e48 SHA512 e428b8a0098b8a9b372c950cf12b539fa387a9e7708fc7331228f7e052c63fa6cb31152d35efba88c5cf89e96078322714c38f44577612a4b627cde8b9b64f36
+EBUILD fribidi-0.19.6.ebuild 1321 BLAKE2B 6ce0078d166db2c9dd60e8877211f097e50c4af20a118f70fae1a7418bca5e1079dcac3938340c9c415dee8b3b4d3f50269f5db509b706e0695364379177e793 SHA512 7b6e91b05f9a665330047817182d6b8e99b0c83c0fa76cc24b940cfffab49bf8d90504541076611d0f5331dd19ac07ac65c2fec656156f646be54f45137828ac
+EBUILD fribidi-0.19.7.ebuild 1195 BLAKE2B 839633ad0a00b4966d209938c35c46309467782c1ab96cee3a237376213f3ee20920c53a10e101224d10dc4399433f58363e414eee7d5b5ada52f632e5fa80fc SHA512 ac6acb636c2b9892d5fbe500e049ff9713cda7f78c090a1fd2e8237cf70f8e6819287326504d52e7e724b6ba2cf34865c7eb177f4562fb65650126348846b6d0
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild b/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild
index 5566b38636bd..f2f12390a25d 100644
--- a/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools eutils
 
 DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
 HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://fribidi.org/download/${P}.tar.bz2"
+SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/fribidi/fribidi-0.19.6.ebuild b/dev-libs/fribidi/fribidi-0.19.6.ebuild
index e4c50be0f93a..c93bd2a36797 100644
--- a/dev-libs/fribidi/fribidi-0.19.6.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.6.ebuild
@@ -9,7 +9,7 @@ inherit autotools eutils autotools-multilib
 
 DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
 HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://fribidi.org/download/${P}.tar.bz2"
+SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/fribidi/fribidi-0.19.7.ebuild b/dev-libs/fribidi/fribidi-0.19.7.ebuild
index 1146ef274f2a..058682947df5 100644
--- a/dev-libs/fribidi/fribidi-0.19.7.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.7.ebuild
@@ -9,11 +9,11 @@ inherit autotools autotools-multilib
 
 DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
 HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://fribidi.org/download/${P}.tar.bz2"
+SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 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 ~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="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/injeqt/Manifest b/dev-libs/injeqt/Manifest
index dc9f073480f8..46ed8f801df8 100644
--- a/dev-libs/injeqt/Manifest
+++ b/dev-libs/injeqt/Manifest
@@ -5,5 +5,5 @@ DIST injeqt-1.1.0.tar.gz 74112 BLAKE2B b8fda39422458d9b140081fd2362de5be5d7d030a
 DIST injeqt-1.2.0.tar.gz 73787 BLAKE2B 1b265c14a04dff8380297905f1b717c09baff6e24aedf473a36ff37be83d7e58b7ccae7df0eaf9690cee8c40d5646cb0af43a54427630db5595a9fa59d10e194 SHA512 4783f662af3b7711ef639695350bf136e84a218c8e2f0ddd8a44cb9790e1db5dcb69168fd46c21a82bd76eaebc01e5067e11be87823409d6ca032d2b95bfb880
 EBUILD injeqt-1.0.1.ebuild 667 BLAKE2B bf427758c344c5ef1f2341d3c31c6dd77e18004ce6f858bea55c89c27832b879598b877a4c3083c5e4f005267a03f9a220406761406e6516e16bae9c0aa9cf09 SHA512 59e38fa2a8ba2f3bce52d7652ec2ca55aca09bd2714345b57dbc61a3bdd903346acc5752906a129e41d64983c3982c5ca9de9cd4c1f292d17df2613bba34c1b5
 EBUILD injeqt-1.1.0.ebuild 656 BLAKE2B b35e5a01851d29ccc04f27cd70d333353a973e0193cc3e1d3c22b6e2c55ae7e5067bae7123b427c9d8468a76f2f1671f59d2dbdd700000a014de6ec0cd23837c SHA512 46635b31b88ecde6be2d127ba94fee42a4725c146424e86bea433b752c31ca338973df9545ec3e3e60034197d7be00a6c9d4d838f36fd26dc63f36e48d67657e
-EBUILD injeqt-1.2.0.ebuild 699 BLAKE2B 736383629d9ae1dbf9268ecb6b4f62ef9be04ca3bf04c8038c5677ff567df948b6ca93732ec0430ab6699b56d1435701ef212e6937afb5c0a7259dd40ed0e29c SHA512 b50f139de0b13cde0832e9655596b0af258a0104cdcd0835cf3b5c410059033b1018849e1de4bb3a5e84ac868c4564593bee73053d07428b7b46e7e5ae4c715a
+EBUILD injeqt-1.2.0.ebuild 698 BLAKE2B 4004f3a7a258f54bdc0e586db3161b0c2561c29f17b6c7fdc63816fb63433cafb970f0ce4f41a6d8edfc1e9e943a16257ad519c70a08724730c502b13ee2c231 SHA512 855c31e77b6f0cf761e26c9c36c1438e6d268a927faeb6a3d1467f7d9eb140ce210c3ba11c9d4343b82c56d1a1eb22d4b724fcd3f0eed92cc693315afd0c466a
 MISC metadata.xml 328 BLAKE2B d23a1f7b8bd482bfec92060b9f20f94efee5ec28fae5cd8e8df35c8d80d2b93a8e6b7474138ae53762f3e1c96f5bdda99d93841bd5f5598ce0698f6f72024dd7 SHA512 b095ba0bbe9d89d1d7b18fc13b3c03c23a8c2ad38f9871f3814dc4595e88a93d7682d3f18c31fd810bffeae25cc04de9c2681e933a7de103b8d1bc1e1bf4c3b3
diff --git a/dev-libs/injeqt/injeqt-1.2.0.ebuild b/dev-libs/injeqt/injeqt-1.2.0.ebuild
index 42e010b49f57..30decc181335 100644
--- a/dev-libs/injeqt/injeqt-1.2.0.ebuild
+++ b/dev-libs/injeqt/injeqt-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vogel/injeqt/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/kproperty/Manifest b/dev-libs/kproperty/Manifest
index 4ba3e16b9d68..5f31ff0907ba 100644
--- a/dev-libs/kproperty/Manifest
+++ b/dev-libs/kproperty/Manifest
@@ -1,5 +1,3 @@
-DIST kproperty-3.0.2.tar.xz 82556 BLAKE2B 57bde244b58d022c88cea6ff00776ebaecefbd865abd939d8a576f77ee8814077ed61f7576440185c71723e64b8a5d838b95f867df6c8892366d9c5f6bd52d06 SHA512 de37dbe3e0aa979c0c9fa75b0b26eef708b332a4b3f65d0b4c22926aa534c54b4f39643df107fabb136071940abd791b31ad8f864e40d514e20171af6fc16ea9
 DIST kproperty-3.1.0.tar.xz 123528 BLAKE2B 79d94bcdb83c343241d233b528f27e8fcabab587000562e695e03ac3877572c73be28574ecdb1fe2f538df9ea0ee20bc71e95f4c13943da585abccc7eeaf2f5d SHA512 6c6b9bc7db8e82b3c5ec216e42c439dfe30071804b2392026e6284ba7154338e2b6b108f0f14b5db556692de3230d8a780099e73349a740ce6edc68fd7fa54f5
-EBUILD kproperty-3.0.2.ebuild 629 BLAKE2B ee5132509ddcef9debf7b0ba7543fda77e07d1d519933c42e25e7f20008308bd4fe5ae3b12cfb87f4efee03dd6f999139009dcb171a2419fbc8455e195cc1a71 SHA512 767de6120290beec82a8c127c6788541c60f3106c6dbbd089729d17e62a0eb8c2d54c7ef8b480f5b95d5a724775b5724fc602f69ca77c65885f8337b3c5c0cbc
 EBUILD kproperty-3.1.0.ebuild 640 BLAKE2B 435646f298ba221b1279589e84ebb4bd67c30db5de0bcec2919d2c62b0ce7358dd326b9e4a45f8aa1ac13a3731f49c889d9e050db173cca38232bc981b71c896 SHA512 d9301c712d476ac605eaa785aed209444366088a07f05e5d2f64a1627a9a29b1ebb419565df7bcf23013177458b6dfe619fc190c491c2767d429f675d61ad247
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kproperty/kproperty-3.0.2.ebuild b/dev-libs/kproperty/kproperty-3.0.2.ebuild
deleted file mode 100644
index 89b43279613d..000000000000
--- a/dev-libs/kproperty/kproperty-3.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Property editing framework with editor widget similar to Qt Designer"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-# tests require installed headers, bug 636108
-RESTRICT+=" test"
diff --git a/dev-libs/kreport/Manifest b/dev-libs/kreport/Manifest
index 8f25de89d044..3d7280a2596a 100644
--- a/dev-libs/kreport/Manifest
+++ b/dev-libs/kreport/Manifest
@@ -1,5 +1,3 @@
-DIST kreport-3.0.2.tar.xz 227508 BLAKE2B 48c2dae0ea13f513657780d9893c8ddb81c535757c376911fd01246694d55782f97039e8c13f7b2f04d535a91599f51068e0611c578b78602afa6472aab9d66d SHA512 25580783b1424d66608c48c6f0e254a9c27802b11157eaa199a50b05122f904b970b82cc747c7d8020ebede9bac1b30667e22a6b9c23a6e481055aa3c0a407ea
 DIST kreport-3.1.0.tar.xz 378980 BLAKE2B 9f6289a38e7fc0d6a7522e55dd5e769a52306edb4855efe79f933f47dbc87f367c865fede453c04402ec03046a9b5c5bb7b9055ff1ec6808319939328ef74862 SHA512 9f96d65ee420aab497b591a4a0d48da8df21f3c6a230ec742f4b2ff12f0e14a86a82e4fb114bb91ff334bcd8bdf3beec0f533507923bec31a6e79bba55213268
-EBUILD kreport-3.0.2.ebuild 1160 BLAKE2B 2e0dfd95c9b8ff921b40de80c51fbe251bc25e50f35994c5a836cf774bf2bc5dec7cf2319a11a8ed5e976f1c5d6fe46568186d0f1301677420bb8f936c0859d6 SHA512 ac73ef479ecbd1c377e5f7e4bde840dd8959f4c1a7f14194940c1e3234aedb853aabf063c35fe32823b02c4a297c73b34778e1ab0d88a01c5b8bc9dbfec59b18
 EBUILD kreport-3.1.0.ebuild 1211 BLAKE2B fc5786598331a6f068df448b4ccf1ca1ec8d07b4b6441931cf617970e379898f48b23d0a942389bebd057bca874a92b07857570ffeb1a3209f432ad01b72a9d3 SHA512 0535792c6b520c8a5cf3cba244ddeecad9e2ee390f89388ef9cb9183bec62181de3a1ab2e1b470d3b1945969ca74fc25683461294048793ef4e6aa163293c212
 MISC metadata.xml 444 BLAKE2B 6bcc5b1d127a801fae72db2855c9b01ffeef4d118554164d8d7c02e3edd7d0f00e22f3f6dbf45cdbe1b8c764d6efdbd3034ffc6b8cf041b7e9537d59a6629740 SHA512 7356b187c34c57ab44573e7cd3da164888c2b261c2faecc8f890db1eedae63573587447f44356dba9ee2d6218034e13cb093dbed4f63589a6f0544123f7680b9
diff --git a/dev-libs/kreport/kreport-3.0.2.ebuild b/dev-libs/kreport/kreport-3.0.2.ebuild
deleted file mode 100644
index 03df9d44e7f3..000000000000
--- a/dev-libs/kreport/kreport-3.0.2.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
-
-PYTHON_COMPAT=( python2_7 )
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5 python-any-r1
-
-DESCRIPTION="Framework for creation and generation of reports in multiple formats"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="marble +scripting webkit"
-
-RESTRICT+=" test"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/kproperty
-	marble? ( $(add_kdeapps_dep marble '' '' '5=') )
-	scripting? ( $(add_qt_dep qtdeclarative) )
-	webkit? ( $(add_qt_dep qtwebkit) )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package marble Marble)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-		-DKREPORT_SCRIPTING=$(usex scripting)
-	)
-	kde5_src_configure
-}
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index a8f7a3b4a41e..292794a1a32d 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,5 +1,5 @@
 DIST libebml-1.3.4.tar.bz2 606205 BLAKE2B d13c33777e9afbc4d370e0b8e68fdcb42597fbd62f61197a4aa72e2b229ef06819efc0864f9783c87c90f8fcfa572b02d9b1767b57c31c6bc22a020b9eace94e SHA512 ebf5b71afe725e40ee6415463e51ca14810eecc2fef186caacd0269077f5febeb62623fd48674b21ea732f43a620d0c91603fa48d3f8d163284d1cf204642194
 DIST libebml-1.3.5.tar.xz 274184 BLAKE2B 954411bba6fc9ff3893a17a5147babff18352ac2c436523eecafac8e2921dd968e83f5672428f4f22e61cee97f7ce1a4f905781b4468cfd9f3ea7d8cd15d961f SHA512 cdf05015724919b19281bf99c562bb7e0bdf16990da274010f664ff316b6ce95ecbeaa1e479f03505281a7f45d5796aee6e7750a9e1c0596b630911d220dca24
 EBUILD libebml-1.3.4.ebuild 834 BLAKE2B 11fe2d8ebf1fa93a7fd9c866a9bd556d00ce6da0553be6e39b85c61e711a8277eb3f27e212c00609cb092f16e7fb403285ad29623f7e8941a7bc7c96443becd7 SHA512 edc8bf5f0137d8fb44335b0ceb64a66c98d2eb88bde15b93f7350fdc2b80077006c5e31c8ea567b0ef6050f08789a1566ccdeafb8f6ef98e3559d344f85047b4
-EBUILD libebml-1.3.5.ebuild 834 BLAKE2B 36dfa9de1130a5f6d2d96291687749223d145c46b79d69fcf35e2f4baa165605e34249fcb9bf251fe213c4a7214f7c97b8a653efff9cc9304ef4203a1a0626b9 SHA512 28f8ad88af0af2132e977cbd65930661a5ce15bfe23b06ddbe2c1806328b5f536ef6646665a5c04192ba64437665bdfcff7ca512c4937b5d35c0c53147338acc
+EBUILD libebml-1.3.5.ebuild 833 BLAKE2B 63ffb0503ef6995d4317638ddb15d27fc3a29acc173db763fb792ffc240c9678b787f6bf6cc9e50575e47ff682d262163268a80cd3c8ae40cf5ec12dc384e778 SHA512 e4157e6a8d7b5b4c1ed559a474cb9b9511ab7eb76d8238eca97278bf694a37fa00114b0ddd881984886636e2ef65becff655374a4d91b8e66297e91e1b65852e
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.5.ebuild b/dev-libs/libebml/libebml-1.3.5.ebuild
index a5ce97e68807..be83f1d7e1a5 100644
--- a/dev-libs/libebml/libebml-1.3.5.ebuild
+++ b/dev-libs/libebml/libebml-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 8d7d5a1ea479..d996b548b742 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,10 +1,12 @@
 AUX libfilezilla-0.9.2-cppunit-pkgconfig.patch 15391 BLAKE2B a9d72ff20ba52c74e932a347321dd6010c1e39a5e7149d201ce00377521471bf77fcc560c104ac2725892f4ba827ef7be2893dcd19a9df36b5bbad242ff09e5a SHA512 99e8c3ee7784a730d975279521e6e1a5d5dcd63ec0e30181dbfa8b23d080243a77d3a04e5aee124435030380df26df92509a61ff1cce48a5c9c64e00b48c900e
 DIST libfilezilla-0.11.2.tar.bz2 396032 BLAKE2B 68285a458c026ead9d0ab413e0638a45a451fd34d3284ff205d33e878f8c5e43fd4b3c92a5742d539383cbe0738c7e8d783c7523362ab744e9fc4d01d71dc932 SHA512 a2242fd67a054d47a938011c07a074f7e6d4a8fd7352b88411db1302d24a908a7b39ea76cd38cfe63765eb522476da4ccc22164884f9563e263a9e0895e7217f
 DIST libfilezilla-0.12.1.tar.bz2 397506 BLAKE2B 79f2009329195c51c81b6013b2ab14899a604cabd2a421888959690e57d67f1c0a30881bed5e7201f6a8d3f5ecdf56944f8f3ff7f2fab9bd8884cde6a0435a99 SHA512 3eeeb549eb5e07c712246a21c41e4ce076f4e9de8a65ad56f2a33bd7390a42950442cdb7113696b9673071f1f4253e847e4f961e97d4c8fad0a5369e790928dc
+DIST libfilezilla-0.12.2.tar.bz2 398156 BLAKE2B a7dee7d6cc14964b105f4c2227f67202d573d879c2428f815568ef0efcfda9349f372b07a10abbb735dfd44a9d52358985144e3b67388dd2ee2b65e8af33cd51 SHA512 8fb77ad2f55e5a2b9066b2923591d51408942ce4ade2b4f21d20ceb818d3b7e7f01da2e41693aba4f4044b1913b14d54719101734792bfec6fc5432593ffa92a
 DIST libfilezilla-0.9.1.tar.bz2 383315 BLAKE2B 0cade4316662d64b9a0eb6abd586355236bc2c3d73f3d2ad84fe857a25e593027bbb090f57c8656b8c06ae40d126d93b8310fb0642e2e73d3cace7e560c86837 SHA512 bbcd826675e9c3e2f8cf1cea4da01434a66359ae816efdc5c981fbfebde0b73ce44a6d37546196fc00cb118d9b4d7772b73e30f8d5a78294f97b9899e9ba3393
 DIST libfilezilla-0.9.2.tar.bz2 383522 BLAKE2B e70d23a67a8c365d06692dc27cf76543db75200ebb808e9ad91be95dafb8df2c7603c23e249405b056b7c44bffc527fd84d5a4052e704db63135fb93876d916f SHA512 f825d116e252786801115189f9966ba7ab8663863d921cce530569a172ab33dbc31234d6286b0b3e6edc19ec0a5ba009788382ec5d5359f97a9cb10f30715f88
 EBUILD libfilezilla-0.11.2.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
 EBUILD libfilezilla-0.12.1.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
+EBUILD libfilezilla-0.12.2.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
 EBUILD libfilezilla-0.9.1.ebuild 921 BLAKE2B 4c68ad50f7a65b85281194981fefad1dce5a958c4066312a57f1b492f5c5784ea0636ae32565a343674eba4bd06f389b019329ff9c88a5385bb80efab027b1ec SHA512 73c7ba2f0180dc26580e0e0d9226b1a8dfa70818720e8bbb78c53fada8ec68e690278859416694aefd7fe69178b401485e4da48591da96b4f848cc34b18b6bd8
 EBUILD libfilezilla-0.9.2.ebuild 1065 BLAKE2B 3c19a20507b7fb350bd3332104b51c91201b4e42935a3f93a3ec3cb41ae88f601ddc01c303f9a1a216c21a4d82a1ca780ecd9e2d5f63aa74b98df361e863c10b SHA512 880341a0f71b1bb08b48c9f7e6fe78dbdf8197e62faf9f82cafabf561e675b01f4f084d409eb815ee509c99c4da2ca88acbf92638c88a53dd23cf3456e3e4572
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.12.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.12.2.ebuild
new file mode 100644
index 000000000000..b546fecc3c4b
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.12.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
+	http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 893a0eec8a37..71f304acecc4 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -2,6 +2,6 @@ DIST libinput-1.10.5.tar.xz 497496 BLAKE2B c716bdd2620c044c7776f53fd368dc2e1e773
 DIST libinput-1.10.6.tar.xz 495536 BLAKE2B 3f23808635406eeb66cd6b4ce2a2dbaed69ee0917045f75ad262a59702d72923493b6faa7951ea3f7cc2591d4c9e1fc49cffc53b6dfbcb2aadc7b9f40c20517b SHA512 b76963c3429c5590ee04f1da94d08775c8bb8584830e678804fb1d4cf0e2af84826782eae71fdd57492461f85df87ac2fc940c280b0672c75cd81d5f34702fe4
 DIST libinput-1.7.3.tar.xz 922464 BLAKE2B fa38675905af55931676c22d9e4d56befbb055fba56ba13c61a1917050bc1eb62bcfe1d078b478047006d4c0d06d83186d0d6739cbf9dc49acce487ccb0b7e3a SHA512 2262dc56d213a4d3ea765e870af200e2c336a166baa1bbdf5205e3ce70faefc777429ba09563c5dd79feb5442f53abc84e04a0f32a06bb622d6e120bb8ad152b
 EBUILD libinput-1.10.5.ebuild 1442 BLAKE2B f4c62d9581129d6423549cf06a185a5a49623d562b6cc4067bb5db74ed3fe8c46cd9726061369bde74ee13878e8d9f892c8fe8ed13c3f8ab3be384d4a23471ed SHA512 bab217325a626c3f9e29d4bb9f86028d3257087d2db47e3de74ac3814496bb808e4ae36ce4060e2abb4cd94ba4351a9272b28695575a937f178c56dd9f75f314
-EBUILD libinput-1.10.6.ebuild 1450 BLAKE2B 38f14353e8d61575ca6286d6b2aeeb0e24f5cc1feddf56177d6c8fdd7c80100c26d19015223a00d88aad0fd339b3fc7973513468aeb6697a5e0d8e7105465ef7 SHA512 917200b05e8b3bd74a83f4c6324a64018fba2aa977c0e80d1e6465837811dc684b1f153e0298df29c27451e8563dd66a632ed57a036333a23fa67579fb221c1b
+EBUILD libinput-1.10.6.ebuild 1442 BLAKE2B f4c62d9581129d6423549cf06a185a5a49623d562b6cc4067bb5db74ed3fe8c46cd9726061369bde74ee13878e8d9f892c8fe8ed13c3f8ab3be384d4a23471ed SHA512 bab217325a626c3f9e29d4bb9f86028d3257087d2db47e3de74ac3814496bb808e4ae36ce4060e2abb4cd94ba4351a9272b28695575a937f178c56dd9f75f314
 EBUILD libinput-1.7.3.ebuild 1535 BLAKE2B 6d99e610dda382651bed647c29ee8073d14879ec2fa83f22e724ff294018cecc78f16799802974aac29153924c15f922d42d188e9199eaee60a81282be840d0d SHA512 00505995c95da87e936d1473548efb1d52fd1a593e659aec308e38f937fa391a3a092f2b7e2c1c564e9be9ce506cc021f1c3f590bc5bc39623dabd1e6758187c
 MISC metadata.xml 340 BLAKE2B b555474c5acc545a4a81d86b590620ed4eab35e091d012d740f3d0f08add99bc0b5d09db251c03e1191df719135c92251d98849944fe41f76336526a96f9ae7a SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09
diff --git a/dev-libs/libinput/libinput-1.10.6.ebuild b/dev-libs/libinput/libinput-1.10.6.ebuild
index 5364b191c2fc..3e9391fbb243 100644
--- a/dev-libs/libinput/libinput-1.10.6.ebuild
+++ b/dev-libs/libinput/libinput-1.10.6.ebuild
@@ -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 ~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="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/libnl/Manifest b/dev-libs/libnl/Manifest
index d852c757f6e0..037b8e2b22dc 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -7,6 +7,6 @@ DIST libnl-3.2.28.tar.gz 941954 BLAKE2B c36817832f36ef2f3e32af8703024c92c874a85f
 DIST libnl-3.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b1184e91b2bb45ba61a2e95355e7a3f5d0a74bdaf7ae003393a6c7556d5b201d0d0052dfc66042aa9e137986 SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e
 EBUILD libnl-1.1.4.ebuild 1141 BLAKE2B 16521e18a8b986a96540245ed54c5737c1ba8d17d3a492fe34b2e504216ba21186d1eaf4685716894f826186a87dd3b4ad82c87d9a4e439cd984fdf0472b4828 SHA512 1c63d4eabb1268b349918acbdc3cbc7d2fabc09a75e4b07793f1e380309404f460bfc3b90c7426377d57be65f5b679a5d20155003ab589497b225dea2f9c281a
 EBUILD libnl-3.2.28.ebuild 2486 BLAKE2B 2f99ac310c3777c72d36d7eb2ee3ca8d165fcef9385e67385297f384606bdc69675d23e85fb9b4cdadf0dca25639e51d677ce266005a0e9a405f9e069c61e789 SHA512 e6fc4f0076da3a41c6ec89cd52619f42ca5e966f2080e2150b5697612a4edad5c5f47fa34bb3188611fec7f04574db57cbbb1fd94ac3ca992771bd8f8086c30f
-EBUILD libnl-3.4.0.ebuild 2348 BLAKE2B 94e47e19d5b537b5817f936c074fe3cdd5b739a0b7be8dd7498d4d6a10223514ec2fa022b8740658651980d52f17f9b82222af109604b74a767898beeacdb7fd SHA512 bf25f057ad7b2407f6b2e8a5fe4c2c69fdf0a8d7ef1c8e94f00310842d080357acafb5bd3b6acceca87fe2886161db1f35cbee5c2d39198c566842207ad94306
-EBUILD libnl-99999999.ebuild 2130 BLAKE2B 479469457c0f614c6445590367911352de3d8216d9226bb9519f2825e7ab7613be2244d96ae614234df6c1cac66c13f885fa8a1d21be8967b109ae2d9a52a685 SHA512 ef42bbb3a85f3cdf23ae7bbdebaec5a52c60c609bcfecc9b9b2e88890784873c752fcab4a61145a7222d61af8f975b25b4f5ccb408495fb9feb0e3673974f59e
+EBUILD libnl-3.4.0.ebuild 2414 BLAKE2B 3de5f6dfb442f6bc4cc2313e9706e773add2de50cdf74adf6182b6df5615058f0914f7c05510032380cdb052e80e31ab4886a0b6dba81caf8653ecf850ca943f SHA512 7f5f69617af98312bc9ca985a8c4fef92518b39faa33a3ee99775eab2b528635931215d649725cfccd0eac52c4411b3f53a8a4c5ee7fddb8e9157376de1efa7b
+EBUILD libnl-99999999.ebuild 2196 BLAKE2B aeff1715ffd0c59e7524386f82283e1c41d0aa39548e2f4ebdcfed77624ed64ae975a74bf1796644411c846c32c275b3465f89878cdffe4fa757d54f184136b1 SHA512 65b184e96b140b5e95dc1623175c5b042d8fade476fde6a8f58e462d31e6db4d1fda6d998097f75c6acae0f6ab65fbbce6502a0737e8c051d2358885e5ef54e6
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
index 96413581c263..fc9536f8ff28 100644
--- a/dev-libs/libnl/libnl-3.4.0.ebuild
+++ b/dev-libs/libnl/libnl-3.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
@@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs python utils"
+IUSE="+debug static-libs python +threads utils"
 
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
@@ -71,9 +71,11 @@ src_prepare() {
 
 multilib_src_configure() {
 	econf \
-		--disable-silent-rules \
+		$(multilib_native_use_enable utils cli) \
+		$(use_enable debug) \
 		$(use_enable static-libs static) \
-		$(multilib_native_use_enable utils cli)
+		$(use_enable threads) \
+		--disable-silent-rules
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index 65e5dfb9b481..f8aea0b33b55 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-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
@@ -14,7 +14,7 @@ EGIT_REPO_URI="
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 KEYWORDS=""
-IUSE="static-libs python utils"
+IUSE="+debug static-libs python +threads utils"
 
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
@@ -67,9 +67,11 @@ src_prepare() {
 
 multilib_src_configure() {
 	econf \
-		--disable-silent-rules \
+		$(multilib_native_use_enable utils cli) \
+		$(use_enable debug) \
 		$(use_enable static-libs static) \
-		$(multilib_native_use_enable utils cli)
+		$(use_enable threads) \
+		--disable-silent-rules
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index ef8f441d4d78..3bccd6105943 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,7 +1,9 @@
 DIST libuv-1.10.2.tar.gz 1074184 BLAKE2B 81b5327684ae75ad1347730264f07f1106d9136b84956ac170ab99db9fa5fb574f52af9a786f7e2ce6c5bd8caaa0a28b1efc2ee7a23c015499b420feb9c329c5 SHA512 5d9a7c483c3504e10e17c29297d72dee1572dc657d261229cc68efe63cb3abb59f7e7768885ce3eb06f22691e73323158c06dcce29000c81e35ff9888853f080
 DIST libuv-1.20.0.tar.gz 1180231 BLAKE2B 8ba258477c685acc1ed5486211b65719419757f6dec5dda863d622d4190552a2f5968f3b05519ec5574a5963cce99a9b92c224b511e0f9e70aa099d47f4fb4ca SHA512 382309cb6e54765b956b03357cb754f49d93505ba0e0122a77f33efca07d7b87966c993a5fd9f9503edd1bcd0f49ca42bd9cd9264cce94c847aebca77d237ba0
 DIST libuv-1.20.2.tar.gz 1180957 BLAKE2B bbf29ea1ee989a5197daef92fee12aa83687002e14e8a4311b61c743cfbf6e4e8e9f0045b38fa5301afcc9981a5fcd59d12e0649515b2e1695ede62795929d4b SHA512 449dfd15e2953d2a8b9c6160ab39728a87799b3e8595f9e3013467daf69d3561e2c5602172a0596e7c884237cf0d52d3b0f00edde03a7b037dc90b61bce2057c
+DIST libuv-1.20.3.tar.gz 1181741 BLAKE2B ee68f975c9f150034b02772b297a05692305155449dac75f35ca32761ffa2803385b22cce5c0fe1b2ad73a52144e6218e2c62d73c92e098017bee74a99e16062 SHA512 60ebc0059ec9fdd022aa9d60b2a0340f29e037bf79fa08707f6f2ecca9ec263c7a6466bdc1f94e0875a6a627ee749efa86117dedb22119676a7bafed8b5d77a0
 EBUILD libuv-1.10.2.ebuild 1140 BLAKE2B a8dd07a2cb5bb9959099d681d9d711bb78afed0decff1f997735749c185540592212137735165989050ea59d6bc1795cf2e1fa82898bdd81fb7d55011ca63d4f SHA512 65f5e4e77ef871f8e40657981432a3bd51d54671b056cac25a2a268509f6f005df3ea73894ea29da3a4f1e1076c9e9c7f177e0e2a968df1d6df498ca14381be7
 EBUILD libuv-1.20.0.ebuild 1167 BLAKE2B dfe520d4fe923974f9f0681646895e6644a29c8f03ae01ac0c8a0d3b9800c69fcd0dc77d08e32666f912ce9f951008a6efde4f43bcf85a5d857cc84d037a0f22 SHA512 af41bf16214e00e716f31b649232662b57464b3ec5418627ed322b827450fe8c8e6ca765d08548f2ad0813a16af7ff1be6935ee0f890d282f1ea711aab1a0d4a
 EBUILD libuv-1.20.2.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
+EBUILD libuv-1.20.3.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 MISC metadata.xml 1262 BLAKE2B 0bcb30d58c10147ecb831f1805c89a9cf8d4c8545c7fd8a834a5be6cdfe80e5d7d4b2e7c41df9c2e0b545e199dfcf5de26651f04131442ca8bddf86792fa3e48 SHA512 f95931c1bd8f6bdf6b06fa48e4c66e5bcc567f23fbce82ab46593a3e8b540a582b1e3ea023287ce02d42d3e013e85e3260a300b1d0609d95a98fcd5d7dbea668
diff --git a/dev-libs/libuv/libuv-1.20.3.ebuild b/dev-libs/libuv/libuv-1.20.3.ebuild
new file mode 100644
index 000000000000..1edbef416b0b
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.20.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 86d12fa0285e..dd4f2bfc5a3d 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -7,5 +7,5 @@ AUX libxslt.m4-libxslt-1.1.26.patch 1421 BLAKE2B 91a1bf2487158d5e364247d29da4485
 DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986
 DIST libxslt-1.1.32.tar.gz 3440715 BLAKE2B 8d5dead5788d8d09ab121d6e33397ee8ed8836f573adba4b5f0e3f2e1410acfca0c50dbe06ea3b50a2df819aa01e7522902fbd5270e5329075b854881150ab64 SHA512 e1ed3c103cd4c9897e7dd2360a11f63cf30382b7566ce6fcc81117804e203714446b5a62179ce628c3834b0b32ecdeeceecbdfa417507ce9ed5a107a0ebefb39
 EBUILD libxslt-1.1.30-r2.ebuild 3697 BLAKE2B 1ccf6efd66585d9331fcbdafe28cc95b447319160c92f4285199a839a6f7b40cee988d6cc0a9f2c60c30b56dd1a890909f4e1b1cc39178d1146a2a338436fa11 SHA512 51c36880c9f8a6a9882c4a5b8143ab96af96e0123d4a82767d0eb8e5fae9ce24d1ebc9be6692c842cdb049c34ae3f6757494d7e4bc6f2b7e090e33002ce69ec3
-EBUILD libxslt-1.1.32.ebuild 3286 BLAKE2B 812b28f581ab4c0e21f82f70f64e227985ffa424f8134a2f8ef4e0778a0253439835fb30d6c69e5da3fcc0994681d4d2df6688cf7381b8de8a8b793450562dfb SHA512 7daa095912c89ec849e87eb4f8ff569c9e33691fd6f56fece6ef50bf984cec74b9279ca1ada187c3e591bb2c0aa4b0337cdfdb92979bcd8f446ce5108c4379fa
+EBUILD libxslt-1.1.32.ebuild 3284 BLAKE2B 33fa441d3491a58312a1bfab57c7d73b980aff1f95057fca6327914178710d0a217a60201c371e95cd254c2ed3e629bbbbdbabe380a746a38a78e5a88d7992d2 SHA512 3da5e9aa110d04ed395dfbb461ddf45c5abe688cd89bf1ef1446132671425c169c42bca6d36c9c9dfee27cb9f650556836f57e23425b44cf188a990e493336cb
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/libxslt/libxslt-1.1.32.ebuild b/dev-libs/libxslt/libxslt-1.1.32.ebuild
index 0036428d5c7f..43b455821912 100644
--- a/dev-libs/libxslt/libxslt-1.1.32.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index b511f40ca1de..186ad163dced 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -2,5 +2,5 @@ AUX nettle-3.3-ecc-add-eh.patch 977 BLAKE2B c33cfc4c8903d92a98ef853f72772f7ad2e5
 DIST nettle-3.3.tar.gz 1887927 BLAKE2B 4bcf3c4bfb9f9dae97ea6780d146f3313e8b51182d9942e69581428d9f602d16467d37f993700a4e94e2e0dee17bdf354694c94d0383164c3de6e57e7e24de4e SHA512 271981d89766f151af3cdc4e5fc43c438222f0f6f44475bad114f4209955b5235fced6526c7abca001cca223e8cfcd2a6bf389b160b305a499e7acf52425ec70
 DIST nettle-3.4.tar.gz 1935069 BLAKE2B b73c88236c8233360607a6ed65cd4f6d19bfbbf683b46149326ce3440bf0a42b8add69de5c64145720163b1095fdab3cb8bf410c2ef727d0ea4fb58391ff0f14 SHA512 3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b
 EBUILD nettle-3.3-r2.ebuild 1776 BLAKE2B d95d5f8d9fcc9574bef63f41678ad8b86ce03dad9d1aae27fd3a8129aa59431f9ed3842b72cd330c1aad44ab159bce5c5bd6df9709f6342bebc4242df6d1874f SHA512 299663b4f58b51e66488fef27c78e0db0164e7bcfc3f990e811ee920dc9b09b952d1a69799cd5112fc97a911ba3c6f74962b9063e26a6cdbe5500556b27119e6
-EBUILD nettle-3.4.ebuild 1765 BLAKE2B 68252dec392580476f4ded485389a18df1f644532cac73a47d4ef88f1e17bfd8cb3f9120d251bc6fc0e2d076f61c3636f7fdaa9f313d413d1bb3a393cafef064 SHA512 0a80f9fbb31a5057d79c6a73cd732f6b237e83f372a415bd6414cc50d2250664d53db2e99bc3da4270eee4db9477b5ae96033c9782488b85886c42875fa1be15
+EBUILD nettle-3.4.ebuild 1764 BLAKE2B 4267304efbc214460e8aa8bb2f5863f1c4c3d90a45990ae3e86279321a1f86113129df29e89e9f6817f01934fbf85c2cf34b8b824f72208aac3dc70ea996af4d SHA512 9f83b35a86080ea931be0613033d5a79598f3f1e8c7f9f698f8e2bd71f2165ad0156b90c7e3e67a53550aa1b95198d090a94e54e0172a83bb36afcc214b6e3d7
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/nettle/nettle-3.4.ebuild b/dev-libs/nettle/nettle-3.4.ebuild
index 0466a635aad6..255c4da1857f 100644
--- a/dev-libs/nettle/nettle-3.4.ebuild
+++ b/dev-libs/nettle/nettle-3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~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 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~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="doc +gmp neon static-libs test cpu_flags_x86_aes"
 
 DEPEND="gmp? ( >=dev-libs/gmp-5.0:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/pslib/Manifest b/dev-libs/pslib/Manifest
index 8eca89880732..90be64cbeefb 100644
--- a/dev-libs/pslib/Manifest
+++ b/dev-libs/pslib/Manifest
@@ -4,5 +4,5 @@ AUX pslib-lm.patch 317 BLAKE2B 4ee5ef10537a6535f8fd4b9a3c2dc65feead6d8ba4f41516d
 DIST pslib-0.4.1.tar.gz 531797 BLAKE2B 28224be5411739d20118e3457050b7fc388ad0c5f1f14403080732588b16b2bfc89bad5ce8383db5d5da85fceca466fe81588550c949d18c5c4965889c26f9bc SHA512 012c0b2de1cb151fc41498ca4e6f62ec15138b35afddd0199c6366b818c7b544877eea9575df0e1aee49a67cd52dcac47eae405854e7390abeb64fda221327cf
 DIST pslib-0.4.5.tar.gz 493687 BLAKE2B cca0709bc3fa9f464166b02ca54d85056c510f677b478b4f187fba653b3a17af38c3c7ffbea23113d5ad3a146e881d183f138d836cd5f373a116e836ba8d4974 SHA512 410abfdca6c52f16c07b7d0157930fbb7a996f03bfb84aee2bc951b2d859bc2186d3ba742b724cd957b9b1c48201364fbeb11c15d7f4ead34f78b0d0746abc6f
 EBUILD pslib-0.4.1-r2.ebuild 1031 BLAKE2B fdb5e5e99ee16ab15286a2049f0049f240e7d3264d4c3f7734e2a89d2ea62084068aedd7736e79a401c34791e191a0ffbabb1423a13b1e4105dba5330d04eec1 SHA512 9ac74edaf68a11c17dcc78ada74837cda8be00923544759df187e90eaac3ecdd0a3955b5ecd86c7f7f67039e00f26b08d21f9f7a0f38ee071f62b9b9ed546beb
-EBUILD pslib-0.4.5.ebuild 1059 BLAKE2B d95ccd5d1c65ddedde7059555819ff360530fa238aa7b0fa69ee39d8ed63de684106c7072726a30a4752c2da929803f76d4f6fc1d18a063ced9363c5b1bb1ecc SHA512 4f7b7c05a063e5b764ff620a3a7f47d23bbe7ec4dd0acf0271fe5e24085ac7e03d09e338e25e95d9084ec18ca4e298e052bb626d384f2245a77e1dcadc15f7f9
+EBUILD pslib-0.4.5.ebuild 1058 BLAKE2B adfda61c63d050870643b144db59576869ad3ff4257c50357dfd330ebe7390a8749874b2ac4139b456990e10a80098092b54919da8396663ebdce65cbbad2cfc SHA512 2e535a7cd988bb67614de27f7af194a091b7de426b8a32a235212d8429f4907943e4cbb7ab3e196fe15ea250cd24863e84e506b0016f5c2da136b7f9f34b52e4
 MISC metadata.xml 444 BLAKE2B 62c386b9fc2facb334d02520386624241580034bfb227c243f5b589eafef655084b84cb5e5f6dac3cfe73afbd0dfbf41c161261ede4e780bd84bec56a2302a14 SHA512 e50857e3a1c443849c5eafbeb72d41558c1bd8c6a58f22a4ab6b1590647db278e598bfb123eac6a8b50754d8bbd524dc574c3181c1e08bc24fdcce3f13a148bb
diff --git a/dev-libs/pslib/pslib-0.4.5.ebuild b/dev-libs/pslib/pslib-0.4.5.ebuild
index de5103baa121..4896e8951eab 100644
--- a/dev-libs/pslib/pslib-0.4.5.ebuild
+++ b/dev-libs/pslib/pslib-0.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pslib/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug jpeg png static-libs tiff"
 
 RDEPEND="
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index f6e6dad7b86c..58e8242f2eef 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,3 +1,3 @@
 DIST quazip-0.7.3.tar.gz 439536 BLAKE2B 7b91d12f14e060f3554e6d9b4041aef56f269c3e5cc3a4e67eaa415cf990f474da8581a248037d2b741117c5f83c514f3dc4e30310dccc954cf363435acfc4c6 SHA512 d4b55bd040e47e97e7bd5d080399ae4aa5fbc4985d6ab5979b468abc852c91b2e3e5d35af90d4b4de3bb01ea9135d0247473d6eab0413392b1c8567dc799a9fe
-EBUILD quazip-0.7.3-r1.ebuild 1152 BLAKE2B abbf0e5b16ce4fb813f159983efca585c14cc68a60847d038b52ef3a71ea17f8964a9e3d78522ed8b2106c8813ba31590db7d16bc0d2ee4838e88c4f90e60130 SHA512 88d7e2e454419f19810ed5a1b4d96a57b9542e120ec7177b1791981686a37f01778d3421aa53694cd85112719d878e4ab3de363ea587b9532ffd10977b1b65ce
+EBUILD quazip-0.7.3-r1.ebuild 1153 BLAKE2B 8eade14de50d7cb1d107047a4499a729c3485b63401dcda2ac2582d189e8623873475ca4e26ee38f7fc9cc2826ed610f12ba56e39da07fe73da42eb6013a725c SHA512 c136346ee3d3da176fad5458a82cea7d9c98c0e78084238a6d17c308daf3a155244f83d01e318c36829233518632167819b15424fc9a0f27fcb7d2654556296b
 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98
diff --git a/dev-libs/quazip/quazip-0.7.3-r1.ebuild b/dev-libs/quazip/quazip-0.7.3-r1.ebuild
index 781a9209c711..e12ecc1c0e4e 100644
--- a/dev-libs/quazip/quazip-0.7.3-r1.ebuild
+++ b/dev-libs/quazip/quazip-0.7.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index b977bdf6262b..7b3ad921c6a0 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,3 +1,5 @@
 DIST softhsm-2.3.0.tar.gz 992417 BLAKE2B dcb462a7d50be465c306e2208d2d446879ec093ce3a3233e338ba4df3b29a4f70050cd10ff513bff70ef37f98341230d061d48273a6fc54b668804311cb11bf8 SHA512 ef9ee41aa6eaeeb004d4ff5c78ca6e00895cc47e36551025a4422806eee8eead985cfd28476a867761a810f6957b0759edaac769bcdedf4ad974e426cfefce0f
+DIST softhsm-2.4.0.tar.gz 1042566 BLAKE2B 01a0f4bdc589847c4a1f860c3e3f572644d874b11d7ab8e149e598fc123b75e898de9a46f73f5f2a107edcaeabdda29e4b9b6d54af5b95ad79a3c7b7b77b8bbf SHA512 f14f65de32206500f708523ee88d8d5e3d1fd40175f1a9cd24c7760c829e2de9dbcb05453022df8186836c49a57e4eae7f2e75ce6a5346a426114f4d610a8a84
 EBUILD softhsm-2.3.0.ebuild 998 BLAKE2B e966f3d60d0cc9ec1a3d8208d99387732480889d08c43068060d00029df4b4791b0b56695cc7bc1fd58ea1c629543fd4e4673e0fba6b54b051edb11956b1f4f4 SHA512 2d5e3d022faa02727b8bfbd887bc5f6ad55d66a2c3a7375e04406fb695f68721507bed4f713f8072f953ec0bbab8b3a61069c216f9d268f6221d87e74d67f2b2
+EBUILD softhsm-2.4.0.ebuild 1041 BLAKE2B d723f065d6b76ee5132af9f6b5c7e6d330a0ce283c71fd1b1a40187cfdf6d91e3d42edae2270ee71757b47e0ffc7b278a1d98b534be224c0e57c371fdeeffd8f SHA512 9442882ac0c14345d5c16b02f25fdf4eee75352c22f385c809973fca18edc5f15c4ef195d32dcf5793b5cceab719b8f9fa372ba38a72a09275a775a5c22e7be8
 MISC metadata.xml 322 BLAKE2B 64433451cd97495272e25d2bd1a4ad951781f7a61e47f1f048b13b4a1b4f577f9eb37f1145f1d9710969cfd9e38dd89aacc83641ec8b3bf0b36027c39a8dfe8b SHA512 b145c1ee8c20a9aad9c9b8e6f6526c596dd80a993faecb8e8caf6e930cf05e32f3e6ef5ad72c337a43c48cf57224f209e65d177567e3c5c577d3872eb11841a8
diff --git a/dev-libs/softhsm/softhsm-2.4.0.ebuild b/dev-libs/softhsm/softhsm-2.4.0.ebuild
new file mode 100644
index 000000000000..419485df8258
--- /dev/null
+++ b/dev-libs/softhsm/softhsm-2.4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune
+
+DESCRIPTION="A software PKCS#11 implementation"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bindist libressl migration-tool test"
+SLOT="2"
+LICENSE="BSD"
+
+RDEPEND="
+	sys-devel/gcc:=[cxx]
+	migration-tool? ( dev-db/sqlite:3 )
+	!libressl? ( dev-libs/openssl:=[bindist=] )
+	libressl? ( dev-libs/libressl )
+	!=dev-libs/softhsm-2.0.0:0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-util/cppunit )
+"
+
+DOCS=(
+	NEWS
+	README.md
+)
+
+src_configure() {
+	econf \
+		--disable-static \
+		--localstatedir="${EROOT}var" \
+		--with-crypto-backend=openssl \
+		--disable-p11-kit \
+		$(use_enable !bindist ecc) \
+		$(use_enable !libressl gost) \
+		$(use_with migration-tool migrate)
+}
+
+src_install() {
+	default
+	keepdir "${EROOT}/var/lib/softhsm/tokens"
+	prune_libtool_files --modules
+}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index c17a0cfde9bf..b2f9cf4e7cb0 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Net_SmartIRC/Manifest b/dev-php/PEAR-Net_SmartIRC/Manifest
index 9e8b3722cdc8..c35962225df7 100644
--- a/dev-php/PEAR-Net_SmartIRC/Manifest
+++ b/dev-php/PEAR-Net_SmartIRC/Manifest
@@ -1,5 +1,5 @@
 DIST Net_SmartIRC-1.1.10.tar.gz 927009 BLAKE2B b410a0b4a02e60e27860f9c6b0ab8fecf4874273601694ad61dcf88a2e916aee20d1858cf951fffb229f4eac0c0ddda55530bb6840da3c7b741cf9ee3971f7b2 SHA512 16ad30d358af99f40c53a75cf5f1c944a3e68f4c1cffd586acd61ceed280d5d1fcd4f4d5e88db55f1f66c37c5b7f37aec2f45a26dc6b98860eacb42c9f3fbea5
-DIST Net_SmartIRC-1.1.11.tgz 165935 BLAKE2B fd178858d3410efb0a3f772f653200063b2131c8e2c848b91d000096bc823df60afea5656c83aa6890b8a81dae5b9dddf8c7a2e065ca7e851cd139a82b1adcb9 SHA512 280c7ab9cd9ac263d7ecad26aabfd9ff3e2c2727794e85c944985139fc7b1c57288b3b02de07ab1139dcd58eb7f12ac47be41601661ea05fcf2b53d780183054
+DIST Net_SmartIRC-1.1.12.tgz 166039 BLAKE2B 43aec437de08d6e0dd651b810b21b5fed5587e2e7e154fe4f078cc618ee501c3d962b824931558458895541ddc9dc46ec3b1f0356aac5b052dd63b498018bb47 SHA512 2da5f0f9ea9167dfd1490fb6ba1e97416c78389924f390030ba71ea28dc5b667451223daa7e3878cbae607159054d656534ff646636f8f5294eb0bda1b17074c
 EBUILD PEAR-Net_SmartIRC-1.1.10-r1.ebuild 774 BLAKE2B 640ed23e9f99b57056d92b502b0b9bf6816834a34d11329048dd0a6f95fd4e191b99db9f805bb701b97e43b38ec77ab2c8e71138ffeee0405f4df5e97edbb480 SHA512 8ee23e5be03c0e64b69d4d5b0405e66cbceea14cfd508ee619c7731e1ac12257816f48171ca31b1969210ca74920bb11d68c6d690b4f2ed6ac75533fdf460bba
-EBUILD PEAR-Net_SmartIRC-1.1.11.ebuild 505 BLAKE2B c7a1e3267c6ac2fa8f7edb148ea7fb73a2c862d7ad7f392ba566b26afc79df6b28d1ea2e47f46e9605a199daa4dda30362925c85a13b8bb5e0cdf3176019e707 SHA512 9e584e84a32245e015c1c8b46fbbd4c1f3e38f063bed4a4a835163155ff81ae0ec99268c51b9831e707c4ecc0a0fe9764c7f066d0bdb2ec4d8a68b3cc4c2a63a
+EBUILD PEAR-Net_SmartIRC-1.1.12.ebuild 545 BLAKE2B 80991f66ddd016eacdbf1c1d1b9232bf15a507e04e4ca530f0a78d135187c1a944cb7cf57e88a4266e45a0c20c76b74b720ee733daf6562e5fc303c978e75c64 SHA512 aea02f3d6ac0e4fd6b8fa92730162e6fe07e1e6299d084f8260cead0b2e8b6d982644ed4d37cb8c8ceeb296bf118b88f8913005d81b8e972e060885aeb56d4fe
 MISC metadata.xml 383 BLAKE2B ab5de001d8fe2ec2f6beaf3b457f5296123b286b335b3910ea58eadefe3369ab4fba6ad34fd1262ae465e2e521251b8034c046d1cbaf35afe819717d709917a7 SHA512 083df49fdd76cb7e00bb81b6501d0f475788cef1da463919fc35abc6d0725cda8b47fa027a1a3f6af4872897567b8ba8104463be276a1524182138bdc15d04c0
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.11.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.11.ebuild
deleted file mode 100644
index 765fc0aab3fb..000000000000
--- a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.11.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 php-pear-r2
-
-DESCRIPTION="PHP class to communicate with IRC networks"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples"
-DOCS=( CREDITS FEATURES docs/HOWTO README.md )
-
-src_install() {
-	php-pear-r2_src_install
-	use examples && dodoc -r docs/examples
-
-	if use doc; then
-		dodoc docs/DOCUMENTATION
-		dodoc -r docs/HTML
-	fi
-}
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.12.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.12.ebuild
new file mode 100644
index 000000000000..41aa7dab2408
--- /dev/null
+++ b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.12.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="PHP class to communicate with IRC networks"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples"
+DOCS=( CREDITS FEATURES docs/HOWTO README.md )
+
+src_install() {
+	local HTML_DOCS=( )
+	use examples && HTML_DOCS+=( docs/examples/ )
+
+	if use doc; then
+		DOCS+=( docs/DOCUMENTATION )
+		HTML_DOCS+=( docs/HTML/* )
+	fi
+	php-pear-r2_src_install
+}
diff --git a/dev-php/pecl-propro/Manifest b/dev-php/pecl-propro/Manifest
index f62be118b878..9e80850ac90a 100644
--- a/dev-php/pecl-propro/Manifest
+++ b/dev-php/pecl-propro/Manifest
@@ -1,7 +1,8 @@
 DIST propro-1.0.2.tgz 13393 BLAKE2B c451ad6e1e0f93308497514de22a949dfbbea54e326c18688d6883aeb4d6adb920c42adfa458faf4c350755da72c1db06f77efc408fbc182fbb950e2f8b33302 SHA512 a4a3216d13c412051c063e0370c5f0badb65aa7054a43b0f6eb387a7a5fbbba1800b7f5f5113ba68ca8c7fe19932184a069864d1362239c71e0f55466c9cc8eb
 DIST propro-2.0.1.tgz 13399 BLAKE2B 88b099602ed19da96570c6b65981158d1f8f335470e6cd7afa517844a71258b04d9cb294bf91c15a23bbc016b303b2e42a2dea263808e0ed92905ba9ba47247f SHA512 c5a5f7c1fdf042d49597df789dc2b2e4e1512e7320a3a39cad344a9dfa3b9253b4a98d2f33e10e04ee608e5b8d1e1b50238787510db0a0f99d8f8b45b91c5c22
+DIST propro-2.1.0.tgz 14253 BLAKE2B 44c9bde831486fa41520ce75b313865b90a057acd0d566ae7e5c2aca97240e089580ca79ef04842a57a5d8eb76a179e57c505e977913567c1e97260f87fe2165 SHA512 94fc97f7bf17661ec7ecbe4d13b4fc98b8381469140d121fef49d32a4b767e956ed87b9f5bbb794f27ca47ce4b7b3125ea2b9091eb9d1f0a52b5c8f9df7ee145
 EBUILD pecl-propro-1.0.2-r1.ebuild 735 BLAKE2B 7dff63db99c42ef41175493c6b2a754ec2b5ced16ca5594161a0ddaa20317be54e00c08ae04fc16337582c79403986e84c395b1740a95930dc3e7344b0c96aa5 SHA512 1333f462b538f9cd7f2b3ed27a7c01741bff390fb63dcd94238c5af75d0ffc247fb1485fe2aaedb3e984f7fb01aba5cb68d59100e0e5d734f02ae1d090c40a43
 EBUILD pecl-propro-1.0.2-r2.ebuild 836 BLAKE2B c8be1849bebd99025649f1758ab1d12484b53b6f19b2b51a379fa11030bc208b8d1a2f78533eeafac1c9c0c3dc058f94ef339ba852146b52494600691a7bb093 SHA512 7df406dd15a07b47b449c70559f2645eecb65fe62f46b4528805b2e02eaff51444d37373ae30689ebd852583c0e04fd1e4acca36fdb5fc097f961271af01f0ed
 EBUILD pecl-propro-2.0.1-r1.ebuild 750 BLAKE2B 36855ce79ce527a94d0e7177e5c1ca98723078713be9351a8cb38364f0091988b11bfe96afe6d35bd7870fe268e1998c5c794b3206bf25ea38fc5033f674622c SHA512 842c94056e314877518f017231827f74bbaee853e1c69fbdd7e74a1092a196a07c174cfa1e36f7934b8f881573e5c7de859c3ef212fd1eb165ca74969d982f25
-EBUILD pecl-propro-2.0.1-r2.ebuild 852 BLAKE2B 072d8c80981db40997b5d4e40ca603e3ff186320bb6258ae0d292796888319fa1fcfa8d6579f79fc889fbc56a51c8744e8007c5f2997e0568f923548b00d01c6 SHA512 8fd7d2ce6e863450466cbb99cde4f25e1f5b74428b3513056d31caa29b1063e19d921ed99909fc08fd2fe382cda444aadab81550b8c2ec046fb3eb7910a72674
+EBUILD pecl-propro-2.1.0.ebuild 852 BLAKE2B 072d8c80981db40997b5d4e40ca603e3ff186320bb6258ae0d292796888319fa1fcfa8d6579f79fc889fbc56a51c8744e8007c5f2997e0568f923548b00d01c6 SHA512 8fd7d2ce6e863450466cbb99cde4f25e1f5b74428b3513056d31caa29b1063e19d921ed99909fc08fd2fe382cda444aadab81550b8c2ec046fb3eb7910a72674
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-propro/pecl-propro-2.0.1-r2.ebuild b/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
index 1c8c99bad920..1c8c99bad920 100644
--- a/dev-php/pecl-propro/pecl-propro-2.0.1-r2.ebuild
+++ b/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 3de292a14853..ad9e2e73649a 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,5 +1,7 @@
 DIST redis-3.1.6.tgz 199920 BLAKE2B 00aa81cdbedc03b4a672a58be98d8f01d2076038622b9d1e9673c0628c096152f12f9f5ff540af639da73b4458fcb1fce9c1c8b49a95db48970bab07806ac8d0 SHA512 4263d150c93f11dd06587925ad9a3cd8fbba2e4a18b2f23e6adfaeb25d566a1c2d256551a50ae1b9c770fd0f9bc4c92f483c46d60be9d4f5b5ba056231b7d527
 DIST redis-4.0.0.tgz 212340 BLAKE2B 996138b3dd92e839fbebaf5d562cfbe90e66384233c83612c8726fa41f10c106d0195c87449fc7886b3e832fd551b962ef50c161372c04c899c9fe7fd1140101 SHA512 e4bf2294f696e468174c0fff9ed33831cf81c3548ce30ede01bc3c45a15cb87b9b9ea02899c451f63211be8cb37e953be138e93c16d9e0f12772b7b6d03e8dcd
+DIST redis-4.0.2.tgz 212617 BLAKE2B 5778cf08e93fe8343e8fa07f1314c39b2d6d9a150d70c5b2084274afb163f1132a4be81385563f74d3b1d8f2dc32bf6578e98a123b43a941635fd85ebb229771 SHA512 3b296926ddd6a69a4d633da8bf6257c9b2962dffb4dd38c20eaf821a8c64262b476a7fb10ab4412ceb2d1307aef26c3d1d4b72141d29dab262d521a08df13a6a
 EBUILD pecl-redis-3.1.6-r1.ebuild 1504 BLAKE2B 39cd4e0402cde5507b4de802e6ec1a9855f293ea1710f1987690c9c4dca507c72045b87b423c89950e76facff3699ec782df904904c4f361f304f9a3f0095f2f SHA512 6588808380496dbf7f46e85483393a1c2fbe10720959a113cdf19e527a43e72e11fa948a168d965d3dbd1c1d3809051246d2a1ed504fb0958a728b20191b2ec1
 EBUILD pecl-redis-4.0.0-r1.ebuild 1638 BLAKE2B 3072def07f464db1a3148b4c1ac52db50bf47c858db808696505597e67d0adee8b5a10bb72105cfe7e51973d26233ae35410efd6599ca9c3e53ae5665b64219e SHA512 580d168d0eccc106f367457986faaadbbb9ef0cd0263e25a91202388f03363a4ad5bbc62ffa25a7c8b22d76f573bb6a5efe7202f97fbfe47789fd92abe21bbd0
+EBUILD pecl-redis-4.0.2.ebuild 1641 BLAKE2B 3f295bc8a957011d8eb7e86d268cb2411093e0e1b89ba25bbc5b143131fdc6769f5f5c79f56b99cdfdf3d6effa434224c524d6b946f525300f2ed3c408bf1ac2 SHA512 256b408e3d849a86fefec8383831e1a561c8b95d13e777e412fd820fd82e95977189d4a1eb5de5ac71b385f87ee6d41caa23ff7820a627ae95ef668ebc36db17
 MISC metadata.xml 324 BLAKE2B fc4145f462dd06f7a34385a0d8e2cbc6da6744094e84851891d5513f7be39c89cebe439e566fc2ead0afdb8ee3885b4a4d448e63d4c1a1d20a5bb8791c12d313 SHA512 916879a4b7ed11e30634a1c95637e9426932bac3c6aba2c7e686d9835097873e142f062e7d81e3ac99c3aef972b40db67b3809116cff4a3742ba6c669d999066
diff --git a/dev-php/pecl-redis/pecl-redis-4.0.2.ebuild b/dev-php/pecl-redis/pecl-redis-4.0.2.ebuild
new file mode 100644
index 000000000000..7c75c710c648
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-4.0.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="redis"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP extension for interfacing with Redis"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="igbinary +session"
+
+DEPEND="
+	php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) )
+	php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) )
+	php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) )
+	php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) )
+"
+RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
+
+# The test suite requires network access.
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-redis
+		$(use_enable igbinary redis-igbinary)
+		$(use_enable session redis-session)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test(){
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Run tests for Redis class
+		${PHPCLI} -d extension=modules/redis.so \
+				  tests/TestRedis.php \
+				  --class Redis \
+				  --host ${PECL_REDIS_HOST} || die 'test suite failed'
+	done
+}
+
+pkg_postinst() {
+	elog "The 4.0 release comes with breaking API changes."
+	elog "Be sure to verify any applications upon upgrading."
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 34d603f6a213..f9d692c73c1b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 93cbd3113eee..75f48e5402cf 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,5 +1,5 @@
 AUX PyQt4-4.11.2-phonon.patch 897 BLAKE2B b4834b319d15f96b80e4cb3bc4fe6d3f690df3f1b97d79ee35cd0dcb3a4abb4542c56b84991137ee50a86f1a0abcb6ccddca213d8d50e54e43520f76d2f11eb8 SHA512 e6e0364a24e43682c829da0a3d2ece8fdf54df00ee4fb00927a0530f3d5b62177877452058ab67cd9006ef8902d72f863e69d9ffb3b98b49f407566f96430bee
 AUX PyQt4-4.7.3-qreal_float_support.patch 5954 BLAKE2B ae198e39b05d42aa9be83a4d2bb69ba3705f3bc8e72ebc3e7b6ba7ef650f68f7d2dcb13dfade1dbb6a441809d39f4b9ade7fa3eaa075bc13cc16a0ef20b98022 SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2
 DIST PyQt4_gpl_x11-4.12.1.tar.gz 11328010 BLAKE2B b1261318eed18faa4eb94b1b3db9d2ba9f4d000f295eab6985ce2e6e39f3c94ab5b524a1d437406b8154d6b9ada1da710d427af0a1c410579eb9194b36aeb4cf SHA512 0651816ed5a371c24827e182eac5b2a2afe67928d95a09f63bd8158117aacd3e835b1efa06d4fc0c147a28038613a5bc088bd736a1348de68199da7952299af1
-EBUILD PyQt4-4.12.1.ebuild 4725 BLAKE2B 74a04ca3df420dc17b95bc5aec8e0d874c121a053c3018ecec8b7d3df567705ec99fe23fc8c9f567ecb22b95d74e0fea4e56b745b4af4d03619e370beca11380 SHA512 19fd9c014da59750dd5e0f5ada820ab7a97fc6f394d788f1d59d0e4d236d4d5fe2a8694e731e1200cc1fbd15854cc333f6889e6f21e2cc810f258fe6f5a8e38b
+EBUILD PyQt4-4.12.1.ebuild 4726 BLAKE2B e08eaefb436e0d72a647b1fab21f80caf902ca556bdafbffcc44da9c391334c5f52d0beb1338555edf6e0292fc2a7116f5185055455b91d492d58655b3205bbc SHA512 140230da20582fb01f50fee0caefb248b9086fd211f5977c381473e8cd54d9314ade5d45784c234ecbd11861f769d9f28e012ac9703db78056b2f2dc82924914
 MISC metadata.xml 1770 BLAKE2B dfb5d8b53c0a5666b0ffda7a9f055eb134f651781e579cd3171ddbcf0a50c3bd5d307a6ff87647c4632b66f5b64601021bb57bf6fb73cfbd504c0aea8a6dc1fe SHA512 6c6671ad8dd20f4d1701facd3b7de794b4eca907ba273f5c6626b691753ea26c0679cd4d91c1847beebcc298341ddf19d71bb4d3eb203e10720c64c54a2ee559
diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
index 33ecc5f591f6..aa304f2326a8 100644
--- a/dev-python/PyQt4/PyQt4-4.12.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="X compat dbus debug declarative designer doc examples help multimedia
 	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 3b2eb38cd3b8..2d2922b9e98f 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,8 +1,6 @@
 AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
-DIST PyQt5_gpl-5.7.1.tar.gz 3733746 BLAKE2B de8aea058876d740f391901434fa2c7ca1760b323b555efb48b06f8ba3213baccec676bc3984832e0775b28f0d2b2ddf0c37fa35317c237ed9af2e20469ff9ae SHA512 7498713f73807522e58ae38ff58548cf80c2f2c418d6c55e20ce613cdc997e4ee7139076f1f152c7c3edb970bde14febc3496009f934e31ff71f01a1605f558f
 DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
 EBUILD PyQt5-5.10.1.ebuild 5681 BLAKE2B b14acb52f6f25a74333445c589af13415749a8bc60dfa50a9fa82f597b24856d0b6dbd10c061142103b85817ad4c4980d38baaf4fe7db1d5958e17631580430e SHA512 d99e76127a3445ef4ba7865213df1191bd4c967b5a7acf8389ee7d5521c95bc498e5dcd4c31478fd3f81f07ed457f81481f4bac6e978c3c5a2e190beb8e18e09
-EBUILD PyQt5-5.7.1.ebuild 5547 BLAKE2B 29e51fddc17c2cb03213d244f929165cc95d71b870fe121efed70166f0aeef5a6fd6d2ea9803c0038cfd37363e5abf9de66e0ac89d8e186a9c3fdad988809188 SHA512 187e6664388e61b62066e95797d0a467b30941441ff83872fbeed16abfdbacf5d4bf5ecc575f93ca83fa09e3be16af993d358bf99f3c16f76610aaceb27b1900
 EBUILD PyQt5-5.9.2.ebuild 5682 BLAKE2B 93851df68078e98b065a17126c72410333e4deffe3179e8977da2879ddf8fd7a613548957ad59db669b75efee515ccfab2475c3bd23c1e825325c346ccf0ff36 SHA512 25b4c7a922723a400d3050ccfb931e3594c608bf77268fcf57f33ae94112083fa9d5ea0db92746e70c6a774f9ed644a06165ddb85135d7bfe424895423bcce8e
 MISC metadata.xml 2458 BLAKE2B bbebf12bc59da0f7b6737598e9c683f6ec45872a7207c23fd5b47c73c68a9eeaaf9ac0d4fc18c05d3e79b22e333bbb43d2bb7bd70aaba80288d0fadf1020d8c1 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8
diff --git a/dev-python/PyQt5/PyQt5-5.7.1.ebuild b/dev-python/PyQt5/PyQt5-5.7.1.ebuild
deleted file mode 100644
index 757f91b7a17b..000000000000
--- a/dev-python/PyQt5/PyQt5-5.7.1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=${PN}_gpl-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
-else
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc64 x86"
-
-# TODO: QtNfc
-IUSE="bluetooth dbus debug declarative designer doc examples gles2 gui help location
-	multimedia network opengl positioning printsupport sensors serialport sql svg
-	testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( gui widgets )
-	webchannel? ( network )
-	webengine? ( network widgets? ( webchannel ) )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-QT_PV=${PV}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
-	~dev-qt/qtcore-${QT_PV}
-	~dev-qt/qtxml-${QT_PV}
-	bluetooth? ( ~dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		~dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( ~dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( ~dev-qt/designer-${QT_PV} )
-	gui? ( ~dev-qt/qtgui-${QT_PV}[gles2=] )
-	help? ( ~dev-qt/qthelp-${QT_PV} )
-	location? ( ~dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( ~dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( ~dev-qt/qtnetwork-${QT_PV} )
-	opengl? ( ~dev-qt/qtopengl-${QT_PV} )
-	positioning? ( ~dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( ~dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( ~dev-qt/qtsensors-${QT_PV} )
-	serialport? ( ~dev-qt/qtserialport-${QT_PV} )
-	sql? ( ~dev-qt/qtsql-${QT_PV} )
-	svg? ( ~dev-qt/qtsvg-${QT_PV} )
-	testlib? ( ~dev-qt/qttest-${QT_PV} )
-	webchannel? ( ~dev-qt/qtwebchannel-${QT_PV} )
-	webengine? ( ~dev-qt/qtwebengine-${QT_PV}[widgets?] )
-	webkit? ( ~dev-qt/qtwebkit-${QT_PV}[printsupport] )
-	websockets? ( ~dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( ~dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( ~dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( "${S}"/{ChangeLog,NEWS} )
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--sip-incdir="$(python_get_includedir)"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webengine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D%/}/tmp
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/PythonQt/Manifest b/dev-python/PythonQt/Manifest
index f512742ffd17..06acc1ace36e 100644
--- a/dev-python/PythonQt/Manifest
+++ b/dev-python/PythonQt/Manifest
@@ -1,8 +1,4 @@
-AUX PythonQt-3.1-commit-433-441.patch 15025 BLAKE2B 180a5e734a4434e0723b09dde5963cdde9eaaa8865603b33fa69dfe78468e3699e87748d92130d3b584c3791923d8b6bbec79c045cd29ca9ff8e22d10b3225de SHA512 c1cc65defa0b34df3299f6c6c2c36daa1c3e205fbbb1ee8d9a6e3a2571b58be2ea4e101a137dc867598ef289222c94f26f5142dbd2ec3fff226ddea47cf3ec59
-DIST PythonQt3.1.zip 4526699 BLAKE2B 37d79f4d12bc1e4909d08c0ba4c2b95c233aba5097898498575733f323a8d1a5079e85e35e6272d0271421cb945d8a359330ba5ac9854ebcc7b95030b6cf1ad1 SHA512 b3c208e3f909ebb15d40a6e83385f03e6196a8439e39cad4f924e7b1e774edbce83680298ab032161619d1358696a0d073028860f68540aadd8028b712ae8fc1
 DIST PythonQt3.2.zip 4539058 BLAKE2B c50b8333b71b6cbce6f372a0292a0ccfe791dc7eae5c660d4e6d1f5f2b3355644e3fd8cce9a514f0500e935f96c46976d0046ddd716465adb35d225e3c4cfeca SHA512 1ee0f50f5035568b38e945108f5496ba64355c6357c1ea8dfc17ad90fa360540769f94e0b3e0e398176e8a21c8afe139607f0b5a2e82c63f1cbd40201a25e0f0
-EBUILD PythonQt-3.1-r1.ebuild 2029 BLAKE2B 8cfa824f0661bf1a64dee441ef65d8dbdc344eb3838fc2b52ab8ede4de35c09591d214b904290465cce34382808c1dcddded91f510f490855e6d11d538a7095b SHA512 e4a9ef97155c7dd32b850023827029a8cb2caf8f505054228d4f11a1518755551192a7bf8e9a3f3dba5b306135e352669a1a2a4d2f64d6ca983dbbe2ca0fb279
-EBUILD PythonQt-3.1.ebuild 1950 BLAKE2B e32ad4eb8b768628479946403713ef91f41419c97b9951b58c1e1b5ff3c310d0b085572660c22bbf3dc1d8efcc3aedfda1f29945cc56a95d3bb40cfbb35e1c27 SHA512 fd3b6db4306fb00df4be264a8bcc37390cf5cbe549177c0739e6a7be89c22c66935123a98640a1dd8ed37ccbd51088a25633bbddc6b3d69a84c64cf8a9908555
 EBUILD PythonQt-3.2.ebuild 1847 BLAKE2B cba31bddadaa3b0035d54b131c3f4e22bb0aa4e6d7202485f496c36d81e637b48343e2447f5e86eaddae3fe14b20b86d70d19a5af7469820994b664d0f4b8787 SHA512 815486fd8e171e8abc06a0e6465473e070d043b2074871c084f4584b9a21ad01981c86632d1bcaf20a0e097ef86a3f863e3b6c23d2ea347aee707e96f0e6d6cb
 EBUILD PythonQt-9999.ebuild 1864 BLAKE2B 14ada5f74d25d0797dbdeaccfa12746e89b5b27031e53d78dc4ff228b26766054a91af4b0025ccb1618ba42354d06ae6d1338a399fb23374d998b1f3d1a32d76 SHA512 3120052842008e64193375e20573194b637161534ba8a9a08e3572b6c777c3240724e28619bd80b9d6fbed8ff7fc6efe14005b4c690f0197c811cce8ecc0bb46
 MISC metadata.xml 971 BLAKE2B 4a9f0fd3832f83eb46ef65a18774c998daeb9544b1ac6a23a189b909c7e4168031a68d56952d9ed2b7b76fb8fc3a912e77d162cb94e73405f285bd834644fb98 SHA512 565d8517faba162fa855acef4dc659af22954796a25da9479d7ec530afee16606904b6bfba9a568e6caa8c47f3195401eefc3a9048077e73582cf7357cafce5e
diff --git a/dev-python/PythonQt/PythonQt-3.1-r1.ebuild b/dev-python/PythonQt/PythonQt-3.1-r1.ebuild
deleted file mode 100644
index efab4efcc45e..000000000000
--- a/dev-python/PythonQt/PythonQt-3.1-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-MY_P=${PN}${PV}
-
-inherit qmake-utils python-single-r1
-
-DESCRIPTION="A dynamic Python binding for the Qt framework"
-HOMEPAGE="http://pythonqt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pythonqt/pythonqt/${P}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +extensions webkit"
-
-RDEPEND="${PYTHON_DEPS}
-	<dev-qt/qtcore-5.9:5
-	<dev-qt/qtgui-5.9:5
-	<dev-qt/qtwidgets-5.9:5
-	extensions? (
-		<dev-qt/designer-5.9:5
-		<dev-qt/qtdeclarative-5.9:5[widgets]
-		<dev-qt/qtmultimedia-5.9:5[widgets]
-		<dev-qt/qtnetwork-5.9:5
-		<dev-qt/qtopengl-5.9:5
-		<dev-qt/qtprintsupport-5.9:5
-		<dev-qt/qtsql-5.9:5
-		<dev-qt/qtsvg-5.9:5
-		<dev-qt/qtxml-5.9:5
-		<dev-qt/qtxmlpatterns-5.9:5
-		webkit? ( <dev-qt/qtwebkit-5.9:5 )
-	)"
-DEPEND="${RDEPEND}
-	<dev-qt/qtxml-5.9:5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="webkit? ( extensions ) ${PYTHON_REQUIRED_USE}"
-
-# Bring uitools back, backport other fixes from trunk
-PATCHES=( "${FILESDIR}/${P}-commit-433-441.patch" )
-
-src_prepare() {
-	default
-
-	if ! use extensions ; then
-		sed -i '/SUBDIRS/s/extensions//' PythonQt.pro || die "sed for extensions"
-	fi
-	if ! use webkit ; then
-		# Remove webkit support if not used
-		sed -i '/qtHaveModule(webkit):CONFIG += PythonQtWebKit/d' \
-			extensions/PythonQt_QtAll/PythonQt_QtAll.pro \
-			|| die "sed for webkit"
-	fi
-
-	# Unset python version to use python-config
-	sed -i "/unix:PYTHON_VERSION=/s/2.7//" build/python.prf \
-		|| die "sed for python version"
-}
-
-src_configure() {
-	eqmake5 PREFIX="${ED%/}"/usr
-}
-
-src_install() {
-	einstalldocs
-
-	# Includes
-	insinto /usr/include/PythonQt
-	doins -r src/*.h
-	insinto /usr/include/PythonQt/gui
-	doins -r src/gui/*.h
-
-	if use extensions ; then
-		insinto /usr/include/PythonQt/extensions/PythonQt_QtAll
-		doins -r extensions/PythonQt_QtAll/*.h
-	fi
-
-	# Libraries
-	dolib.so lib/libPythonQt*
-}
diff --git a/dev-python/PythonQt/PythonQt-3.1.ebuild b/dev-python/PythonQt/PythonQt-3.1.ebuild
deleted file mode 100644
index 147196f81ea7..000000000000
--- a/dev-python/PythonQt/PythonQt-3.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-MY_P=${PN}${PV}
-
-inherit qmake-utils python-single-r1
-
-DESCRIPTION="A dynamic Python binding for the Qt framework"
-HOMEPAGE="http://pythonqt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pythonqt/pythonqt/${P}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +extensions webkit"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	extensions? (
-		dev-qt/designer:5
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5
-		webkit? ( dev-qt/qtwebkit:5 )
-	)"
-DEPEND="${RDEPEND}
-	dev-qt/qtxml:5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="webkit? ( extensions ) ${PYTHON_REQUIRED_USE}"
-
-# Bring uitools back, backport other fixes from trunk
-PATCHES=( "${FILESDIR}/${P}-commit-433-441.patch" )
-
-src_prepare() {
-	default
-
-	if ! use extensions ; then
-		sed -i '/SUBDIRS/s/extensions//' PythonQt.pro || die "sed for extensions"
-	fi
-	if ! use webkit ; then
-		# Remove webkit support if not used
-		sed -i '/qtHaveModule(webkit):CONFIG += PythonQtWebKit/d' \
-			extensions/PythonQt_QtAll/PythonQt_QtAll.pro \
-			|| die "sed for webkit"
-	fi
-
-	# Unset python version to use python-config
-	sed -i "/unix:PYTHON_VERSION=/s/2.7//" build/python.prf \
-		|| die "sed for python version"
-}
-
-src_configure() {
-	eqmake5 PREFIX="${ED%/}"/usr
-}
-
-src_install() {
-	einstalldocs
-
-	# Includes
-	insinto /usr/include/PythonQt
-	doins -r src/*.h
-	insinto /usr/include/PythonQt/gui
-	doins -r src/gui/*.h
-
-	if use extensions ; then
-		insinto /usr/include/PythonQt/extensions/PythonQt_QtAll
-		doins -r extensions/PythonQt_QtAll/*.h
-	fi
-
-	# Libraries
-	dolib.so lib/libPythonQt*
-}
diff --git a/dev-python/PythonQt/files/PythonQt-3.1-commit-433-441.patch b/dev-python/PythonQt/files/PythonQt-3.1-commit-433-441.patch
deleted file mode 100644
index 90d3cb9d2ec9..000000000000
--- a/dev-python/PythonQt/files/PythonQt-3.1-commit-433-441.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-diff -uprNEBZ --suppress-blank-empty a/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp b/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp
---- a/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp	2016-06-09 06:46:16.000000000 -0500
-+++ b/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp	2016-07-25 06:06:45.000000000 -0500
-@@ -45,6 +45,7 @@ void PythonQt_init_QtXmlPatterns(PyObjec
- void PythonQt_init_QtMultimedia(PyObject*);
- void PythonQt_init_QtQml(PyObject*);
- void PythonQt_init_QtQuick(PyObject*);
-+void PythonQt_init_QtUiTools(PyObject*);
- 
- #ifdef PYTHONQT_WITH_WEBKIT
- void PythonQt_init_QtWebKit(PyObject*);
-@@ -67,6 +68,7 @@ namespace PythonQt_QtAll
-     PythonQt_init_QtMultimedia(0);
-     PythonQt_init_QtQml(0);
-     PythonQt_init_QtQuick(0);
-+    PythonQt_init_QtUiTools(0);
-   };
- };
- 
-diff -uprNEBZ --suppress-blank-empty a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro
---- a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro	2016-06-09 07:00:18.000000000 -0500
-+++ b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro	2016-07-25 06:06:45.000000000 -0500
-@@ -21,7 +21,7 @@ SOURCES +=                \
- 
- QT += gui svg sql network xml xmlpatterns opengl
- QT += widgets printsupport multimedia multimediawidgets
--QT += quick qml quickwidgets
-+QT += quick qml quickwidgets uitools
- 
- include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_core/com_trolltech_qt_core.pri)
- include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_gui/com_trolltech_qt_gui.pri)
-@@ -34,6 +34,7 @@ include ($$PYTHONQT_GENERATED_PATH/com_t
- include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_multimedia/com_trolltech_qt_multimedia.pri)
- include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_qml/com_trolltech_qt_qml.pri)
- include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_quick/com_trolltech_qt_quick.pri)
-+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_uitools/com_trolltech_qt_uitools.pri)
- 
- PythonQtWebKit {
-   QT += webkit webkitwidgets
-diff -uprNEBZ --suppress-blank-empty a/generator/abstractmetalang.cpp b/generator/abstractmetalang.cpp
---- a/generator/abstractmetalang.cpp	2015-06-18 08:32:57.000000000 -0500
-+++ b/generator/abstractmetalang.cpp	2016-08-03 02:16:08.000000000 -0500
-@@ -838,14 +838,24 @@ AbstractMetaFunctionList AbstractMetaCla
-     return returned;
- }
- 
--bool AbstractMetaClass::hasDefaultIsNull() const 
-+QString AbstractMetaClass::getDefaultNonZeroFunction() const
- {
-+  foreach(const AbstractMetaFunction* fun, queryFunctionsByName("isEmpty")) {
-+    if (fun->actualMinimumArgumentCount()==0 && fun->isPublic()) {
-+      return "isEmpty";
-+    }
-+  }
-+  foreach(const AbstractMetaFunction* fun, queryFunctionsByName("isValid")) {
-+    if (fun->actualMinimumArgumentCount() == 0 && fun->isPublic()) {
-+      return "isValid";
-+    }
-+  }
-   foreach(const AbstractMetaFunction* fun, queryFunctionsByName("isNull")) {
--    if (fun->actualMinimumArgumentCount()==0) {
--      return true;
-+    if (fun->actualMinimumArgumentCount() == 0 && fun->isPublic()) {
-+      return "isNull";
-     }
-   }
--  return false;
-+  return QString();
- }
- 
- /*******************************************************************************
-diff -uprNEBZ --suppress-blank-empty a/generator/abstractmetalang.h b/generator/abstractmetalang.h
---- a/generator/abstractmetalang.h	2014-09-25 05:51:32.000000000 -0500
-+++ b/generator/abstractmetalang.h	2016-08-01 04:12:32.000000000 -0500
-@@ -800,7 +800,8 @@ public:
-     void setHasCloneOperator(bool on) { m_has_clone_operator = on; }
-     bool hasCloneOperator() const { return m_has_clone_operator; }
- 
--    bool hasDefaultIsNull() const;
-+    QString getDefaultNonZeroFunction() const;
-+
-     void addPropertySpec(QPropertySpec *spec) { m_property_specs << spec; }
-     QList<QPropertySpec *> propertySpecs() const { return m_property_specs; }
- 
-diff -uprNEBZ --suppress-blank-empty a/generator/merge.sh b/generator/merge.sh
---- a/generator/merge.sh	1969-12-31 18:00:00.000000000 -0600
-+++ b/generator/merge.sh	2010-03-05 16:03:37.000000000 -0600
-@@ -0,0 +1,11 @@
-+#!/bin/sh
-+
-+xsltproc -o typesystem_core.xml --stringparam source 'typesystem_core-qtscript.xml'  merge.xsl typesystem_core-common.xml
-+xsltproc -o typesystem_gui.xml --stringparam source 'typesystem_gui-qtscript.xml'  merge.xsl typesystem_gui-common.xml
-+xsltproc -o typesystem_opengl.xml --stringparam source 'typesystem_opengl-qtscript.xml'  merge.xsl typesystem_opengl-common.xml
-+xsltproc -o typesystem_network.xml --stringparam source 'typesystem_network-qtscript.xml'  merge.xsl typesystem_network-common.xml
-+xsltproc -o typesystem_xml.xml --stringparam source 'typesystem_xml-qtscript.xml'  merge.xsl typesystem_xml-common.xml
-+xsltproc -o typesystem_webkit.xml --stringparam source 'typesystem_webkit-qtscript.xml'  merge.xsl typesystem_webkit-common.xml
-+xsltproc -o typesystem_sql.xml --stringparam source 'typesystem_sql-qtscript.xml'  merge.xsl typesystem_sql-common.xml
-+xsltproc -o typesystem_svg.xml --stringparam source 'typesystem_svg-qtscript.xml'  merge.xsl typesystem_svg-common.xml
-+xsltproc -o typesystem_xmlpatterns.xml --stringparam source 'typesystem_xmlpatterns-qtscript.xml'  merge.xsl typesystem_xmlpatterns-common.xml
-\ No newline at end of file
-diff -uprNEBZ --suppress-blank-empty a/generator/setupgenerator.cpp b/generator/setupgenerator.cpp
---- a/generator/setupgenerator.cpp	2016-05-03 04:25:38.000000000 -0500
-+++ b/generator/setupgenerator.cpp	2016-08-01 04:12:32.000000000 -0500
-@@ -105,7 +105,7 @@ static QStringList getOperatorCodes(cons
-       r.insert("PythonQt::Type_InplaceXor");
-     }
-   }
--  if (cls->hasDefaultIsNull()) {
-+  if (!cls->getDefaultNonZeroFunction().isEmpty()) {
-     r.insert("PythonQt::Type_NonZero");
-   }
- 
-diff -uprNEBZ --suppress-blank-empty a/generator/shellheadergenerator.cpp b/generator/shellheadergenerator.cpp
---- a/generator/shellheadergenerator.cpp	2016-05-10 10:01:30.000000000 -0500
-+++ b/generator/shellheadergenerator.cpp	2016-08-09 07:20:29.000000000 -0500
-@@ -267,7 +267,11 @@ void ShellHeaderGenerator::write(QTextSt
-   QList<FlagsTypeEntry*> flags;
-   foreach(AbstractMetaEnum* enum1, enums1) {
-     // catch gadgets and enums that are not exported on QObjects...
--    if ((enum1->wasProtected() || enum1->wasPublic()) && (!meta_class->isQObject() || !enum1->hasQEnumsDeclaration())) {
-+    // since we don't parse Q_FLAG(S), we also need to generate for Q_ENUM which might
-+    // have a missing Q_FLAG(S) declaration.
-+    if ((enum1->wasProtected() || enum1->wasPublic()) && 
-+      (!meta_class->isQObject() || !enum1->hasQEnumsDeclaration() || enum1->typeEntry()->flags()))
-+    {
-       enums << enum1;
-       if (enum1->typeEntry()->flags()) {
-         flags << enum1->typeEntry()->flags();
-@@ -395,8 +399,13 @@ void ShellHeaderGenerator::write(QTextSt
-   if (meta_class->hasDefaultToStringFunction() || meta_class->hasToStringCapability()) {
-     s << "    QString py_toString(" << meta_class->qualifiedCppName() << "*);" << endl; 
-   }
--  if (meta_class->hasDefaultIsNull()) {
--    s << "    bool __nonzero__(" << meta_class->qualifiedCppName() << "* obj) { return !obj->isNull(); }" << endl; 
-+  QString nonZeroFunc = meta_class->getDefaultNonZeroFunction();
-+  if (!nonZeroFunc.isEmpty()) {
-+    s << "    bool __nonzero__(" << meta_class->qualifiedCppName() << "* obj) { return ";
-+    if (nonZeroFunc != "isValid") {
-+      s << "!";
-+    }
-+    s << "obj->" << nonZeroFunc << "(); }" << endl;
-   }
- 
-   AbstractMetaFieldList fields = meta_class->fields();
-diff -uprNEBZ --suppress-blank-empty a/generator/typesystem_core.xml b/generator/typesystem_core.xml
---- a/generator/typesystem_core.xml	2016-05-30 07:33:59.000000000 -0500
-+++ b/generator/typesystem_core.xml	2016-06-13 04:54:38.000000000 -0500
-@@ -550,6 +550,8 @@
-   <rejection class="QObject" function-name="disconnectNotify"/>
-   <rejection class="QObject" function-name="registerUserData"/>
-   <rejection class="QProcess" function-name="pid"/>
-+  <rejection class="QProcess" function-name="setInheritHandles"/>
-+  <rejection class="QProcess" function-name="inheritHandles"/>
-   <rejection class="QRegion" function-name="cleanUp"/>
-   <rejection class="QSettings" function-name="registerFormat"/>
-   <rejection class="QVector" function-name="back"/>
-diff -uprNEBZ --suppress-blank-empty a/generator/typesystem_gui.xml b/generator/typesystem_gui.xml
---- a/generator/typesystem_gui.xml	2016-06-01 03:20:27.000000000 -0500
-+++ b/generator/typesystem_gui.xml	2016-06-20 04:58:59.000000000 -0500
-@@ -1307,6 +1307,17 @@ PyObject* constScanLine(QImage* image, i
-   <object-type name="QWizard">
-     <!-- ### Requires correct class name in meta object -->
-     <modify-function signature="setDefaultProperty(const char *, const char *, const char *)" remove="all"/>
-+    
-+    <modify-function signature="addPage(QWizardPage*)">
-+      <modify-argument index="1">
-+        <define-ownership owner="c++" />
-+      </modify-argument>
-+    </modify-function>
-+    <modify-function signature="setButton(QWizard::WizardButton, QAbstractButton*)">
-+      <modify-argument index="2">
-+        <define-ownership owner="c++" />
-+      </modify-argument>
-+    </modify-function>
-   </object-type>
-   <object-type name="QWizardPage">
-   </object-type>
-diff -uprNEBZ --suppress-blank-empty a/src/PythonQtConversion.cpp b/src/PythonQtConversion.cpp
---- a/src/PythonQtConversion.cpp	2016-06-02 07:30:53.000000000 -0500
-+++ b/src/PythonQtConversion.cpp	2016-07-21 08:36:40.000000000 -0500
-@@ -746,9 +746,14 @@ QString PythonQtConv::PyObjGetRepresenta
- QString PythonQtConv::PyObjGetString(PyObject* val, bool strict, bool& ok) {
-   QString r;
-   ok = true;
-+#ifndef PY3K
-+  // in Python 3, we don't want to convert to QString, since we don't know anything about the encoding
-+  // in Python 2, we assume the default for str is latin-1
-   if (val->ob_type == &PyBytes_Type) {
--    r = QString(PyBytes_AS_STRING(val));
--  } else if (PyUnicode_Check(val)) {
-+    r = QString::fromLatin1(PyBytes_AS_STRING(val));
-+  } else
-+#endif
-+  if (PyUnicode_Check(val)) {
- #ifdef PY3K
-     r = QString::fromUtf8(PyUnicode_AsUTF8(val));
- #else
-@@ -976,8 +981,15 @@ QVariant PythonQtConv::PyObjToQVariant(P
- #endif
-     ) {
-     // no special type requested
--    if (PyBytes_Check(val) || PyUnicode_Check(val)) {
--      // NOTE: for compatibility reasons between Python 2/3 we don't use ByteArray for PyBytes_Type
-+    if (PyBytes_Check(val)) {
-+#ifdef PY3K
-+      // In Python 3, it is a ByteArray
-+      type = QVariant::ByteArray;
-+#else
-+      // In Python 2, we need to use String, since it might be a string
-+      type = QVariant::String;
-+#endif
-+    } else if (PyUnicode_Check(val)) {
-       type = QVariant::String;
-     } else if (val == Py_False || val == Py_True) {
-       type = QVariant::Bool;
-@@ -1117,6 +1129,14 @@ QVariant PythonQtConv::PyObjToQVariant(P
-     }
- 
-   case QVariant::ByteArray:
-+    {
-+      bool ok;
-+#ifdef PY3K
-+      v = QVariant(PyObjGetBytes(val, false, ok));
-+#else
-+      v = QVariant(PyObjGetString(val, false, ok));
-+#endif
-+    }
-   case QVariant::String:
-     {
-       bool ok;
-@@ -1504,7 +1524,7 @@ QByteArray PythonQtConv::getCPPTypeName(
- bool PythonQtConv::isStringType(PyTypeObject* type)
- {
- #ifdef PY3K
--  return type == &PyUnicode_Type
-+  return type == &PyUnicode_Type;
- #else
-   return type == &PyUnicode_Type || type == &PyString_Type;
- #endif
-diff -uprNEBZ --suppress-blank-empty a/src/PythonQt.cpp b/src/PythonQt.cpp
---- a/src/PythonQt.cpp	2016-05-23 02:31:11.000000000 -0500
-+++ b/src/PythonQt.cpp	2016-06-20 03:26:33.000000000 -0500
-@@ -1977,6 +1977,7 @@ void PythonQtPrivate::buildDynamicMetaOb
-   // Now look for slots: (this is a bug in QMetaObjectBuilder, all signals need to be added first)
-   while (PyDict_Next(dict, &pos, &key, &value)) {
-     if (PythonQtProperty_Check(value)) {
-+      needsMetaObject = true;
-       PythonQtProperty* prop = (PythonQtProperty*)value;
-       QMetaPropertyBuilder newProp = builder.addProperty(PyString_AsString(key), prop->data->cppType);
-       newProp.setReadable(true);
-diff -uprNEBZ --suppress-blank-empty a/src/PythonQtSlotDecorator.cpp b/src/PythonQtSlotDecorator.cpp
---- a/src/PythonQtSlotDecorator.cpp	2016-05-19 10:22:41.000000000 -0500
-+++ b/src/PythonQtSlotDecorator.cpp	2016-07-21 08:36:40.000000000 -0500
-@@ -42,9 +42,9 @@ int PythonQtSlotDecorator_init(PyObject
-   char* argName = 0;
-   PyObject* argResult = 0;
- 
--  static char* kwlist[] = {"name", "result", 0};
-+  static const char* kwlist[] = {"name", "result", 0};
-   static PyObject* emptyTuple = PyTuple_New(0);
--  if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore.Slot", kwlist, &argName, &argResult)) {
-+  if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore.Slot", (char**) kwlist, &argName, &argResult)) {
-     return 0;
-   }
- 
-diff -uprNEBZ --suppress-blank-empty a/src/PythonQtStdDecorators.cpp b/src/PythonQtStdDecorators.cpp
---- a/src/PythonQtStdDecorators.cpp	2016-06-06 06:45:45.000000000 -0500
-+++ b/src/PythonQtStdDecorators.cpp	2016-06-20 03:26:33.000000000 -0500
-@@ -153,12 +153,12 @@ QVariant PythonQtStdDecorators::property
-   return o->property(name);
- }
- 
--QString PythonQtStdDecorators::tr(QObject* obj, const QByteArray& text, const QByteArray& ambig, int n)
-+QString PythonQtStdDecorators::tr(QObject* obj, const QString& text, const QString& ambig, int n)
- {
- #if( QT_VERSION >= QT_VERSION_CHECK(5,0,0) )
--  return QCoreApplication::translate(obj->metaObject()->className(), text.constData(), ambig.constData(), n);
-+  return QCoreApplication::translate(obj->metaObject()->className(), text.toUtf8().constData(), ambig.toUtf8().constData(), n);
- #else
--  return QCoreApplication::translate(obj->metaObject()->className(), text.constData(), ambig.constData(), QCoreApplication::CodecForTr, n);
-+  return QCoreApplication::translate(obj->metaObject()->className(), text.toUtf8().constData(), ambig.toUtf8().constData(), QCoreApplication::CodecForTr, n);
- #endif
- }
- 
-diff -uprNEBZ --suppress-blank-empty a/src/PythonQtStdDecorators.h b/src/PythonQtStdDecorators.h
---- a/src/PythonQtStdDecorators.h	2016-06-06 06:45:45.000000000 -0500
-+++ b/src/PythonQtStdDecorators.h	2016-06-20 03:26:33.000000000 -0500
-@@ -106,10 +106,10 @@ public Q_SLOTS:
-   int static_Qt_qrand() { return qrand(); }
-   void static_Qt_qsrand(uint a) { qsrand(a); }
- 
--  QString tr(QObject* obj, const QByteArray& text, const QByteArray& ambig = QByteArray(), int n = -1);
-+  QString tr(QObject* obj, const QString& text, const QString& ambig = QString(), int n = -1);
- 
--  QByteArray static_Qt_SIGNAL(const QByteArray& s) { return QByteArray("2") + s; }
--  QByteArray static_Qt_SLOT(const QByteArray& s) { return QByteArray("1") + s; }
-+  QString static_Qt_SIGNAL(const QString& s) { return QString("2") + s; }
-+  QString static_Qt_SLOT(const QString& s) { return QString("1") + s; }
- 
-   void static_QTimer_singleShot(int msec, PyObject* callable);
- 
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 179c9769e92a..656c6771aee4 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -2,6 +2,6 @@ DIST QtPy-1.2.1.tar.gz 29210 BLAKE2B a0b091902c7c7ccde1dbe8cc7e235de2340f3b2d9bf
 DIST QtPy-1.3.1.tar.gz 25061 BLAKE2B 5e504c9fd6182c23ec7f3160f6d2c073bb64bf3145b4336420be39dfda2d942633792abdcf2b7c0772ca7066e497d456667cbec2067a7798114929b0c9ca2d7d SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008
 DIST QtPy-1.4.0.tar.gz 27019 BLAKE2B 6b90876f4801a19c98ddb8c4d678737a3b3ad61af1fe47c79b59b970ea4a895774bc554dfb9c99a4d806ad0316fb7c00e731c32a9d3f0a929a1f8bd4352851ab SHA512 7a989011114c17de29d5de6ff075935efdf9ebbae72d14580646bc81ce877f0beceaac511cade9e750dd9ee7e9f0f133c5676fa192ea906e7483feb543743379
 EBUILD QtPy-1.2.1.ebuild 944 BLAKE2B cde02e5cb515e0be44f0354ffbc802a629dba6625c17dae30c7417e9e1c6141a1a32f402e385467b0abf127d202da1b638795a7f5de936fc4f887dbaf9242b3a SHA512 c10bc35984b7db63d6dd2f5875a6d11aff9b4da13f415ad908e7351bb1a707d82565132f51ebe54d11655e3d138087c6decb5a7a39442f3edfd8ef81319433de
-EBUILD QtPy-1.3.1.ebuild 1359 BLAKE2B 3a5b50c793fa3fef2f76828a6bc847576cb73d391fc74c8f31a49fb76005d8b4b9302407596846ba92e72d7650fa255c933abb2715b16077cfc2d7e80621e595 SHA512 3f310737a2de023840906e7aad9c66c8df32b104c19d4a31b71f1d07bdb583a0e619d14875e96ff80ee8a7bdc1c044362769c3a56e8abb57d8e207191e32a71b
-EBUILD QtPy-1.4.0.ebuild 1380 BLAKE2B 14ff548f5ae0f9a2ca4bda569debf8cad1c6f2d62ef336cdfb442f19b7a5719329288aad70514c42b4660e13e192c75200770e81964fe28f3e24ef25f6824ea0 SHA512 6c1cd326adcffa66a2f1832f07df02289129da8ce6e53c9487eff41658232889dca3c513167598d5f9b945a2a88afd2cb8c14b6a208709d1158756240ed2ef4d
-MISC metadata.xml 1494 BLAKE2B 8744d5701e82a8cebbbf27394cc458e3b3906674b3388e3cf31b168019d2081b82b4a7a5466606a7ea3d423d31ae9e4372680abecdb69ae874aed81b3cd195d5 SHA512 b0ff953afb99e6ce972c8e7e58ab99c885381c0531731b8669e4a0b299d89cc6e33bcc4fc9658afd994a1f3979e0b623610a55856ead44c0a766f2fe74824ca5
+EBUILD QtPy-1.3.1-r1.ebuild 959 BLAKE2B bfec246e5c256da5777fc01244413a28802b600a371dd71826ddee440f973c6f621741325ad62c94c0322672495ffcec8616b704bc1c14ea2c58d5d46bd38792 SHA512 43cbf817d76fccc1fcde055c37918260045d060ed568b7e6594f0f40c2ee438a33afb43ca3ace169dfcb20a995c0f12c0f8c87ebfe1faddca7934faf38258d17
+EBUILD QtPy-1.4.0-r1.ebuild 980 BLAKE2B 8e44bc8639e870b349f81f0ccb5a11439e5f897645da1f0c99e6ce110ca412ec10072895c723920e2cfacc72a6015392f0020cde7c23783c8ce100536ea63f1f SHA512 fa31c3ab20096a44d6f7c367e2858757e9a66b77a7e991002104dd566e678cf9e3e753d8a52411be89bca7e3acb886f935c750743a33e7267220f689e7c28510
+MISC metadata.xml 1338 BLAKE2B 7eee8e39324b18bd84a076882dc539fe2e18f38ec68a539ab40968a3a6023ac0cdfc6899305df0ef0c7561409ca81526d474a1154fb645dccdffdb0779282b12 SHA512 08a2e0b2d0aaecaf91bffb82dbba9d24d4b4753801610102db08c3e29b3ff51f1bd6d46f9c2a706f4b9a887be781a97ead1c753631717f82cd44080d44b67c4c
diff --git a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..7987c23cfe1d
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
@@ -0,0 +1,32 @@
+# 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="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer gui opengl svg testlib webkit"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}
diff --git a/dev-python/QtPy/QtPy-1.3.1.ebuild b/dev-python/QtPy/QtPy-1.3.1.ebuild
deleted file mode 100644
index de40764e990a..000000000000
--- a/dev-python/QtPy/QtPy-1.3.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl +pyqt5 pyside svg testlib webkit"
-
-REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )"
-
-RDEPEND="
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
-		gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-		testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-	)
-	pyside? (
-		dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?]
-		gui? ( dev-python/pyside[${PYTHON_USEDEP},X] )
-		testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] )
-	)
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-
-	if ! use pyqt5; then
-		sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-
-	if ! use pyside; then
-		sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-}
diff --git a/dev-python/QtPy/QtPy-1.4.0-r1.ebuild b/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..0ec5a63afb85
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
@@ -0,0 +1,32 @@
+# 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="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer gui opengl svg testlib webkit webengine"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?,webengine?]
+	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}
diff --git a/dev-python/QtPy/QtPy-1.4.0.ebuild b/dev-python/QtPy/QtPy-1.4.0.ebuild
deleted file mode 100644
index 67ff013c69fe..000000000000
--- a/dev-python/QtPy/QtPy-1.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl +pyqt5 pyside svg testlib webkit webengine"
-
-REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )"
-
-RDEPEND="
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?,webengine?]
-		gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-		testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-	)
-	pyside? (
-		dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?]
-		gui? ( dev-python/pyside[${PYTHON_USEDEP},X] )
-		testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] )
-	)
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-
-	if ! use pyqt5; then
-		sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-
-	if ! use pyside; then
-		sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-}
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index f7b2b130bc4a..e1b8d6e3aa72 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -18,8 +18,6 @@
   <use>
     <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
     <flag name="gui">Build bindings for the QtGui module</flag>
-    <flag name="pyqt5">Enable the <pkg>dev-python/PyQt5</pkg> backend</flag>
-    <flag name="pyside">Enable the <pkg>dev-python/pyside</pkg> backend</flag>
     <flag name="svg">Build bindings for the QtSvg module</flag>
     <flag name="testlib">Build bindings for the QtTest module</flag>
     <flag name="webengine">Build bindings for the QtWebEngine module</flag>
diff --git a/dev-python/django_polymorphic/Manifest b/dev-python/django_polymorphic/Manifest
index 931b5cda5162..27b083e99bf3 100644
--- a/dev-python/django_polymorphic/Manifest
+++ b/dev-python/django_polymorphic/Manifest
@@ -1,7 +1,9 @@
 DIST django-polymorphic-1.2.tar.gz 100149 BLAKE2B ac7e92e113b595009d350282504845b6ba179549f555c523446ecf8a69a6915e2eedacc35e30333ac3579581b33528d0b7d5bf8ab6a900180c7f209cd1277fd8 SHA512 71d7293b5eb49ae49801d5d3e60af7c9bcb8729237fb92016dc14800c1955cac1ae5a9029a1d37048cdfd7200e1ee38d15e13859345b1032f202ff90f75fd325
+DIST django-polymorphic-2.0.2.tar.gz 99541 BLAKE2B f785eb0d63b79521c5dd1df1dd61ef5b5b560a67337e2d647bf56bea4524129074ab9766231c516397763152ab88c15fa35ec1386fd64bb725e93cfe11418cd3 SHA512 5790526debf68ea39b2cd578d33b0a5d715e7a5f20f83108a0fb26df956ba7b3bcbb10f67608f60df13d62f86efefe0152af7d069ca404b1b92fc9fdf71ffbd0
 DIST django_polymorphic-0.7.2.tar.gz 36041 BLAKE2B b878ad08b6ce85efb7801e4c7506e75fcae47f439c130c0457d65c60ae265803d4dd588061430ae64e0e51f9de4b4422f60417024ffdba25606cb66c253f12c4 SHA512 afe391f635fcde0490a4bfd64d373794134a2e56066e07236299c07669eaa8afbef6f6d1a6116061716edb95ef1db0c0e4da91a7e8516f517206499d41051250
 DIST django_polymorphic-0.9.2.tar.gz 39400 BLAKE2B 5c8d5c336e31891e05c12b43f8ed87d693182d9cbce41008624d6072b84eb2fa9882356642269e36cf04eed0b326dff1b57ef5007df40984159bec2649b5c904 SHA512 db22b880e042bf70ae215c95ce2cc5bca5f8622e7554af7c9e4b15daf10f45e70b255d9db2280a5de3a0c7a07dee3eb2b8cea5552b28c24ec8c301713165d993
 EBUILD django_polymorphic-0.7.2.ebuild 482 BLAKE2B 5018bfda035972850054fb659fb23f6db6821fff26e4f9627b244142251b5113517d7bd42a1ab2ccb2f6302b9724b310a4990cd38c20fb4ff8a8606b0a6eca34 SHA512 4e2dcc9a99594089ee6b96a978e7b796195bfe9761df411b8ea73c96ae6590b8328c67748dada3782945ecc15044f1d7329f5fbbd6a28e89839618c7cbdceb90
 EBUILD django_polymorphic-0.9.2.ebuild 482 BLAKE2B 716a6e25787e92885537aaebc57e22fb548ec73c4cfec8566aa09f48eb16a84749dad00c02abe20a94149d2eb42269ffd890fa7349f61c7b8b16a3ecea6c37cc SHA512 e31b6b14a02a8632bf5ebb15000f9dd04d4ebc593b50d0977bfc92b92bd348533eae6393512e28bcc5d475d481fd8242733149a6d0560b913fc127afc66b0774
 EBUILD django_polymorphic-1.2.ebuild 569 BLAKE2B 8fa9801c4096fef19be374a530614cd71a506c1adc90db0ceec593ec8cb10bb560520561860eca45bd88a348b7c2d18374206dc346376fb59b462b43b39c6731 SHA512 dae202af59e50445920b9ba808c9b77584e588f10bf7ba4e4960aebb829f3b18a6a8319e5a68e06154a27937650bd9180587d9d092a5fecc6f14375622dbba3f
+EBUILD django_polymorphic-2.0.2.ebuild 566 BLAKE2B bd9fee114a2ef346529fba923f572008aca0171cafcbee2f9d557d83027a3c64fca567e9bcaccc3c675dbb25c165e63d93d9b217e9cdb5216603ae6ef445d1a2 SHA512 ca999ac57b5fe8255b3d710b5fb8d236a01bdf74b31e51796b177f23b274d2adf7363bd45dc21f54e0d2a5be28e268e6997f3aff346b778b10216d7ed4f2d09c
 MISC metadata.xml 304 BLAKE2B e00d35195ae0451a93db9cddb09227e3e063027176a0fcae3abc0bb0cd7f3759277772fb4ea7996c51e3354ecbf7a486a83a6f45a8ef4141801fbadbf8231828 SHA512 81aeecce6bddd294dd7d7e212af8f8d1942f88aa9cd0c89b040e7c43fdfc028ab6d86e0ce3d7a8766ccc361eb00ef1e067effd1607532a64100d085c2374a836
diff --git a/dev-python/django_polymorphic/django_polymorphic-2.0.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-2.0.2.ebuild
new file mode 100644
index 000000000000..198f9cd61a48
--- /dev/null
+++ b/dev-python/django_polymorphic/django_polymorphic-2.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{2,3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
+HOMEPAGE="https://pypi.org/project/django-polymorphic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P//_/-}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.11[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${P//_/-}"
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 31975f122f83..4b1736289e3a 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,10 +1,10 @@
 DIST elasticsearch-5.5.1.tar.gz 33476827 BLAKE2B 4f37f13fcd0a236c5da5b74c4eec5ac9ce40234059643bed69b56e93a9d5b9758ebaf0f6d50155b7338c0c203cdd7296816d6c7bc5cb0ee5455e406e586c4bf8 SHA512 9bedd48396cdd6c39c107a7951eba8446b8574493bd44c17a79ba3443670a48b72c053006821cf69dc17bf49ff1c05904db14a07d8a6403b2d2061fc605937bd
-DIST elasticsearch-5.6.3.tar.gz 33774486 BLAKE2B 167b50e9565b1c67f0b8b31ea2b19aacbc2def62dabd84bee6e5fbd90f1a76d3d777edb17132fdae9d5b00ada1e895c7ca90566fb2675234789e1e028c448a58 SHA512 ee57d010e196eb25e5296fe95ab2de5e503d4d66f7eec8c8f6ac2ff9ddbc1a8dc1514202d705e291ee49d3e04650b597a9afc5f92f179b8faa5e2fe3c662f33e
 DIST elasticsearch-6.1.1.tar.gz 28462503 BLAKE2B a3ac6edf6ed110fc3832bc6b1c5e4d7acbc67ee2faeba35d9dc7215bbcf10fb3617cfbc050687d7361fc4b6f644afe9cbfc23591b5ae26e692f38dbf13872e7d SHA512 dcc23ef80ad2545490508d3e9db2fd0e6ae9a99cece0990f537c522265961dad234734548d1d86288af7f65a6ee681f5624d2c0e71df0e1dcc32fdb56dcefe92
+DIST elasticsearch-6.2.4.tar.gz 29056810 BLAKE2B 121be27ac1db4fa6bbe285161b3f2b2dd889859b50f46b57b68ed43514568c4aa9629b5ca32edcc2328a6e7245256d64901c8acc8b2dd91337f8ca97b87c46e1 SHA512 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941
 DIST elasticsearch-curator-5.1.2.tar.gz 290616 BLAKE2B 57c02ddaf188b8dd08286e47d4eaf4e0af05d65d89139f77f5d71274c394defe491393a7043bb426fa4b260c199e92221c1e57b6d24922898e5e3b8e9e2de58b SHA512 4ac0ae789fe662d352c3d228acc6aaf78873bb02b7108f985fd0a048d0b90cb2b30572eaa5f984025ab0d4209eda9d6fe6ac66cd8cc856f0707e3f12bb2e574d
-DIST elasticsearch-curator-5.3.0.tar.gz 292274 BLAKE2B e7830db810ab1fabbbf580db5e15d7ffe11d4bb85923c0e51fd8cc0b0a640c71664198ddcb0b9a3cc1ef92f06856854295063947ddc23a857f4d4701f5528427 SHA512 23a94c0a8b78cd0f3a27af76131c267c407dbafb504a4503e8c954e69cdb527ed334fbfcda068b2f1d28479762c430f665f661f827bdf3066f5bcdd50c82dc53
 DIST elasticsearch-curator-5.4.1.tar.gz 294363 BLAKE2B 180882cee9ed3424569705beda727f823cea0cfc47897d06b1cb8258166e40fc9913eb266481b09155a0f5f88b52a680b9187f69417983c2d78b5d24874489c3 SHA512 a2f187d99ebcf8069bfd472316aefe501719400268120c250812670e5525209cebffa913f5fb988305d963bb2a7b61cf47426905b856e34f41afd3a9d67d28f3
+DIST elasticsearch-curator-5.5.1.tar.gz 301351 BLAKE2B 1dfcf53995c203a7201e421bc9f01a840597d8c1099ae434be52ff27e47e30f509bf1c5a42d507b549f5fe8ce45cbe74614ea76c338b0ae9de1d51877c8b32fe SHA512 a0ccb35fe93cefb927020add9629d5879cb64ee41a25130150ee8c45867e210f611a5fca0a43357c6f68cbf0c3f0acf677a7f8d2b3b493f4c2815637640ed9f6
 EBUILD elasticsearch-curator-5.1.2.ebuild 3228 BLAKE2B 92a193fc2278315ff7cc67188600a48d3a2ecc98968bcf011b90debd62eb3b2fa728eccaf85d476bd503eaac10e48eeed89518b9db95f299bc980a50858c5954 SHA512 405c09c900b116bcac6ac2936e27bb40e7b97b9e804b30ee55fb3c92b95f61caa607268e5f264eaf941d47cd53857e9e6549922fda9a4da299e079f4b5141205
-EBUILD elasticsearch-curator-5.3.0.ebuild 3239 BLAKE2B 9e3df9eb894671207616f4bcea397cbc17b4b4bf9791a97a78115cf859fcfaeb30658077940f717e76b2d829659b6ac125f38425b757bb198c7cf90a5b32782a SHA512 2cd0e8e3ba8a02ee22884f5e7436203cfb386d1be90e1ecb50b5b6ba60f7ef1181fe6b32ae91f2615875f7e8ad1b75f4032e1902644a046585d8d88de8614406
 EBUILD elasticsearch-curator-5.4.1.ebuild 3229 BLAKE2B b43563ab3e0cde11ce7823a0dfc5ac2dfe6d3ebfe726859734153a63007a872d4b6ca74a8988aeb59cb8e502a8c479b4fb4e212b4eb711ee100f99cd8cb4741d SHA512 35f0749472eb1117d6086b2f0733f4d5c191ecc5e0270ddc6a3b03f9ab1955592d2417b1fbd29f546b231cd718049a782b2ba86aef0869d99d64702e20c5ea5a
+EBUILD elasticsearch-curator-5.5.1.ebuild 3358 BLAKE2B 7e6584f2ce49718446931ebc79f9552137d34a975101d70df3e7b6bbf849f6ce8c016464813422dae83e6839dd9ebbd0e93496e84a97bf9edbcce185c77e24fb SHA512 064a58f3ae727a9c30c356b77148856e8e42eb4059bf01a7e972747ed41041962127673a490783d10dda5644685352a35bb97ff7486278f25d680039c65d7ee4
 MISC metadata.xml 469 BLAKE2B 7c08e8c5ee97bee865afa27423349bf1998d868fea946d5d61b3eab77094a782d151677bac74f1b8c7ebbc4d88d323c3806251b463627994fcbda2a812524224 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.3.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.3.0.ebuild
deleted file mode 100644
index 01cb9487818f..000000000000
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.3.0.ebuild
+++ /dev/null
@@ -1,120 +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} )
-
-MY_PN="curator"
-ES_VERSION="5.6.3"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-# running tests in non-chroot environments:
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
-
-inherit distutils-r1
-
-DESCRIPTION="Tending time-series indices in Elasticsearch"
-HOMEPAGE="https://github.com/elasticsearch/curator"
-SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/click-6.7[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		virtual/jre:1.8
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25123"
-	ES_INSTANCE="gentoo-es-curator-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" "${ES_LOG}" 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_prepare_all() {
-	# avoid downloading from net
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	cd docs || die
-	emake -j1 man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
-	ewarn ""
-	ewarn "Example usage on Python 3:"
-	ewarn "export LC_ALL=en_US.UTF-8"
-	ewarn "export LANG=en_US.UTF-8"
-	ewarn "curator ..."
-}
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.ebuild
new file mode 100644
index 000000000000..ac00f389bed6
--- /dev/null
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.ebuild
@@ -0,0 +1,121 @@
+# 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} )
+
+MY_PN="curator"
+ES_VERSION="6.2.4"
+
+inherit distutils-r1
+
+DESCRIPTION="Tending time-series indices in Elasticsearch"
+HOMEPAGE="https://github.com/elasticsearch/curator"
+SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2018.01.18[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		virtual/jre:1.8
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	# avoid downloading from net
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+
+	# allow to use newer dev-python/elasticsearch-py
+	sed -e 's/elasticsearch==5.5.2/elasticsearch>=5.4.0/g' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+#
+# running tests in non-chroot environments:
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25123"
+	ES_INSTANCE="gentoo-es-curator-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" "${ES_LOG}" 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
+	ewarn ""
+	ewarn "Example usage on Python 3:"
+	ewarn "export LC_ALL=en_US.UTF-8"
+	ewarn "export LANG=en_US.UTF-8"
+	ewarn "curator ..."
+}
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index ffa8ce369567..8623c4ec10c8 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,3 +1,5 @@
 DIST fs-0.5.4.tar.gz 231333 BLAKE2B 2211aedf02a3eab809b7bfeabe346ed147465db52ef6a069ab3cea6f62e3b420d52b9a58868c3eaab55bd9a6c8c071c5c090e28e9dbfccd182385beee3e246c8 SHA512 d67c85f2816cf1a84c25664a6cf71dac551c3eec4eb34154bc92d52eb0efa9739adca6d0ec86b9978ff6af408cfa17b913ee8fd4c143cd2adf862ca0a1dd4c5d
+DIST fs-2.0.21.tar.gz 115844 BLAKE2B 0f7b3fa087c89a68c27d350233e3e73fa54b761bad7799a895fd79fb5a7df898df381e82bd160ccb782e7e814b00041d3cd309860c96b4ea5dc3078e6d33430b SHA512 d16e02a6ed78a26229b12e71f6286db0243774ae13f6f3d0a6c4fb9240fe65656e4f10cb2b385342fb48d12a163ca33a0b746854ab5ee240eae0ff8f6644ed13
 EBUILD fs-0.5.4.ebuild 992 BLAKE2B 28cc40563f00489241fe57230b279e6ef02ff694e08351b89e01ac986eddeea2c1c12f829878f2d7333ff0f1661bb1fe80f65589bb485028aee5868c836c6f99 SHA512 543331f3bf18257f197b60d548c5e6a1a579a596bc61bde093ac5f1393eb525fbb78ac603249dc5f360e826964b4c25ca194bf3b5e75a28d21425d5d5a40ef22
+EBUILD fs-2.0.21.ebuild 992 BLAKE2B 28cc40563f00489241fe57230b279e6ef02ff694e08351b89e01ac986eddeea2c1c12f829878f2d7333ff0f1661bb1fe80f65589bb485028aee5868c836c6f99 SHA512 543331f3bf18257f197b60d548c5e6a1a579a596bc61bde093ac5f1393eb525fbb78ac603249dc5f360e826964b4c25ca194bf3b5e75a28d21425d5d5a40ef22
 MISC metadata.xml 486 BLAKE2B 69d62d79b3d0e05fb12bbf8a4d4f703f82488cace87e8f42aaace9319c18f564c3c841b5b69a189530ffb760bceb1acb9fce38472af659a6c4ce24b1bddc16c0 SHA512 48e48fb5f3c868fb8e1b9dce7c483c13291659c99e0f19e096204451e1ada83fb0d2334d89a3beb45de11b7e710a3deb9e5777e5c8f905312efe899cbee02d07
diff --git a/dev-python/fs/fs-2.0.21.ebuild b/dev-python/fs/fs-2.0.21.ebuild
new file mode 100644
index 000000000000..c657c5f97cf5
--- /dev/null
+++ b/dev-python/fs/fs-2.0.21.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=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Filesystem abstraction layer"
+HOMEPAGE="
+	https://pypi.org/project/fs/
+	https://docs.pyfilesystem.org
+	https://www.willmcgugan.com/tag/fs/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/dexml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+# Tries to access FUSE
+RESTRICT=test
+
+python_test() {
+	nosetests --verbose || die
+}
+
+pkg_postinst() {
+	optfeature "S3 support" dev-python/boto
+	optfeature "SFTP support" dev-python/paramiko
+	optfeature "Browser support" dev-python/wxpython
+}
diff --git a/dev-python/gnuplot-py/Manifest b/dev-python/gnuplot-py/Manifest
index 94d211cba567..b2a9d496147d 100644
--- a/dev-python/gnuplot-py/Manifest
+++ b/dev-python/gnuplot-py/Manifest
@@ -1,4 +1,4 @@
 AUX gnuplot-py-1.7-mousesupport.patch 2596 BLAKE2B f3fa9063718d6d3ce9ad847c8517f6728f7f32064cc5c13165a993aca556257e600371542f5b2bb34b868cd5a07196ffd7587b852c266229fada49b1288358f7 SHA512 5dee0dcb4b24aef830a9c65678dcb4ca1a831a7dff04723e2248219883e578cdc136b668f05ab95d13c7bbd7da47b20012e0b3d1149342bb64336325c2f1dbbd
 DIST gnuplot-py-1.8.tar.gz 118828 BLAKE2B 880062169b2fa047d60318cc7dc556c60794bfd81317681395329a56712506f7e406efecb79f37cd98103e76a6feb8b635e55fe056c3ce5bee0c670c8bcaf7a8 SHA512 748dc95ea53acd362f67c821a3cc7cf23b6329c2dd13c130c91e1c9f89afe1ffd84619ed321923c65455adf86ee58976dd6dd187881ee3ede5e0f5f551fb027d
-EBUILD gnuplot-py-1.8-r1.ebuild 854 BLAKE2B 54116bdca00021f668a317fe6ace37359752345107704936ce80169178fe24828e2cfccf26c6deb9d1a61eb3d5eb4eff7e87a086b223a928e69c91f5024e8fd3 SHA512 d840d450515ec30fc55ea0d1921e25f6b829f88d191222fceae25c736458ba10a5e59b3ad78e8b50000876af49312297e2f02e07f43455086578b1be12ff74de
+EBUILD gnuplot-py-1.8-r1.ebuild 855 BLAKE2B 7f3a1d3543c386a3beabb84efe7162d0667d66410f6307422dff2e84f3e6e5b85f2dfbdf2391f9db372995bb2ced17f085af2cd54886fbb5708538d5fc5daae2 SHA512 ecaf45fed606f1f0653cdee122d930edee1a1fd208dd541dce609c07e1218eaedc2c9afc798b16c702975c016f0c3a860f6e53ca7604ea94a7f995d19ff949f1
 MISC metadata.xml 903 BLAKE2B d642116ef411d7556dffe4486d5360d7dce68927ccead0e3c00261cd89be47fab812ef9fc9455489dd79251f0a16f3c2ce5c1e9b826871f35a2e09b47da61988 SHA512 a007d4c76b4c868757567a8c37d95a825a95b2d21c4a19d050834c3e36753014f2ef8d69e3b99c7eaa52d8e8a5e6ecaca5a9bc4e23079367b055af62447aca69
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
index dd6977fde737..de2582903119 100644
--- a/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
+++ b/dev-python/gnuplot-py/gnuplot-py-1.8-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
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 2840cf3f8725..2825d1a3ad5e 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -6,7 +6,7 @@ AUX ipython-3.2.1-set-model-mimetype-even-when-content-False.patch 2329 BLAKE2B
 DIST ipython-3.2.1.tar.gz 10884249 BLAKE2B eaeb5ad3cb1cfd38c5f81e0d312773e0ba617fc2ef735f5705edafd2e9bc65169302ea8f775843c7da5029bce0dccb541233a7c82faf58a676ac5079f9664734 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe
 DIST ipython-5.4.1.tar.gz 4973571 BLAKE2B bbda7b5a172ea1e80a9867f036ef68d1d0ec0a7340d77d8b4bbce63c5db7d3aade106ee5a6d59fb7e2b773c37d8263e51e1eaaa81d582849a70de60e93b7205a SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907
 DIST ipython-6.1.0.tar.gz 5066094 BLAKE2B 4f68776ba15f50b2f0fcc1503dd5c62ac464d9d0ace0801f572c9cdc1a0ddd7d840369a3df5940551c848376985cc74848002cef53869014adb2fd9714989acd SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b
-EBUILD ipython-3.2.1-r1.ebuild 5049 BLAKE2B dfa09c80e7b558bf7efe9fafda23b2555987b196844b9707ce8e8b564a6e58a8d132284d0a16eb9f9b91896b361a0e2327849cdf7c5863de04a5c726604e7d0e SHA512 687dc470606dd48fd2128c7f8d1850cedb95bc4bb18be81f72b9656a06889741cad28c10a6f13a73b069c43794299c8127a33ced778eb350f367db5399352f5b
+EBUILD ipython-3.2.1-r1.ebuild 5050 BLAKE2B 06a8e2975c74bacf44cfd810b8cca31482bb80d9042058a232cdcdc71636039106ee5331ec8f4d2b341239d0bcd82a51d84ede54dc72286b19fead536f838e5b SHA512 418f91f9da20347c1b6d3e09a9cf24f1ee46adaf9b90b0fdc3932f061484dd563b85c356aaecb9690a3f141ce422a1bb43a8caff978173afedf9139fe731f222
 EBUILD ipython-5.4.1.ebuild 3660 BLAKE2B 1194832e0fa675d74a90f8e5010c8e3be03c0e163f64e118a3ef7761ae324de3ec01973b20dfd7dfce2c220c95f8bb08753e8e458d5041b6528216aec30f0aa3 SHA512 0bd84e4422af2b26c8832bf922f093d453cdd65c9b68509b52bfc1395376c29e151815852dbfc650aab1bc96ce447e46b2dfd067c6f9fc3287bc88eb82f8d73d
 EBUILD ipython-6.1.0.ebuild 3392 BLAKE2B af1d71f219bafc6320f3454c9f66f4176237a51b5338184a3627a077ffc6dce123771c18bbad40dd282c9acaae0c9f2665088d0c28bfe5aa78f739137b7a38a6 SHA512 4a0a548881b1e31e8bcdaca02fac5a24df9e9c773fdba0fdd2a6d7f4ccac56d8cff5744ce49502bc943eb6610bf4b6a1e5a2715aaf21daee140b9b27845e97ec
 MISC metadata.xml 3035 BLAKE2B 02b40c2c8b11edf3e5d24f4fcec3e99369924cf1067e72c5a64d3a8e2373e318e2d8131b3b47e09527051fb6027af833f29488cab833dc7b71d2a76367b5e5f7 SHA512 a841d52fc997a447ec98335dad7cbb2971a0498754eb86942d6a9aa9f14cdb3b8687f78e882adc8b84c1967a16f75239e8fda6bfedc58622b052bdadda719dcb
diff --git a/dev-python/ipython/ipython-3.2.1-r1.ebuild b/dev-python/ipython/ipython-3.2.1-r1.ebuild
index 60fb120e0330..912566cbee2b 100644
--- a/dev-python/ipython/ipython-3.2.1-r1.ebuild
+++ b/dev-python/ipython/ipython-3.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
 
 REQUIRED_USE="
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 2354db4c47ad..7c7c16c03c28 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,6 +1,8 @@
 AUX jedi-0.11.1-exclude-tests.patch 940 BLAKE2B 2c5540b62529a27a8beb8c3ca1b2f2c8b58e43e4116701b406ab62cd1d04ad3c0314430d33a7bdc9585647054a1820426fea270556dc1f959ac2a9da98738152 SHA512 9629d8a694f6deda3564c14234e92cf494e7c982bbab75729ffedc2c43c9167dfd23f45d47abb397bc8e1b732ed0649e290392bc2332585aa0ad312b188f6107
 DIST jedi-0.10.2.tar.gz 373879 BLAKE2B 8007b31dc6c96d9538ab141b976fd4554ea16f01bb277692534a2972a6dcf61ee809c7573a7a3f7c0eceb29505de6ffe3ec0a7234a427579333b453fc9cd9dbc SHA512 847b000894b5e17cf5582c88245989ce1f0e17b595c79a2cdf4cc7a805fe7360ea08f28ac31473408be795c9ea210c85541cffa5fc7e7119da8c0228eb509351
 DIST jedi-0.11.1.tar.gz 332402 BLAKE2B bc0a8df89c3d8b6cccc387a22cc08f613c990c59e360c58ae1d2becf521a755892afa4972195f6e40ec3bb48b74b20a966034d0e5bcad5051f90e5b4cc082270 SHA512 61389704a318f89d12b053b786bfb6bda21d2696830c001d6d6e66191fc060d731bc05ea71f2e70725532dcbe109c5c7346a36d227e6f8ab0eb2512f4c1a8945
+DIST jedi-0.12.0.tar.gz 354329 BLAKE2B ef203f2ba57a90de1e16b80c8786fa25d6d459244873dfb22044aa6d080435efa976daeb80949c3fba41ca2f57feb5bfed255b3bb490e17b40b3f13dfbb31e14 SHA512 3e8280b16855cf2c891666f0fb02ac30d801279b72b5bcb64541ef7c152d9f9b165015405ee291cbccd6c9cb3c0481c24f30e6100cb4463888153021b946f16d
 EBUILD jedi-0.10.2.ebuild 988 BLAKE2B 89b371ff6dd445e36936a5cf43a334a352e9480d41616d4cb0dfa0ea2b10343a6ee2744b654c5ccc020313a40a00b2c0e0ce6fdbf528bf6c82e99e3dd0b829c2 SHA512 e354c07d1f2378b94675b59476a9bab9ef7db19eff2be6fa5f86fb931fadf6c2de55f9df43203481957a42f622d75b0867389523e3d3dd7e2267c1d02797d611
 EBUILD jedi-0.11.1.ebuild 1174 BLAKE2B eda6fe9d5198981721ff1594673ebdc6bed66bff3573b93014c039e77321fc36e893089d9a8e3ef2c8b7d0920e954b539537222e27ff84ffae7500e2fb89fb22 SHA512 1374a7dae2ca317118c83f9d6c39b31f08a7e699973746d7be52c79956dccbc1b0c5c0db107594dcdac4840a0bf53a6abf2a8f5a94ff74dfe6a81c08fc93776f
+EBUILD jedi-0.12.0.ebuild 1037 BLAKE2B f732261cd166006ee6560be4614198069ba25513decc8c3907de39fd871cb935aec3d9e8c655a816ad12097e4aa0880c089911722330d54e018470473f01fb2a SHA512 1527cff7992eb9e1bf4a3b87a0b6b0480098897ea272c8a00b747281917cb486fd0f9903e8c289285e35a7260746ef2aebb732cdefa4f4447fa18ee726aeb5fb
 MISC metadata.xml 375 BLAKE2B fd65a43f1efc2cbde98dd68be5a47415ecec66d4d2b2c878235a1e77b24311062d6d9c16da79bdaa358b7910612a6460ea5cbc9efdb03a6fff5d2299d734841a SHA512 16271d48499888ad36f71d79301ddc361831a7263f3d0ad19d12c29b51c52c24806a7a366c6e263b4b6d43e28856cd336b0bd728fa00a5fe5111b505fdc50977
diff --git a/dev-python/jedi/jedi-0.12.0.ebuild b/dev-python/jedi/jedi-0.12.0.ebuild
new file mode 100644
index 000000000000..ce096b6c317f
--- /dev/null
+++ b/dev-python/jedi/jedi-0.12.0.ebuild
@@ -0,0 +1,46 @@
+# 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="Autocompletion library for Python"
+HOMEPAGE="https://github.com/davidhalter/jedi"
+SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/parso-0.1.1[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+# various misc failures
+RESTRICT="test"
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test -v test \
+		|| die "Tests failed under ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 0d8e02a0e1b6..da47292df054 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -7,5 +7,5 @@ EBUILD jupyter_core-4.0.6.ebuild 1145 BLAKE2B 70f2fa14bac4a7a60e2834212128f529a8
 EBUILD jupyter_core-4.1.0.ebuild 1145 BLAKE2B ce196069db087f468023e2e12b4e923c02a96f7768a195d63d12b1bb6b159d2c2e57639c8833596d0aa0f8334c449af06d2eda54eaaa05335a9a52b68d7379cc SHA512 5f5127ca454f3c60a9ce41751491031335f933fc6c965e1e525854c7870f3d4afbb079e7bf97dd9821fba28af4c64f830e643d655c40c24639b6d747dcb36224
 EBUILD jupyter_core-4.2.1.ebuild 1177 BLAKE2B ffacffd2891916c5f701b022c3fadc51e09eddf16c495212ee0624ff2a3b2b0ab1e094bbebc74c9c260072c33691e42943f5da524bc06eb96a124ac6bd383a6b SHA512 5364e8ee4d268f0afe1f55ec54e064f64081e2644d4a9f61ea1fbecd99206a18ff0b4fd017e7552a1304352ad0187b5e9462227e7c21f102d3342fc5cd2bcfdd
 EBUILD jupyter_core-4.3.0.ebuild 1123 BLAKE2B ace3719a5e3a1dd8f41202ee71af0403f4a6c01dddc8ca59452e57d7d467f0689162610e2adc03b931caa4b0dfcf9082a9ddc36c5bc98977169df20021670e57 SHA512 73b3a1bcb6c69e820a31917672c88ab6a7aa2cac4dd24c60e69e889c9eb40270afeabe99d85b30cdc90c1391814e66fa81b55917e26f85030358622dbd6eb061
-EBUILD jupyter_core-4.4.0.ebuild 1178 BLAKE2B b301206374995b39f4890890813925ad6ca579c19907608d5c7df98b86277e81f54e268f9ff90deaeb55f84e1b66c28b772f44f50c98062f8102d80241c4033d SHA512 d26a7621ecec31a2c82d51eb0c44c8cc45aff411050a41c8b0555161c0b628c78a4f7872bd7342bc47dce79cf031c525796ac8a7f0f6e315305e46cc0e323335
+EBUILD jupyter_core-4.4.0.ebuild 1251 BLAKE2B eeeb015397ad754adf11bc1b9f9e91ef99c623850025e9c8778ceaca41e7cb4a2dfc0e2f1f526326033d20288892d99053bf007de24fbeefca1fba6949f80d17 SHA512 4f10139ffb404619dea52005fda76e5aec285b5a07760e7917ad69ee74a5323c8d0459ffb95ba84fe5cb92d15caf8effc3794697463a92e3f01b683f3c5bb573
 MISC metadata.xml 626 BLAKE2B d12f30014d60ed759b3d618b4fdb38bdf6d2d28738bc8c910d427d72e43cf792164cfa4811dd8c5717ecfc9d4705f6b4fce682be6d841b7185adc2942a62942f SHA512 bdac450a0bc297c925ea6431253eede78d61623feb30e1901f51a9e31722642741d5bc009162e09eb5b0fd9ca094e2eff54846b2612e99116239d764abb05533
diff --git a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild b/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
index a2804624d23b..962e95ed8c62 100644
--- a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
@@ -18,7 +18,7 @@ IUSE="doc test"
 
 RDEPEND="
 	dev-python/traitlets[${PYTHON_USEDEP}]
-	"
+"
 DEPEND="${RDEPEND}
 	!!<dev-python/jupyter-1.0.0-r1
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
 		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
 	)
-	"
+"
+
+# tests require installation of jupyter_core, bug #649538
+RESTRICT="test"
 
 python_prepare_all() {
 	# Prevent un-needed download during build
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index e4a8341efe2a..0c57ac39d1e1 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,15 +1,8 @@
-AUX matplotlib-1.4.3-backport-GH5291-2462.patch 4810 BLAKE2B 2eb3148d1f5d13380afaca39a377af8f14619805684316f4dc9d8db8a518dc408277e381b8c42c554dd8c011357c7f3e516607ccae42074b413b921c1ec2f905 SHA512 06fb07f42d5a0e8c54e7f259bc0b8787a8caf25fa52c1d5a37a660c6e6df0fe6d93dc91367699d40d19b523c903c4be6a284403dc3eb93a4e68acc2e80329120
-AUX matplotlib-1.4.3-cross-compile-1.patch 1779 BLAKE2B 6d95661d0300976064cca5f21020d3642d65ecfdbc74458bcb9aa82ecef7490869be4b97110726431f52385ba967d09d28b0c7c040cc4b07997ef758c83dfc0e SHA512 6d2b57ae37df42b1d6c87501037f0dfe1ebf40dad9ea2bb35ff4b58cc1a3e580ad12add99c779966e764244d0bacf6ad922848bca568fc3329ead07c0b57826d
-AUX matplotlib-1.4.3-cross-compile-2.patch 2066 BLAKE2B edb86f5bf9c2d53a13d27fec7bfd35c9b51644662c548279c6e05f72d1c626625525d0600c89bc4e00827b3f1de777f76ac626f51bd448a4a0478cadb8bf6810 SHA512 d547b79d2a6f2dcca5105093faf9bc15208b1d28737d17a65d4ad716d74029d1a575d0c83b684e139d203f7b58a34a161a8e3968bfe1515f47c754b29117a824
-AUX matplotlib-1.4.3-cross-compile-3.patch 2202 BLAKE2B cac5953ba4d075d232f9e4514e6654fc8eefad7aab45141d6f9768a48c90020b62178a2b7754c74c4c53e4de40392e3d1c4a49c786ec5e8b735c82f627c23a58 SHA512 5c1a7579a2cd4e97f56485e0300d9dcc7c8871e99bd93e03113e68b95996960ece039a41203775afc2c627f0a2483f038e0e693c73efdacfbb85d47ae855b7b1
 AUX matplotlib-2.1.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
-AUX matplotlib-2.2.0-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
 AUX matplotlib-2.2.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
 DIST matplotlib-2.1.2.tar.bz2 33422388 BLAKE2B cb4826b563e9820a17e568de78044cb81af6fbe86221505fe9cfbab7e06fb95cc3a4eff8772443197cdddf6e49b4b59d204fab39054e627b95f0169b74f630a4 SHA512 861354363f625a45f40ce7b31263088c950c8664b8ef13f8019da222ba4a8df7d0a8ee048a1bd84102e472ec48318cfea9df905d58a28efb788ba59cd5348061
-DIST matplotlib-2.2.0.tar.gz 37246563 BLAKE2B 98d0b2cd6221f7e35d6d023b9c580733370b2def914e1ea879245a10399767f6269d81da561630518d1663da4b8afadf801c627b4c713cc37ad628a917cc446a SHA512 70932e4511e6748cc97c1c6b55705d31e93c1c2bd91b163158a4585dd916318337243ba89e6a62319c628fba955bb768bb73380991f6b7ed8678ef61413926e5
 DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
 EBUILD matplotlib-2.1.2-r1.ebuild 6334 BLAKE2B 16f4f9037563e799c5ba9108f090afa1a713ae532646a9ed9a65ae0b810df0e4915b7433901c622c92663f2955db7ba1ebfe025b1bb0668106e99ae958b983b3 SHA512 d171321fade8193ab2d4a4c858400c150ef0eba95ef81f497996be828555015438f7762baf94720cdcf4045d244d2e2db6a88434b758d2f6e9c05f76e328c44a
-EBUILD matplotlib-2.2.0.ebuild 6397 BLAKE2B 5e6a31c01fa9d822d6a1bf64d8cef33a4f3486a5882f4f7073336a6c4bda81fe10262c748cfd792b4a88325a4f08dc3b34a13633940ff1a2f6b336403fe860d8 SHA512 7f4e6b0532710db8397b623721c2280e688cabe7770ba78ea6b7d5a00d801c1e8e94f886552b75404692394a64ea128dd6eee6882e1f563faf1ad979dab7a008
-EBUILD matplotlib-2.2.2.ebuild 6392 BLAKE2B 9eefa8e49d717b89d48a8d85bae1faa5be1eeafd11113fad727dc1802cdc5db3e2ec713b5da7e3d975439e44f293d1171c6601ae226622e97c09774abdb238d2 SHA512 b172e8ea35842e74172067de9c3d8245f49223b60f4e7fe22f9dea99e8a0006f4f5692bced392bdc99791f36c14fc6eb8126bfa23a79c1352a7eebb47fc5e8ed
-EBUILD matplotlib-9999.ebuild 6397 BLAKE2B c40f0ebd9dd1f4a2180c8afedb8eff450bd3fb15d3b785551bcf6f16e64840dacad301054be1835137b097ad11507cdf16ee219de3a9c51ab950ca8a4c6565b1 SHA512 ab8117ddaccaa483b102f6c1d8d12717791539f669c6f2063cb246331983d46775a7bc78c99d9bed5e25b1387c5db07ed1aa7130c61472ee5bc36a9ffc2c047e
+EBUILD matplotlib-2.2.2-r1.ebuild 6352 BLAKE2B de15e3806c58550e61aee15cb1d3b5e8e80476c697f665b8e7479e6700c67ac7a52c029ef116e74b1813a701dc12dc2d87266391e16bbca578ffe09a3538557b SHA512 edca02a00a6bf62cf14cc2f4996d2f8652472e90d623036a9445cde8db5c2e2768070bcb743cf705b46242f9044032374105ac5a5377966d00aa4775db01888d
+EBUILD matplotlib-9999.ebuild 6302 BLAKE2B 7f9c15979be0366406fbe3f0b20ebb1b22d9daa45b451b5fc0bcd09abca6d4016aba9ba5a5c04bc59d0eaef619673c59da949ecf369cb172ed7f661315d2f1dd SHA512 2eeedb9851175d1f77ffb817ebf541904fd3abc3a8d2ae159c556f85ff5bdd316d07c37bb1566d2565aab4ef823b51cf4a23e6e2cee2506fcf276340f1609d2f
 MISC metadata.xml 1063 BLAKE2B 396b976a60c89ae2b6bb9d365a8234663994f561a99ac0d59385a15245ae245fc09cdb6626b79a63cae53651c39d2df97ea8825016be0ec3bce7d6ad60cd15d5 SHA512 25344a9f8d7ae73f1ec9f493cef17925c94fc4cd44486a9928debbd18ba53010455393e3e97fc70e67a9afae9d6c15b12688af16e5e9f7e090748481969eac4d
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch
deleted file mode 100644
index d6b2ae860038..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-commit f98c4846dc3c15b3d24aafb973764cb9b860d935
-Author: Thomas A Caswell <tcaswell@gmail.com>
-Date:   Sat Jan 10 16:10:29 2015 -0500
-
-    MNT : removed deprecated method/kwargs from patheffects
-    
-    Deprecated in #2462 / 84e0063bd37c629f129d36c548e8ce3a30692cae
-    
-    attn @pelson had to known-fail a test which was using the
-    proxy renderer to verify that PathEffectRender was working
-    correctly.
-
-diff --git a/lib/matplotlib/patheffects.py b/lib/matplotlib/patheffects.py
-index 13f8ce0..19e1c4a 100644
---- a/lib/matplotlib/patheffects.py
-+++ b/lib/matplotlib/patheffects.py
-@@ -10,9 +10,7 @@ from __future__ import (absolute_import, division, print_function,
- import six
- 
- from matplotlib.backend_bases import RendererBase
--from matplotlib.backends.backend_mixed import MixedModeRenderer
- import matplotlib.transforms as mtransforms
--import matplotlib.cbook as cbook
- from matplotlib.colors import colorConverter
- import matplotlib.patches as mpatches
- 
-@@ -42,12 +40,6 @@ class AbstractPathEffect(object):
-         return transform + self._offset_trans.clear().translate(offset_x,
-                                                                 offset_y)
- 
--    def get_proxy_renderer(self, renderer):
--        """Return a PathEffectRenderer instance for this PathEffect."""
--        cbook.deprecated('v1.4', name='get_proxy_renderer',
--                         alternative='PathEffectRenderer')
--        return PathEffectRenderer([self], renderer)
--
-     def _update_gc(self, gc, new_gc_dict):
-         """
-         Update the given GraphicsCollection with the given
-@@ -219,9 +211,9 @@ class withStroke(Stroke):
- 
- class SimplePatchShadow(AbstractPathEffect):
-     """A simple shadow via a filled patch."""
--    def __init__(self, offset=(2,-2),
--                 shadow_rgbFace=None, alpha=None, patch_alpha=None,
--                 rho=0.3, offset_xy=None, **kwargs):
-+    def __init__(self, offset=(2, -2),
-+                 shadow_rgbFace=None, alpha=None,
-+                 rho=0.3, **kwargs):
-         """
-         Parameters
-         ----------
-@@ -241,24 +233,12 @@ class SimplePatchShadow(AbstractPathEffect):
-             :meth:`AbstractPathEffect._update_gc`.
- 
-         """
--        if offset_xy is not None:
--            cbook.deprecated('v1.4', 'The offset_xy keyword is deprecated. '
--                             'Use the offset keyword instead.')
--            offset = offset_xy
-         super(SimplePatchShadow, self).__init__(offset)
- 
-         if shadow_rgbFace is None:
-             self._shadow_rgbFace = shadow_rgbFace
-         else:
-             self._shadow_rgbFace = colorConverter.to_rgba(shadow_rgbFace)
--        if patch_alpha is not None:
--            cbook.deprecated('v1.4', 'The patch_alpha keyword is deprecated. '
--                             'Use the alpha keyword instead. Transform your '
--                             'patch_alpha by alpha = 1 - patch_alpha')
--            if alpha is not None:
--                raise ValueError("Both alpha and patch_alpha were set. "
--                                 "Just use alpha.")
--            alpha = 1 - patch_alpha
- 
-         if alpha is None:
-             alpha = 0.3
-diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
-index 8298ceb..5af71e5 100644
---- a/lib/matplotlib/tests/test_patheffects.py
-+++ b/lib/matplotlib/tests/test_patheffects.py
-@@ -5,7 +5,8 @@ import six
- 
- import numpy as np
- 
--from matplotlib.testing.decorators import image_comparison, cleanup
-+from matplotlib.testing.decorators import (image_comparison, cleanup,
-+                                           knownfailureif)
- import matplotlib.pyplot as plt
- import matplotlib.patheffects as path_effects
- 
-@@ -84,19 +85,7 @@ def test_patheffect3():
- 
- 
- @cleanup
--def test_PathEffect_get_proxy():
--    pe = path_effects.AbstractPathEffect()
--    fig = plt.gcf()
--    renderer = fig.canvas.get_renderer()
--
--    with mock.patch('matplotlib.cbook.deprecated') as dep:
--        proxy_renderer = pe.get_proxy_renderer(renderer)
--    assert_equal(proxy_renderer._renderer, renderer)
--    assert_equal(proxy_renderer._path_effects, [pe])
--    dep.assert_called()
--
--
--@cleanup
-+@knownfailureif(True)
- def test_PathEffect_points_to_pixels():
-     fig = plt.figure(dpi=150)
-     p1, = plt.plot(range(10))
-@@ -116,11 +105,9 @@ def test_PathEffect_points_to_pixels():
-                  pe_renderer.points_to_pixels(15))
- 
- 
--def test_SimplePatchShadow_offset_xy():
--    with mock.patch('matplotlib.cbook.deprecated') as dep:
--        pe = path_effects.SimplePatchShadow(offset_xy=(4, 5))
-+def test_SimplePatchShadow_offset():
-+    pe = path_effects.SimplePatchShadow(offset=(4, 5))
-     assert_equal(pe._offset, (4, 5))
--    dep.assert_called()
- 
- 
- @image_comparison(baseline_images=['collection'])
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch
deleted file mode 100644
index 065731441311..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/matplotlib/matplotlib/pull/4430
-
-From 08d26a80859023963bc2ffb41a0b6aed942685a9 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Fri, 15 May 2015 03:36:45 -0400
-Subject: [PATCH 1/3] setupext: respect $PKG_CONFIG
-
-When cross-compiling, it is common to set the PKG_CONFIG env var to a
-custom pkg-config that knows about the target.  Make sure we respect
-that just like the standard pkg-config tools suggest (pkg.m4).  If it
-isn't set, we use the same default as today -- "pkg-config".
----
- setupext.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/setupext.py b/setupext.py
-index 80b2a6c..29cddf9 100755
---- a/setupext.py
-+++ b/setupext.py
-@@ -253,7 +253,8 @@ class PkgConfig(object):
-             self.has_pkgconfig = False
-         else:
-             self.set_pkgconfig_path()
--            status, output = getstatusoutput("pkg-config --help")
-+            self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config')
-+            status, output = getstatusoutput("%s --help" % self.pkgconfig)
-             self.has_pkgconfig = (status == 0)
-             if not self.has_pkgconfig:
-                 print("IMPORTANT WARNING:")
-@@ -286,7 +287,7 @@ class PkgConfig(object):
- 
-         executable = alt_exec
-         if self.has_pkgconfig:
--            executable = 'pkg-config {0}'.format(package)
-+            executable = '%s %s' % (self.pkgconfig, package)
- 
-         use_defaults = True
- 
-@@ -330,7 +331,7 @@ class PkgConfig(object):
-             return None
- 
-         status, output = getstatusoutput(
--            "pkg-config %s --modversion" % (package))
-+            '%s %s --modversion' % (self.pkgconfig, package))
-         if status == 0:
-             return output
-         return None
--- 
-2.4.0
-
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch
deleted file mode 100644
index 9580c70b2ae9..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://github.com/matplotlib/matplotlib/pull/4430
-
-From 3761303016cab0542891374032eca87e74d585bf Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Fri, 15 May 2015 03:43:17 -0400
-Subject: [PATCH 2/3] setupext: do not mess with PKG_CONFIG_PATH
-
-The current code always sets PKG_CONFIG_PATH to build paths in / which
-breaks cross-compiling -- things like /usr/lib are for the build system
-(e.g. x86) and not for the target (e.g. arm).  Since we're adding paths
-that are already the default for pkg-config, there's no point in trying
-to be smart here.  Just punt the code.
-
-This basically reverts commit 101beb975d3a1218350f02bf68dc2a43ac8ff148.
----
- setupext.py | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/setupext.py b/setupext.py
-index 29cddf9..57d80e7 100755
---- a/setupext.py
-+++ b/setupext.py
-@@ -252,7 +252,6 @@ class PkgConfig(object):
-         if sys.platform == 'win32':
-             self.has_pkgconfig = False
-         else:
--            self.set_pkgconfig_path()
-             self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config')
-             status, output = getstatusoutput("%s --help" % self.pkgconfig)
-             self.has_pkgconfig = (status == 0)
-@@ -262,20 +261,6 @@ class PkgConfig(object):
-                     "    pkg-config is not installed.\n"
-                     "    matplotlib may not be able to find some of its dependencies")
- 
--    def set_pkgconfig_path(self):
--        pkgconfig_path = sysconfig.get_config_var('LIBDIR')
--        if pkgconfig_path is None:
--            return
--
--        pkgconfig_path = os.path.join(pkgconfig_path, 'pkgconfig')
--        if not os.path.isdir(pkgconfig_path):
--            return
--
--        try:
--            os.environ['PKG_CONFIG_PATH'] += ':' + pkgconfig_path
--        except KeyError:
--            os.environ['PKG_CONFIG_PATH'] = pkgconfig_path
--
-     def setup_extension(self, ext, package, default_include_dirs=[],
-                         default_library_dirs=[], default_libraries=[],
-                         alt_exec=None):
--- 
-2.4.0
-
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch
deleted file mode 100644
index 21fdf128863c..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-https://github.com/matplotlib/matplotlib/pull/4430
-
-From d077e49be318c851f6bbd64708efeed78a3ece3f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Fri, 15 May 2015 03:49:02 -0400
-Subject: [PATCH 3/3] setupext: do not hardcode system -I/-L paths
-
-The native compiler should already know the right paths to look for
-includes and libraries.  Hardcoding a specific list of those paths
-breaks both cross-compiling and multilib.  In the former, paths like
-/usr/include and /usr/lib are for x86 but when you want to build for
-arm, mixing them leads to bad failures.  In the latter, paths like
-/usr/lib typically hold 32it libraries, but when you're building for
-64bit, you want the libs from /usr/lib64.  This goes even further as
-there are other mixed ABIs like /usr/libx32 and /usr/lib32, neither
-of which are handled here.
-
-Instead, delete the code entirely and rely on the compiler being
-properly configured.  If you want to use a misconfigured compiler,
-you can always set CFLAGS/CPPFLAGS/LDFLAGS to include the -I/-L
-that your system needs.
----
- setupext.py | 12 +-----------
- 1 file changed, 1 insertion(+), 11 deletions(-)
-
-diff --git a/setupext.py b/setupext.py
-index 57d80e7..7473e3a 100755
---- a/setupext.py
-+++ b/setupext.py
-@@ -216,9 +216,7 @@ sysconfig.customize_compiler = my_customize_compiler
- 
- def make_extension(name, files, *args, **kwargs):
-     """
--    Make a new extension.  Automatically sets include_dirs and
--    library_dirs to the base directories appropriate for this
--    platform.
-+    Make a new extension.
- 
-     `name` is the name of the extension.
- 
-@@ -228,14 +226,6 @@ def make_extension(name, files, *args, **kwargs):
-     `distutils.core.Extension` constructor.
-     """
-     ext = DelayedExtension(name, files, *args, **kwargs)
--    for dir in get_base_dirs():
--        include_dir = os.path.join(dir, 'include')
--        if os.path.exists(include_dir):
--            ext.include_dirs.append(include_dir)
--        for lib in ('lib', 'lib64'):
--            lib_dir = os.path.join(dir, lib)
--            if os.path.exists(lib_dir):
--                ext.library_dirs.append(lib_dir)
-     ext.include_dirs.append('.')
- 
-     return ext
--- 
-2.4.0
-
diff --git a/dev-python/matplotlib/files/matplotlib-2.2.0-doc-make.patch b/dev-python/matplotlib/files/matplotlib-2.2.0-doc-make.patch
deleted file mode 100644
index 7ca0c6974234..000000000000
--- a/dev-python/matplotlib/files/matplotlib-2.2.0-doc-make.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 matplotlib-2.1.2.orig/doc/conf.py matplotlib-2.1.2/doc/conf.py
---- matplotlib-2.1.2.orig/doc/conf.py	2018-01-19 11:07:49.000000000 +0700
-+++ matplotlib-2.1.2/doc/conf.py	2018-01-21 20:06:44.120901546 +0700
-@@ -136,5 +136,5 @@
- }
- 
--plot_gallery = 'True'
-+plot_gallery = True
- 
- # Add any paths that contain templates here, relative to this directory.
diff --git a/dev-python/matplotlib/matplotlib-2.2.0.ebuild b/dev-python/matplotlib/matplotlib-2.2.0.ebuild
deleted file mode 100644
index d1fc0c28597f..000000000000
--- a/dev-python/matplotlib/matplotlib-2.2.0.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
-
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
-	doc? ( ${PY2_FLAGS} )
-	excel? ( ${PY2_FLAGS} )
-	gtk2? ( ${PY2_FLAGS} )
-	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo latex qt5 tk wxwidgets
-		|| ( gtk2 gtk3 )
-		)"
-
-# #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/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}]
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013
-	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
-	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
-	gtk2? (
-		dev-libs/glib:2=
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		dev-python/pygtk[${PY2_USEDEP}] )
-	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-
-DEPEND="${COMMON_DEPEND}
-	${PY2_DEPEND}
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		app-text/dvipng
-		dev-python/colorspacious[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PY2_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.1.12[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		media-gfx/graphviz[cairo]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-		)"
-
-RDEPEND="${COMMON_DEPEND}
-	${PY2_DEPEND}
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-	gtk3? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		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_USEDEP}] )
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
-	"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use ${1}; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=( "${FILESDIR}"/${P}-doc-make.patch )
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	hprefixify setupext.py
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup pyside)
-		$(use_setup qt5)
-		$(use_setup tk)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-
-	if python_is_python3; then
-		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			$(use_setup gtk2 gtk)
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
-}
-
-wrap_setup() {
-	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
-	unset DISPLAY
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..6cf20a9bd9ec
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="https://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #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/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}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/colorspacious[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.1.12[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		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
+	)
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=( "${FILESDIR}"/${P}-doc-make.patch )
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if python_is_python3; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			$(use_setup gtk2 gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib/matplotlib-2.2.2.ebuild b/dev-python/matplotlib/matplotlib-2.2.2.ebuild
deleted file mode 100644
index ab5d6e06efaa..000000000000
--- a/dev-python/matplotlib/matplotlib-2.2.2.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
-
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
-	doc? ( ${PY2_FLAGS} )
-	excel? ( ${PY2_FLAGS} )
-	gtk2? ( ${PY2_FLAGS} )
-	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo latex qt5 tk wxwidgets
-		|| ( gtk2 gtk3 )
-		)"
-
-# #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/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}]
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013
-	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
-	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
-	gtk2? (
-		dev-libs/glib:2=
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		dev-python/pygtk[${PY2_USEDEP}] )
-	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-
-DEPEND="${COMMON_DEPEND}
-	${PY2_DEPEND}
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		app-text/dvipng
-		dev-python/colorspacious[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PY2_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.1.12[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		media-gfx/graphviz[cairo]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-		)"
-
-RDEPEND="${COMMON_DEPEND}
-	${PY2_DEPEND}
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-	gtk3? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		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_USEDEP}] )
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
-	"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use ${1}; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=( "${FILESDIR}"/${P}-doc-make.patch )
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	hprefixify setupext.py
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup pyside)
-		$(use_setup qt5)
-		$(use_setup tk)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-
-	if python_is_python3; then
-		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			$(use_setup gtk2 gtk)
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
-}
-
-wrap_setup() {
-	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
-	unset DISPLAY
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild
index 47834984e715..98ec197ce5f7 100644
--- a/dev-python/matplotlib/matplotlib-9999.ebuild
+++ b/dev-python/matplotlib/matplotlib-9999.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 KEYWORDS=""
-IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
+IUSE="cairo doc excel examples fltk gtk2 gtk3 latex qt5 test tk wxwidgets"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
 REQUIRED_USE="
@@ -31,7 +31,7 @@ REQUIRED_USE="
 	gtk2? ( ${PY2_FLAGS} )
 	wxwidgets? ( ${PY2_FLAGS} )
 	test? (
-		cairo fltk latex pyside qt5 qt4 tk wxwidgets
+		cairo fltk latex qt5 tk wxwidgets
 		|| ( gtk2 gtk3 )
 		)"
 
@@ -102,10 +102,7 @@ RDEPEND="${COMMON_DEPEND}
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-xetex
 	)
-	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
-	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
-	"
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
 
 # A few C++ source files are written to srcdir.
 # Other than that, the ebuild shall be fit for out-of-source build.
@@ -182,9 +179,11 @@ python_configure() {
 		dateutil = False
 		[gui_support]
 		agg = True
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
 		$(use_setup cairo)
-		$(use_setup pyside)
-		$(use_setup qt4)
 		$(use_setup qt5)
 		$(use_setup tk)
 	EOF
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 9a5940b81a0b..92c313fe3afd 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,5 +1,7 @@
 DIST oslo.concurrency-3.21.1.tar.gz 48866 BLAKE2B b621548173e30e7a7f3683d1f5ef3821574e780d1df99c91d8bb77d4e3d3280da395066be7c9ec95b3d3e640da694aae81943e126c8c4e6cd5f18c2db99efba6 SHA512 6d165ebf952b29d96d2d1a8b938b2ef4746c77b99a62ca596ee93e6fb6d919f183eede380763b6167cb7d372e03803556715523b7a63ad1dbadff4eede7c0bcd
 DIST oslo.concurrency-3.25.0.tar.gz 48736 BLAKE2B fe8506599d175d22c44fd52bb2c4e5f238687ba7eeb926d3f042be14e6ef8cecb3c13b010c1540c835d9bc7e587560ea391ea00b99f05553d6bfd46d2bbe3d9c SHA512 0273112cdc0a1de45ec231b672f2ed8f8fe5842dea756bc062a18247036b2fdbfbce392f3edbfbb871a2bda94412f6c82f3a634fd98a77c1df5a243babcbd4de
+DIST oslo.concurrency-3.25.1.tar.gz 49218 BLAKE2B 95fccb051ef782a0b6cd01801e9b44272a8b04ca52fd0f00f91a2aa3514885c302a3f251885f59c32303708c91331f3f59ee06ebdce4751d013559a0e7d19b16 SHA512 5c306e742c652d66209a3218ccdc1d1f957ec6fde0b0bcb9411a71e470e8c0402c4cc1a40a05094ce591942ed16b8e0a7b456d60a64e0299ef32a257b37c8388
 EBUILD oslo-concurrency-3.21.1.ebuild 1949 BLAKE2B 20a0d072bbb70be623739fb50f27b9a99af0a1804510def71dd1cf4326911e260bbe597f342d8553131e58df41d9c39fa3c29e856d8093694c5e5e817787f4e0 SHA512 c02c7c184971e6fb8072529cc4b904654cb3362725aedd4da2616d80e9ab844076b77e930733f8c94d1c24d999f45de6253d8aafc1f4d0fbdd5311ace5afccd1
 EBUILD oslo-concurrency-3.25.0.ebuild 1806 BLAKE2B ee6d7879914bdb38aaa0bd7c780e5e4e673d273a64d45209ddce3414fb9dc2517b42169e69e8fd6b931b988bb7fc7d4d7a7a11239b51619a2d29369c4643b67c SHA512 4b6182948b1e1aba8710e0c1a24087d60036e4d4e193193c53837b59efe2ddc8278ec14c6d432398e78ee24074ae8e8082944305af2cb9ca57381bc92cc703c9
+EBUILD oslo-concurrency-3.25.1.ebuild 1853 BLAKE2B 2dba6b4c1f0a518c06cf3b5cfb42ece9fa80a2a0e8f8549408e67ba7c5737257b734b2932b043023254d7165b22f8e58f0a208c4240d2f55fec8d45a67571a82 SHA512 aa15bb4a96f3bc5d7459c4c53989e24131a6dff6139808484d5187f3b070edefc187845d238f997150905fe911fdaa185105acfec9076a82a185030a71a2dcdd
 MISC metadata.xml 665 BLAKE2B d648ddb783230e648e931b39640fbb9d8a68029ae87ebe48eec97e05cadafa39dde8999fd01f8fc6b05cbd8590150b1f1444263b654ab3bb4bd3cfd2baf3d13c SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild
new file mode 100644
index 000000000000..535a45b3c7a0
--- /dev/null
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="library for running  multi-thread, multi-process applications"
+HOMEPAGE="https://pypi.org/project/oslo.concurrency/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
+S="${WORKDIR}/oslo.concurrency-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+		<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^futures/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests ${PN/-/_}/tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 0cef1e99903c..e9ea842f3536 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,5 +1,7 @@
 DIST oslo.db-4.25.1.tar.gz 165509 BLAKE2B ef4994857328123cfe28fb0f0e01756901c1cdb47d54ec5db40d922c8476a934511f2d387548f8da4627a4e2f8cb89f02df5f1431ff1e97a503eae4a70ae2400 SHA512 35d648466f89b14157d269d29f88ba34e51e9afacd04c27cc651e3e5fe77d94b27bc3e02ec832e0b87650ece6308f6c7a2d3ce8f7862173b545c9146eacb5b8d
 DIST oslo.db-4.33.0.tar.gz 167982 BLAKE2B a6bde0df966333048c59786971f9785c6272dae92b84877243f91945e5d72eb52e1a64b01b57fde5d7995aad7bf02075ca1dae7e4715f8d05a901535d98580fd SHA512 5886e60845afe89855ac6b990aa0bc2a3984cc860ef05c76ff751c2b4053112f89583b470765819c7cb3fb91d51110f53cbe6c9ddc5cfafb1d11dfe38a3c07ef
+DIST oslo.db-4.33.1.tar.gz 169088 BLAKE2B e386d8c71669569256d88e2ad654e017dfae5cfc0635fa7c7f9e41a11d7114f6f7d0e826a6855113f8e672d5e57ed8b645e8c6d3a54c30aa78d45e53894fe8bf SHA512 b627bef035c13aa32afded20ff1e5198bc94d5ce96384c7eff44992d7f5c7178bb5e9ae398c53a04be6f280f433c688ae28fa72d6c617fc7c9299bd7c6a02eff
 EBUILD oslo-db-4.25.1-r1.ebuild 2198 BLAKE2B 769049043547e9509fd2480485ee4c0f9caeaf8aed823dde9d1498c0efb04cbdf3cb2b2ec3148eb5cc3fd0e5472293c3964b18d89062fd20f72418197c6faaae SHA512 076ba50c4a0d0e2e5420cf84418521b0fe8892bd66edeee1dc1923097864f8c6fa410574d50743e9fec884d183c33532030d02c535cac6471b96fa8c912d4ee3
 EBUILD oslo-db-4.33.0.ebuild 2051 BLAKE2B a4495e041056b92ca29c1b6370c851f8d436fe5d4c2eb02a35e0d368ac8b76cbb6d3e519b4903ca8888bd3e39bb16799f75ac0534c9c88dacbcba7bee4519757 SHA512 60a07462719a8b08f0f8b339f5f59d33ea5970f56ff17852ce18a6004461193e91ae76c88a06b97e1fec09ab604fff7bbc2c5aac2c58f0e0f59550340e0b4466
+EBUILD oslo-db-4.33.1.ebuild 2053 BLAKE2B 05b85c303e78e1d9dd5354045769188ca9540a3c1d47d980e62d312c9935d2ccc1b92292ef5328f6ca6e860d2a55d64363aa9721cfcc63b313345460dcfe166c SHA512 78d70216bd686f5aec087916d96b9e9680ab65cc3d23394b8a9f55f6abdb2fae4910ffe26903779e47542e882493abf97775d2375bc53d5ed47ba4ac8e941c5e
 MISC metadata.xml 553 BLAKE2B 692d0b1168c0d7d4ab698d04351e60ee38503f2b4f429329e5b1d680f6d3498721a6bb4bf135898ddfd3aa70378a5d399d520ab026ad1b752974f572b6add628 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd
diff --git a/dev-python/oslo-db/oslo-db-4.33.1.ebuild b/dev-python/oslo-db/oslo-db-4.33.1.ebuild
new file mode 100644
index 000000000000..15fd3d5ac288
--- /dev/null
+++ b/dev-python/oslo-db/oslo-db-4.33.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5)
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Common DB Code"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
+S="${WORKDIR}/oslo.db-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		|| (
+			dev-python/pymysql[${PYTHON_USEDEP}]
+			dev-python/mysql-python[$(python_gen_usedep 'python2_7')]
+		)
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index 15b5015d51a8..ed75fdc218cc 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,5 +1,7 @@
 DIST oslo.versionedobjects-1.26.1.tar.gz 148214 BLAKE2B fa449b57db3ae4148fa431616b49b83d6a1424cc5f1845546fc945270bfa1b470f376a52edb0426f1fd86783cfe25906f476fab3417b3944c5f3074548704c77 SHA512 13962e9cfd5c63d9691bef0e1b31aa1751a506dc7a8aa3031612220778ba887d3122eea205456809bed9cec12c8fd5debfdce827d59ad8fc991ff85de7f841a1
 DIST oslo.versionedobjects-1.31.2.tar.gz 148160 BLAKE2B cb63e0607f4a9447618d287e3f2c252359832a0f4c7b60a22669da25ab90ebcdb8a97f2e10f61c759cba135329eb75be644809bd424e67ff1c6d61e612c45364 SHA512 a9d31a138e2f1e399e51b509c52c10c64acd783389b596032457c0fa74c112f5f6f67944ce88c88c35623f8d2d6612c09d04009d9014d0e9efc8f65b916d4ff3
+DIST oslo.versionedobjects-1.31.3.tar.gz 148869 BLAKE2B 90ee5fce0dc51f4be1e9dbe2e4cab501e7fa1625591847c6a37dad34e570f9739317ec5e1d08ce5a90c6fde3d639852d1f0ed6e6da33119c8d805146b7dfab40 SHA512 2c131ca04b3967a98ada7052fe176faee18d0fb36d53c94c6c098d88e108c865e4a967c8300fd2781bb18741f280781e398ebdb9cbe3c8b8aba516ab7800217b
 EBUILD oslo-versionedobjects-1.26.1.ebuild 1611 BLAKE2B ea80caa853b82ab0ae6c723488c95190bad1304c3a945a1c9acf13b28161bc180a5c3933095036b3cbf5162287b66c98801c22f31dff7d908bc46abf386eaabb SHA512 87011ad8ffaa7b9cd17c6ebd1c021d262e9cb8bcc69b5a338ff39f5cee2bb92a7013315e0d8fa2660dc3a636ce158e4b805479d6f8ea42aa103e3a3486745dd9
 EBUILD oslo-versionedobjects-1.31.2.ebuild 1364 BLAKE2B 7c6f9355d8b58cbd5b77b46472bb249780e0364b7da43be56230e749a3346709b5a387b4f9ad4c4892bfbebf8d25900950e0c77ba236d175a94109606edf3e6c SHA512 7bdb39a118b11270b5396b505dc7d955cea9bde6763c53d439f9f1239a1cd893db2365af20908a29d6af6968f961fdd571fba7bdba9ecb262e5c8184d38abf9b
+EBUILD oslo-versionedobjects-1.31.3.ebuild 1366 BLAKE2B 74d0267ed21443433dbacd7a460cb13cb9ad67b1a4600905592a2aa1317e1b05f69c339f040320d3a2b31e0d3979a6853a880160b53d4496510fe407eab74bbd SHA512 dbffa974d59763acbd708bdd9e6502dae19b150335112813748ae8aa46c1710e595c295caa91f26daa15394906cb570e261ce06a02aa25e6997e367b16770be5
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild
new file mode 100644
index 000000000000..dd2bcb40713e
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
+HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
+S="${WORKDIR}/oslo.versionedobjects-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]"
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 512e26cbb6ea..405be8f6d414 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,19 +1,8 @@
-AUX pandas-0.17.0-testfix-backport.patch 1175 BLAKE2B 5e4f0e58acc731a0f8c1f88f28446f0dedfb886a1e4ccfd35ee3be9061c35362dee089a78d7f3fb404da9cb5e8663a2bf9341c7f7edfcaf65fcd5b7ef5e4063b SHA512 1b59919c6a3e3d835af3f1fac2350db596fa420a02f405a4b0de4a751c2a762606557306e4b42cf696730a0c104ef10544a4d0f82a64a6839b38ba14245f30ef
 AUX pandas-0.19.1-gapi.patch 799 BLAKE2B 801d356d51de63091c6167677957349c3334105786a220252a6fad50e0242a67106fdb321f402e7d99b65c0ab8a0c5d312b98757100bef7cc02f7f43bc50fab9 SHA512 b1a4e7c5f480efadfaf70caaa3293cb3f16ebf36c4705597a22ecc06de7e5b2379ddb4061279d669d2c66d3ef149a74f300ec1127bd441ad1b9288cb9233c781
 AUX pandas-0.19.1-seqf.patch 14381 BLAKE2B 8acb677579d429a7d82712477f8e8202561198938f56cc08c38dc3766a695a69fd3d25a25c4fa165c3f3d02a16a46acea092194e3e71f23ec22a8b2aca5f1e13 SHA512 b5675c89e087d47b94cfb036047b396d5a94b74bc03e95c92d5152bfc5598feddba88a781b6a11e533c46ba638aa50f0814d383c20d95f4e091deaee480b6d3e
-DIST pandas-0.16.2.tar.gz 4931751 BLAKE2B 5ffd1df908580d966f782a7b371c7798b65ae7caacda3d8591c8de770e2f9008a3d026d9cb7f80ae857db3c24c41c0d21b8586862c39ec1b20f6e02c28e1a79f SHA512 44874e12a42a01dd7ed88f3f97e954732a534a5e2dc4815ef6203bdb2d88850a607e6631a35ae8fc79f4621a5dfaa34f39bb1c9a0ecfb17da1cf0c10f35ff27b
-DIST pandas-0.17.0.tar.gz 6508621 BLAKE2B 226bf513c4fc7261331114832880da71f7b881e906d6739a81bc7c6bb048f3eeecc9806aa65c7eed246ea4df16c380595bd432ab7c25b9964ca8b879a7f705cf SHA512 bae6964e263c7ff6cac722cdfe23081f23c357d9bc39a670b5627bef4630c236a58aa8c0393eae921721bf7049c8e5266b4dea71dd957da5d89dafc14a04797b
-DIST pandas-0.17.1.tar.gz 6674479 BLAKE2B 0d61f0a603f758aaef6c2eddf6d70307255679b2ef0b599e81b3a4c0e67ebd7584b1f3d436e34d02264b9c17317508f40c5186fd874b4a362efa6edf68eef900 SHA512 9d9f9064585b1f3551625e0c8f4eedaaa1253790c2a5cb28e58e70eb805cc18f9770d793aa748cbd76798488ff60efdd01eb4b21daf5ad8f1dc4d9c050487234
 DIST pandas-0.19.1.tar.gz 8360233 BLAKE2B 82611ca1a3e3169ac2d084f4dcd9c4d4d74e9e9c9913a41acad48ae68a208a884dfd877445a7d658a7ff098ef383cedae7e79a4900baa8d56c032ce9aaad96eb SHA512 6451990a7fae8c6db8ab0b014a13b4f1828754d3998f13c17b111f891fb9fd23f8e09b907623096dfa55668c42298eee1373210a9fddb95f56dd7d552b964e6f
-DIST pandas-0.20.1.tar.gz 10307434 BLAKE2B f8490a4a7f5c165753df274a0dea81552efc90a0cbf78d9e1fbeb6d0bc26e8ffaf3dbdf796a3abfb29d01332004af2adfbd9946c69d905f309cc730613de8123 SHA512 d477a815914c825efd6430f7eb19f3f9115c1c4ab03000ca6d4f64023f7b5f53eff512792fea2d8b33c7febb3667fc3a3de55f11eeb453f285cae40e6b473707
-DIST pandas-0.20.3.tar.gz 10402185 BLAKE2B a2c8d8f0007d481ccb897d2e9be106319cd3b7c0edf397fb99e7c6f43511c218ff5e7a7f099fcf23406f7e3ea691272e75c0f130cce991ccf159df7223d26584 SHA512 891c7e04d075f96fadf3775e903472e279eaeaa4509eb0da81a74261a3ed86ff309de0b5a2c100ee93dd968fed1df6d7e426ca78785b2b36785fe7679218fdc5
 DIST pandas-0.23.0rc2.tar.gz 12542694 BLAKE2B 7c6383d32430fec89b7d5cbb1f8eef0f2201ba85d5865118fa035b6ad4c852b5f4e691f98f0cf3ac5c1283720025f8500c43414d0931af5211972208428537bd SHA512 3df13f74dbcac00baffd39c732751d4e7bd16adf529b60b05b2373651d86e0aba37d6f3a4339df170e9ab3d89ee03fc18827dd3728ff972bcdfe3a0604bff59d
-EBUILD pandas-0.16.2.ebuild 3830 BLAKE2B a4feceede6288ca9d86177cd316168013d4a1d85bfab47de686a8435e4aa422c98ea156468da22010a61fae309fe1049902766f3a83d5e7db6483e8eaf9b3080 SHA512 b6e18279292c1772e5d9527e5f4baf520d07f30ee45e3604946cdc2b1731f881519815c229bdda41b2a02740c04f3d70fce6210bac094fb55c23fc5364970808
-EBUILD pandas-0.17.0.ebuild 3983 BLAKE2B a9875a252348369ff718878dd2ae06d703742d1ba1dafa1538a456b1ccf231a99f6b774c745035e9a4c23df7e7679674da50db55c2b4c0fad03de659d1ab75d4 SHA512 6a70c8b7045218f70ade388bde921c0f48c70344623d3ccaa4c0c7dd0ed35198da14e5faa28d1b16ed3a3ff88e174e662c53c2bb5cd6186464e8b718c97d84c7
-EBUILD pandas-0.17.1.ebuild 5955 BLAKE2B d6a2126678d1c93d16346c7a83425810eb11853a95a6391dfc8b67577708485c7906ec18c1d50b641061e559061bcaa2f5c562ba6532b39b068b8e15aa356013 SHA512 7fd34871cdf5178536c45416c2fcb39d76e3fa3355cee9ce39e44a228da6cb929980e52727683ece946328d0acd7f8a9072f60e1d696d9f00fea7b07f187f941
 EBUILD pandas-0.19.1.ebuild 5913 BLAKE2B 994e9ea3397d2dacb0a01ad17c8285cae39a898c5615b42598f0a85745a74b4c01a2968da343a969160f18658fdae8cc6e6f0288f7254189d6233a4e16b21923 SHA512 6e88582440d02ad3adf338692082ff671c0c4f93f56adb029abfa5dea7210de30308371f990e4b2bbcdfbd510040e40c18a373123a862099d779993f81dda714
-EBUILD pandas-0.20.1.ebuild 5846 BLAKE2B b6abf38026c04a904b40d130c039c4395fd0bbd51aeb584a72428a26afddccb90198e6e02469eaa3942f6f76b95bdd6e9b53f433cfd5fd7715de9729ea35fb41 SHA512 9bb42445edb8f4dc62df830e30b8ea2e0856bf214f0621d7cbecebd2adc142bc2a4031e162e9ff93daf5f600d9e405386a32dca515fa6433f91e962c8ae00c37
-EBUILD pandas-0.20.3.ebuild 5759 BLAKE2B 59d904b1b8ca18a0baf2f58340a0b24cf1e99bee4a40a51530ec9fc79eac2fa093a05aedcb7f0e268d06a1828a013736679d26594ba443e1ad763d69c062f29b SHA512 fe6f54a082a50d4ab3edb16c9b2f11cae1440027b06e35b539133b76584c9ae615fa9f72a70328df26de7012c67d250574e47ec0b443eb84e480792b6743846b
 EBUILD pandas-0.23.0_rc2.ebuild 5867 BLAKE2B 1f646f93b08f31f65bb61479fb09b3cf1005dd21dbbe859c332de535f2540f22bc53180e23bbdb66870a0675ca527f37343b3a5f9aabde9ae1c953775bf9a76e SHA512 922c5dcff6e238a018781f2b289149fe004b72371411dc0f3191565c9a590e7fe5f3e372ca8e524c4745e26789e68d5029e7ff96de23f1ee274aaf4c6e2fe828
 EBUILD pandas-9999.ebuild 5824 BLAKE2B adee94b3e8a50e86a21ef64b75650ae372d7b9d9be888519fdf4769e6fe3d6e4425e5c325685f820b8d7599addc39e260d6b138080b40f9e275586dae9a3a096 SHA512 043c913888f3290c2bc651de252ac73d8ea9c9061a72781f747d291f46a3f8dd4b760ef2449f61b5249a79293dcad6ca389b11608e0431c6324c9e1adde1a189
-MISC metadata.xml 1077 BLAKE2B e9bfcfb9fc1baf813931a3cd0829136cdeb0a52a3a34a0d0ba28fbad6d4c3ebee24f1e5624d5242541fd14f4c435830b68ea30eab03d796e497116bdff732c77 SHA512 60b23a75873ded48dd01a36dae62f45f1cf5d044b88b125bda249fd6cf558ddef42d6677218053ed9d73de31da54f1f85bd1f64eab9b377f1a8b51fe1c510308
+MISC metadata.xml 834 BLAKE2B b075b9c90c4f1be265117df2c47ace4c86dad3fec9945b5a483a11048211348ee10e433f378610de4a9b599031914b32992b9fad693b832cf0266b0f171b3e38 SHA512 85ad67a653f4ced5fb9331b778fb2906c253874cf8e522f1b67547ef8e2f49e084e84d9e055aee7e2a57c6e6e4e7f7791a4ce299fac7c74dd6448a94977e8f5e
diff --git a/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch b/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch
deleted file mode 100644
index c83319256f22..000000000000
--- a/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- pandas/tests/test_categorical.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/pandas/tests/test_categorical.py b/pandas/tests/test_categorical.py
-old mode 100755
-new mode 100644
-index e97010e..1d14323
---- a/pandas/tests/test_categorical.py
-+++ b/pandas/tests/test_categorical.py
-@@ -86,12 +86,14 @@ class TestCategorical(tm.TestCase):
-         factor = Categorical.from_array(arr, ordered=False)
-         self.assertFalse(factor.ordered)
- 
--        # this however will raise as cannot be sorted
--        # but fixed in newer versions of numpy
--        if LooseVersion(np.__version__) < "1.10":
-+        if compat.PY3:
-             self.assertRaises(TypeError, lambda :  Categorical.from_array(arr, ordered=True))
-         else:
--            Categorical.from_array(arr, ordered=True)
-+            # this however will raise as cannot be sorted (on PY3 or older numpies)
-+            if LooseVersion(np.__version__) < "1.10":
-+                self.assertRaises(TypeError, lambda :  Categorical.from_array(arr, ordered=True))
-+            else:
-+                Categorical.from_array(arr, ordered=True)
- 
-     def test_is_equal_dtype(self):
- 
diff --git a/dev-python/pandas/metadata.xml b/dev-python/pandas/metadata.xml
index 2633bf05b9c0..2afb9b3d5636 100644
--- a/dev-python/pandas/metadata.xml
+++ b/dev-python/pandas/metadata.xml
@@ -14,9 +14,6 @@
 </longdescription>
   <use>
     <flag name="full-support">Pull all packages to give pandas full support</flag>
-    <flag name="excel">Pull a few Python packages for Microsoft Excel i/o</flag>
-    <flag name="html">Enable HTML i/o via <pkg>dev-python/beautifulsoup</pkg></flag>
-    <flag name="R">Enable support for R via <pkg>dev-python/rpy</pkg></flag>
   </use>
   <upstream>
     <remote-id type="pypi">pandas</remote-id>
diff --git a/dev-python/pandas/pandas-0.16.2.ebuild b/dev-python/pandas/pandas-0.16.2.ebuild
deleted file mode 100644
index 7b2da1706956..000000000000
--- a/dev-python/pandas/pandas-0.16.2.ebuild
+++ /dev/null
@@ -1,128 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils flag-o-matic virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="http://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc excel html test R"
-
-EXTRA_DEPEND="
-	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
-	dev-python/openpyxl[${PYTHON_USEDEP}]
-	dev-python/pymysql[${PYTHON_USEDEP}]
-	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
-	dev-python/psycopg:2[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	"
-CDEPEND="
-	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		dev-python/xlrd[$(python_gen_usedep 'python2_7')]
-		dev-python/xlwt[$(python_gen_usedep 'python2_7')]
-		x11-misc/xclip
-		)
-	test? (
-		${EXTRA_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-		)"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="${CDEPEND}
-	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-	dev-python/bottleneck[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pytables[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	excel? (
-		dev-python/xlrd[$(python_gen_usedep 'python2_7')]
-		dev-python/xlwt[$(python_gen_usedep 'python2_7')]
-		|| (
-			dev-python/xlsxwriter[${PYTHON_USEDEP}]
-			>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		)
-	)
-	html? (
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		|| (
-			dev-python/lxml[${PYTHON_USEDEP}]
-			dev-python/html5lib[${PYTHON_USEDEP}] )
-	)
-	R? ( dev-python/rpy[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die
-	fi
-}
-
-python_test() {
-	local test_pandas='not network and not disabled'
-	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
-	pushd  "${BUILD_DIR}"/lib > /dev/null
-	VIRTUALX_COMMAND="nosetests"
-	PYTHONPATH=. MPLCONFIGDIR=. HOME=. \
-		virtualmake --verbosity=3 -A "${test_pandas}" pandas
-	popd > /dev/null
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	local x
-	elog "Please install"
-	for x in ${EXTRA_DEPEND}; do
-		optfeature "additional functionality" "${x%%[*}"
-	done
-}
diff --git a/dev-python/pandas/pandas-0.17.0.ebuild b/dev-python/pandas/pandas-0.17.0.ebuild
deleted file mode 100644
index 22a63f27a32a..000000000000
--- a/dev-python/pandas/pandas-0.17.0.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils flag-o-matic virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="http://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc excel html test R"
-
-EXTRA_DEPEND="
-	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
-	dev-python/openpyxl[${PYTHON_USEDEP}]
-	dev-python/pymysql[${PYTHON_USEDEP}]
-	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
-	dev-python/psycopg:2[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	"
-CDEPEND="
-	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		)
-	test? (
-		${EXTRA_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-		)"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="${CDEPEND}
-	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-	dev-python/bottleneck[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pytables[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	excel? (
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		|| (
-			dev-python/xlsxwriter[${PYTHON_USEDEP}]
-			>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		)
-	)
-	html? (
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		|| (
-			dev-python/lxml[${PYTHON_USEDEP}]
-			dev-python/html5lib[${PYTHON_USEDEP}] )
-	)
-	R? ( dev-python/rpy[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-testfix-backport.patch
-)
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
-
-	# https://github.com/pydata/pandas/issues/11299
-	sed \
-		-e 's:testOdArray:disable:g' \
-		-i pandas/io/tests/test_json/test_ujson.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die
-	fi
-}
-
-python_test() {
-	local test_pandas='not network and not disabled'
-	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
-	pushd  "${BUILD_DIR}"/lib > /dev/null
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	VIRTUALX_COMMAND="nosetests"
-	PYTHONPATH=. MPLCONFIGDIR=. \
-		virtualmake --verbosity=3 -A "${test_pandas}" pandas
-	popd > /dev/null
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	local x
-	elog "Please install"
-	for x in ${EXTRA_DEPEND}; do
-		optfeature "additional functionality" "${x%%[*}"
-	done
-}
diff --git a/dev-python/pandas/pandas-0.17.1.ebuild b/dev-python/pandas/pandas-0.17.1.ebuild
deleted file mode 100644
index 8ddf16d1d5b1..000000000000
--- a/dev-python/pandas/pandas-0.17.1.ebuild
+++ /dev/null
@@ -1,166 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 eutils flag-o-matic virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="http://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc -minimal full-support test X"
-
-MINIMAL_DEPEND="
-	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
-RECOMMENDED_DEPEND="
-	dev-python/bottleneck[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]"
-OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/blosc[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
-	|| ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] )
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	|| ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] )
-	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
-	dev-python/rpy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
-	dev-python/xlrd[${PYTHON_USEDEP}]
-	dev-python/xlwt[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	X? (
-		|| (
-			dev-python/PyQt4[${PYTHON_USEDEP}]
-			dev-python/pyside[${PYTHON_USEDEP}]
-			dev-python/pygtk[$(python_gen_usedep python2_7)]
-		)
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-	"
-
-DEPEND="${MINIMAL_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	doc? (
-		${VIRTUALX_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-		x11-misc/xclip
-	)
-	test? (
-		${VIRTUALX_DEPEND}
-		${RECOMMENDED_DEPEND}
-		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-	)"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="
-	${MINIMAL_DEPEND}
-	!minimal? ( ${RECOMMENDED_DEPEND} )
-	full-support? ( ${OPTIONAL_DEPEND} )"
-
-_PATCHES=(
-	"${FILESDIR}"/${P}-testfix-backport.patch
-)
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
-
-	# https://github.com/pydata/pandas/issues/11299
-	sed \
-		-e 's:testOdArray:disable:g' \
-		-i pandas/io/tests/test_json/test_ujson.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		VIRTUALX_COMMAND="${EPYTHON}"
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. virtualmake make.py html || die
-	fi
-}
-
-python_test() {
-	local test_pandas='not network and not disabled'
-	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
-	pushd  "${BUILD_DIR}"/lib > /dev/null
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	VIRTUALX_COMMAND="nosetests"
-	PYTHONPATH=. MPLCONFIGDIR=. \
-		virtualmake --verbosity=3 -A "${test_pandas}" pandas
-	popd > /dev/null
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
-	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
-	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "necessary for Amazon S3 access" dev-python/boto
-	optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
-	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
-	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
-	optfeature "R I/O support" dev-python/rpy
-	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
-	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" sci-libs/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pandas/pandas-0.20.1.ebuild b/dev-python/pandas/pandas-0.20.1.ebuild
deleted file mode 100644
index 9e3b7f8bd657..000000000000
--- a/dev-python/pandas/pandas-0.20.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 eutils flag-o-matic virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="http://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc -minimal full-support test X"
-
-MINIMAL_DEPEND="
-	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
-RECOMMENDED_DEPEND="
-	dev-python/bottleneck[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]"
-OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/blosc[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
-	|| ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] )
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	|| ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] )
-	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
-	dev-python/rpy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
-	dev-python/xlrd[${PYTHON_USEDEP}]
-	dev-python/xlwt[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	X? (
-		|| (
-			dev-python/PyQt4[${PYTHON_USEDEP}]
-			dev-python/pyside[${PYTHON_USEDEP}]
-			dev-python/pygtk[$(python_gen_usedep python2_7)]
-		)
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-	"
-
-DEPEND="${MINIMAL_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
-	doc? (
-		${VIRTUALX_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-		x11-misc/xclip
-	)
-	test? (
-		${VIRTUALX_DEPEND}
-		${RECOMMENDED_DEPEND}
-		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-	)"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="
-	${MINIMAL_DEPEND}
-	!minimal? ( ${RECOMMENDED_DEPEND} )
-	full-support? ( ${OPTIONAL_DEPEND} )"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed \
-		-e "/^              'sphinx.ext.intersphinx',/d" \
-		-i doc/source/conf.py || die
-
-	# https://github.com/pydata/pandas/issues/11299
-	sed \
-		-e 's:testOdArray:disable:g' \
-		-i pandas/tests/io/json/test_ujson.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
-	fi
-}
-
-python_test() {
-	local test_pandas='not network and not disabled'
-	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
-	pushd  "${BUILD_DIR}"/lib > /dev/null
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	PYTHONPATH=. MPLCONFIGDIR=. \
-		virtx nosetests --verbosity=3 -A "${test_pandas}" pandas
-	popd > /dev/null
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
-	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
-	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "necessary for Amazon S3 access" dev-python/boto
-	optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
-	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
-	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
-	optfeature "R I/O support" dev-python/rpy
-	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
-	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" sci-libs/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pandas/pandas-0.20.3.ebuild b/dev-python/pandas/pandas-0.20.3.ebuild
deleted file mode 100644
index a28647857c1c..000000000000
--- a/dev-python/pandas/pandas-0.20.3.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 eutils flag-o-matic virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="http://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc -minimal full-support test X"
-
-MINIMAL_DEPEND="
-	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
-RECOMMENDED_DEPEND="
-	dev-python/bottleneck[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]"
-OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/blosc[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
-	|| ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] )
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	|| ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] )
-	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
-	dev-python/rpy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
-	dev-python/xarray[${PYTHON_USEDEP}]
-	dev-python/xlrd[${PYTHON_USEDEP}]
-	dev-python/xlwt[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	X? (
-		|| (
-			dev-python/PyQt4[${PYTHON_USEDEP}]
-			dev-python/pyside[${PYTHON_USEDEP}]
-			dev-python/pygtk[$(python_gen_usedep python2_7)]
-		)
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-	"
-
-DEPEND="${MINIMAL_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
-	doc? (
-		${VIRTUALX_DEPEND}
-		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-		x11-misc/xclip
-	)
-	test? (
-		${VIRTUALX_DEPEND}
-		${RECOMMENDED_DEPEND}
-		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-	)"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="
-	${MINIMAL_DEPEND}
-	!minimal? ( ${RECOMMENDED_DEPEND} )
-	full-support? ( ${OPTIONAL_DEPEND} )"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" \
-		-i doc/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
-	fi
-}
-
-python_test() {
-	local test_pandas='not network and not disabled'
-	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
-	pushd  "${BUILD_DIR}"/lib > /dev/null
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	PYTHONPATH=. MPLCONFIGDIR=. \
-		virtx nosetests --verbosity=3 -A "${test_pandas}" pandas
-	popd > /dev/null
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
-	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
-	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "necessary for Amazon S3 access" dev-python/boto
-	optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
-	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
-	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
-	optfeature "R I/O support" dev-python/rpy
-	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
-	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" sci-libs/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pyqwt/Manifest b/dev-python/pyqwt/Manifest
index 91d6c2f3520f..aa148d242a23 100644
--- a/dev-python/pyqwt/Manifest
+++ b/dev-python/pyqwt/Manifest
@@ -1,3 +1,3 @@
 DIST PyQwt-5.2.0.tar.gz 2670893 BLAKE2B bcd0e0c427abcc5713c3c7af8e3cb39511708b7219af99de0bf31c47117f7e5a3a9e45a1ae19ed6b5bd81d279c2332117ebfa5aee689d873320967f4c4164e54 SHA512 8c409ee228d91d625bf9bd8a5704c3d41f70613b420bc8f1527312dd1ebb686b8482bd68c4b3d1a72edd80673533a4f5a39378221967bea70f389c9dde14f265
-EBUILD pyqwt-5.2.0-r2.ebuild 1907 BLAKE2B 36b818daf38ac2a56f14ca36f8a90b545f5c3ccd544d2f68aaa318f5868dfc485c37a964fb4be44023e74a5114206e38ea235862caa2b00a91a90b478c390434 SHA512 a3c7827ac631b06c11cd8f17aa5b2f0cd15f05569c4b323fa8bc848f0f1b662025a7778a75824e6ce613fcee28b8a89a0a08b41128a3b9684b223c0273de7caf
+EBUILD pyqwt-5.2.0-r2.ebuild 1908 BLAKE2B ad606e22fb8f7a84857f6efa8a68902fbc51fc546c453000aee52096708893788107ce1a580cf4f4e4528802202e1393a5ff75e1d9ea175bf61c1d54978c1215 SHA512 dbb4f839326ebe507a3fd40837a2ad19052e70f5a8c6964c1d07bf99cfd7435d31c6bd8f8b5770f057d8010b724e2055aa53cec515d74c43c09d60f9d78e2f57
 MISC metadata.xml 662 BLAKE2B 62958f01cf277a49926891023f0fd5a693fe6197b4be0ce57d24006bf62239f01fa76281a13e7589f7b3d5addc9143fce46fab0f8018f03f2f5a9d59131a00a5 SHA512 dd9c021d0b2bc9b51d1952643bd7ca475786914fc1ddf125212cfb2450cf1fb930491e47cd0182521a10f975f30770d109f5bdf5c53ae8648257b2a485119fb4
diff --git a/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild b/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild
index cd1fb2e2c252..5f7e7a760269 100644
--- a/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild
+++ b/dev-python/pyqwt/pyqwt-5.2.0-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=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 SLOT="5"
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm ia64 x86"
+KEYWORDS="amd64 ~arm ia64 x86"
 IUSE="debug doc examples svg"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 95932a493685..593ef5579357 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,7 +1,5 @@
 DIST python-glanceclient-2.10.0.tar.gz 180299 BLAKE2B 0d97626361ad7fc2c688f5da6af6d49bf6e078f715560b4ac93725f8ea6df895e7eed0e44bf69399c973978af22ebaef3d371ae19026cff7fb2bd896c8be30d2 SHA512 9132493559d7a7b6de62e5ec1bdcd7a2dcf408c00bb0cfaccb6e11829975d468bfe68feabd71fdf8cc0d28a2c5c549945816aa14c9469314ffafd3d39b9c2da6
 DIST python-glanceclient-2.8.0.tar.gz 177172 BLAKE2B 0772b7e2b788b63bb590c8354dbad2c4e0bbd731f790f36916aeb154a44474f979961195d307e45149bccd2a58e1df72c48aa0593d6972c606b393f1202ee440 SHA512 257eaf1d548a3a6277b9c80e8b23b9ae4231586307c43a064754c227f3e3c872451ec0469aca931638ea0f7c9920892878c677b144dc72bad215c38d375a63d3
-DIST python-glanceclient-2.9.1.tar.gz 175836 BLAKE2B f559bff0b4ae1d1782bb06f9bb8b0188d9e78b83afb52a07245f8d9694bfe88e52718d3279f8b2b7d32acdd3cc86d507154bc9bcf716206696144345f4766249 SHA512 0dae48a5673ed779c0a4136896f5e74dcde489a5dfee55295f65d4b74dbe4680b1669570d0fe5011ca5282d0b6057ebc9261e5a06cff0b09fe41fa88529c3947
-EBUILD python-glanceclient-2.10.0.ebuild 2443 BLAKE2B 7e026fa4c173c8b9cd715e340a6550495b7a3fd155cd838006fe3c2edbf325c24390ac28aa968cb7d7e90859ace3c31cd99f6344c5f0ed83152b7e380a539118 SHA512 e497a697a28fc431a4586bc6373c71fff102f65bec5a3b0e6d07fcd83b04124079a8b5f5e0ce9d714e4fdbf52df80ae83d676cfdfe4aca401dd0e7b3b26dc93a
+EBUILD python-glanceclient-2.10.0.ebuild 2441 BLAKE2B 42a7436e9cc23de10ea276ee0c46ad4c8f86a767a5f8e406a57b444cfbf4e3019afdec95a4f154265adecac0b33bf6f142d15897a83e297fb853ab555ea6cb37 SHA512 b1cfb4b3ecb7f4baf5cc355a20e1417eb82e1f742f9d88ef908f816e53f34e8a88a5c75ddbdd8bd1116b9dd1cb7b45a2ea9bfa5e4e53f218f3cd8c3ef9559404
 EBUILD python-glanceclient-2.8.0.ebuild 2612 BLAKE2B 844e6ab91a070f9d20fd4418be7b63776eedc900c568ccf89f7c78f52f03fe6675e06249dc0eba5f56fcd70402d133192f77da1bc65ed1f71603852565b8f3b1 SHA512 ff395ab1c060e51278a7e5b6cb283827776a7a7d3e008d1fc0932412f05df0373f6d3f0bceec56e0d1e55d93d5256e59e6da6a15171b6f45bfc394a8a6f7abd0
-EBUILD python-glanceclient-2.9.1.ebuild 2441 BLAKE2B 50a79c1fce26ab8cb144944fff87afd00f8b83f63748bf01cac0ab84dc425acd9148ba0e5577fdaaf48dc430d92a9852073a9935d045b12166397100e54cedc6 SHA512 3b785c8b08d165b61ce665f3e41655afc9025c5fa8f58a297b4f7b673be82b366ab5146bb158a7bd6e412240f60584c8c66500faf9d291ef0715d9bc1befdcac
 MISC metadata.xml 632 BLAKE2B 69885578505253d6ec3d0245779a89ebe5c75ab8a8e9fecbf95c29d4aa17ba6864e69c1806a01cde0e92080a86ccbae146bdb2c003f50fd3dfd32b6d2186536f SHA512 d807a9aadecb131f92d6a476a8bc0b0293d46c6ac761a2d1ddb596ac219c6c8ac349402e3f56d150e78ad81c5d2838a33b3d35222a18f9a416f969f6d6208d8f
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild
index bffb4cc4e44e..ad9d27f9c42a 100644
--- a/dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-2.10.0.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.9.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.9.1.ebuild
deleted file mode 100644
index ff874e295b73..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-2.9.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ordereddict-1.1[$(python_gen_usedep 'python2_7')]
-		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 tests && einfo "run flake8 over tests folder passed" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index a5096943500f..e1dd2def7baf 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,6 +1,6 @@
 AUX pyudev-0.19.0-skip-non-deterministic-test.patch 3497 BLAKE2B bfbbd7bcb401d807531321cb15c71a52b7b039a3c7ad5cd06e9c919e6b6ef232fb16419f0480ce89e316770db523bcd3e02edc7c4f259803f4a3c93e2b0edbbe SHA512 23c305242e4df0bd0d4cde458ca1ee129bef36f98f5b7c3b341c4866b7f21a51ffaf07aa56901aeb67ccb59a4ed6548d4799ae2c519e359b627b29e722119a4d
 DIST pyudev-0.20.0.tar.gz 93217 BLAKE2B 9426b3f012be0b1bcacb7f3ed8b33d7965a2a8d7c676f032a0f2f9e6013f52090ddf82434ba01411cc2886796d34f736dc3d2e1abd6f45ee7ad516e9d5f45f90 SHA512 e86a776a2b6d29f206cdd0057c6f9b1e705d981ec8c2de49259887647856531af68238b80751102a3ffc8cea6f234cc520d62c8bc2da686e453ed010da3ebb02
 DIST pyudev-0.21.0.tar.gz 89469 BLAKE2B 3bf9ac46442c5948d131932c7b62a59ef979755f2d55bcd0165fc1b69b865268051fdeab7605c8a1cb0694ce0f4b88f31a1e6a1893900a7300ddf6439734712e SHA512 ba5b6156768b65b9655d809b14378b01173643781b9c4017271e880cdfed442c44ac49eb26c970e4275b820e01678e3001870591fccf88dc713ec941e2b85d11
-EBUILD pyudev-0.20.0.ebuild 1678 BLAKE2B 9f4f5d0d8ffeb355df6fa24cce248c72131a34cfe4fd1d985f6c29b4ec3ab65757f13811e6522a0c82e707799428aaf646b354cb801275be15f6211ded5f4284 SHA512 7f715c572b3ddd83513092598b2e51db117bc47ce3917d92060fd6833156a74b4d499760e7ec27b4933ab58e1ca90894d6c6478e3d7d94235863b5131123f155
-EBUILD pyudev-0.21.0.ebuild 1542 BLAKE2B 2cd0edcb79396452d7d5498c7e45c15fa2daf8f0d7a1195f77fae3e7edd5998168a316b9b3ac41aa8d16a07bc450c3f32b9cba535fec75b49aa0198627e4615a SHA512 32d7f8aa6525a12d8d49028f968e555de112604d205460af3e31cdee7362d2734a722197a4f2eccbfddfd6f671a9f4a37d6a37dc1f418395862987317b28d62e
-MISC metadata.xml 754 BLAKE2B 2a6915fed8464e9c8d64d4ba8c4bb70201f4d06b1d442149476a212bc3fd94a9144f5a5f08ba01c8878004bbc752e4dd374000802c894f8d13138159457f97e1 SHA512 e0ed712734759c1710ea8bd2cd9ba1c39801a4355da7ec53a5cc0cec2ac375ee19ca557fb3a13895a2ea7d6ce56b216501106e3fd216281a4f60776aca020170
+EBUILD pyudev-0.20.0-r1.ebuild 1498 BLAKE2B ec887ed44b71a5e44d3a80780cc9f2cec7492dcfa727b69f5476485bc15ebff9def00e75cd0628b74118340ec3d82cbb2a23fd28e8269f9485da5bead7c84a36 SHA512 31295a078dd2b54f54c53eb65e919641cdd5dabb5f031f02ef6f47829c074e59e79e7e24e1cb8b51991463fe372802adfeb6469e4c6e15e96b29068cbd0711c3
+EBUILD pyudev-0.21.0.ebuild 1489 BLAKE2B 0cf74bb67cf5daa50575870b58ee1a9da43088a11005df2fd03280417bd3723874b68d4d3df2bd50bc5cbcbd6d3c92c91e014d8cb7a6b4a77b5c81a02264925d SHA512 d244247c8be059ce48af9043070d2a7318311e6f884d2d90ba127811784af4af53e94c4513470f62c7565dd6402b1eff905a159971cfbbc353bb87dcd7c35bf4
+MISC metadata.xml 652 BLAKE2B 15c561bbbbf2c96a44e6d0ff39e7d1cbef709b52800051d09add19b88318e7d4c9ceb09c0942e7b01ed3b836df1348ce7c84b0deb8db4dc6e5bcebe200ebc95e SHA512 bf46b85c588d646d7cc6179a059d9fb8143eebce038e64af50f3129056a71b65a63a3cd214924ca538e6793f48912dd0f824a7826b49abbfbb8b27a72214c89b
diff --git a/dev-python/pyudev/metadata.xml b/dev-python/pyudev/metadata.xml
index f42881a0924b..9c052c908df4 100644
--- a/dev-python/pyudev/metadata.xml
+++ b/dev-python/pyudev/metadata.xml
@@ -11,9 +11,7 @@
 	</longdescription>
 	<use>
 		<flag name="pygobject">Install PyGobject bindings</flag>
-		<flag name="qt4">Install PyQt4 bindings</flag>
 		<flag name="qt5">Install PyQt5 bindings</flag>
-		<flag name="pyside">Install PySide bindings</flag>
 	</use>
 	<upstream>
 		<remote-id type="pypi">pyudev</remote-id>
diff --git a/dev-python/pyudev/pyudev-0.20.0-r1.ebuild b/dev-python/pyudev/pyudev-0.20.0-r1.ebuild
new file mode 100644
index 000000000000..1bc6bf6e811a
--- /dev/null
+++ b/dev-python/pyudev/pyudev-0.20.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
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding to libudev"
+HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86"
+IUSE="pygobject test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/udev
+	pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( CHANGES.rst README.rst )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.19.0-skip-non-deterministic-test.patch"
+)
+
+REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+python_prepare_all() {
+	if use test; then
+		ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/',"
+		ewarn "change it to /var/tmp to ensure tests will pass."
+	fi
+
+	# tests are known to pass then fail on alternate runs
+	# tests: fix run_path
+	sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
+		tests/test_core.py || die
+
+	# test needs needs newer dev-cpp/gccxml
+	rm -f tests/test_libudev.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyudev/pyudev-0.20.0.ebuild b/dev-python/pyudev/pyudev-0.20.0.ebuild
deleted file mode 100644
index 381aee136f94..000000000000
--- a/dev-python/pyudev/pyudev-0.20.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding to libudev"
-HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="pygobject qt4 pyside test"
-
-RDEPEND="virtual/udev
-	dev-python/six[${PYTHON_USEDEP}]
-	pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )
-	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
-	pyside? ( dev-python/pyside[$(python_gen_usedep '!(python3_3)')] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( CHANGES.rst README.rst )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.19.0-skip-non-deterministic-test.patch"
-)
-
-REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )
-	pyside? ( || ( $(python_gen_useflags '!(python3_3)') ) )"
-
-python_prepare_all() {
-	if use test; then
-		ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/',"
-		ewarn "change it to /var/tmp to ensure tests will pass."
-	fi
-
-	# tests are known to pass then fail on alternate runs
-	# tests: fix run_path
-	sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
-		tests/test_core.py || die
-
-	# test needs needs newer dev-cpp/gccxml
-	rm -f tests/test_libudev.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pyudev/pyudev-0.21.0.ebuild b/dev-python/pyudev/pyudev-0.21.0.ebuild
index 5c776f99aa59..03d8a9597aa7 100644
--- a/dev-python/pyudev/pyudev-0.21.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.21.0.ebuild
@@ -13,14 +13,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~mips ~x86"
-IUSE="pygobject qt5 pyside test"
+IUSE="pygobject qt5 test"
 REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )"
 
-RDEPEND="virtual/udev
+RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
+	virtual/udev
 	pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )
 	qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-	pyside? ( dev-python/pyside[${PYTHON_USEDEP}] )"
+"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/restkit/Manifest b/dev-python/restkit/Manifest
index daf595042f88..8bcea676196b 100644
--- a/dev-python/restkit/Manifest
+++ b/dev-python/restkit/Manifest
@@ -1,4 +1,4 @@
 AUX setup.patch 843 BLAKE2B 80626eb7317e42fc828493d98afb330873040bd0bf3a33c4c4ef225a4f57bea078e3440172509a5442868c565eeaf675c82c47d514bb4a915881d8aec2456a4b SHA512 200c112cb264271d8c1f043acb22ac476d09a0fc325b74658a950939f71edb8fad84a0fbc5f11335152fe5591be98a14df63f57458b84d35c2511a2079778387
 DIST restkit-4.2.2.tar.gz 1275904 BLAKE2B 4ebfc3ad91265954c28712e4beadcb25a467fe7af8c68bb655016ddb20877ca63275136605400c59b462825526a59f69d69d4b687641816b4704b62623498734 SHA512 5ed08535e1a54b5594d97b059d8662ab4bc19c68e71a30719c4a533cba0f2d0e18872119752c62136563a32281e8f747414fbf843fd97dba138107ffcb5d1e4b
-EBUILD restkit-4.2.2.ebuild 1302 BLAKE2B f3d11f766b54a5736d489fddd556b3eebc7fa9726f9ca4b6755bcbdd8c03fb8d8050c0a7a2507eb1c115bbb6db628ba3e12db7effd0c5790cc0099b7908d5a86 SHA512 83822a9eae558476d2f9eb46c125df75d0ffda07638b9d4b54e4fc8c88186f3fc9f03b04727fb283b31aac8f177266e7ee46593747e6874da591733c403813f8
+EBUILD restkit-4.2.2.ebuild 1303 BLAKE2B f9a2b32813959020ad6d9de32f5215e88cf58d7438d8088f7518999812c21c392d2cba171ebe545c9334292030c6e7101757367a4cba4e63201d5b0901b96526 SHA512 d8672a91230d14fa00199df7ed08a887521a02f46a5e210c3bc86c37e4df49ea2fcc8fe9f4a1970472a9316f89eeff6122032369bf6fa427d9d06112963ce0dd
 MISC metadata.xml 520 BLAKE2B a4f0485d0276279a820836969654d31173c08f1fb840892a5760cc484f8156bcc88ff2ee371aa1154883be957d9b62dc9ddc6cf242ec02b4e9cc9cfb45c99449 SHA512 6e5652c44b93cb00a07485b337e4be168e0728ee49485692bb6b3cdc5725f78191ca891059197f3665a9f1ac1f65074843b7a2fa7cfc4ef0d92d52033f685acb
diff --git a/dev-python/restkit/restkit-4.2.2.ebuild b/dev-python/restkit/restkit-4.2.2.ebuild
index 0302d85a8b47..044ce7bfa2a4 100644
--- a/dev-python/restkit/restkit-4.2.2.ebuild
+++ b/dev-python/restkit/restkit-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc64 ~s390 ~sh x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~s390 ~sh x86"
 IUSE="+cli doc examples test"
 
 PY27_USEDEP="$(python_gen_usedep python2_7)"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 431be5c20b23..97e9a41a1033 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,9 +1,5 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
-DIST sip-4.19.3.tar.gz 1007481 BLAKE2B cf4d53c956aa046f165e9ec05126fa9b6ca3df688b16ff79520da8ea82f7e9622e03448030db14b0d21ba090893375814f39d6b3fc62343880aa169c2680394f SHA512 b2dea0cb5e1b23531f35e94bd604ec9874f0875badb5b20eb5abd2732a1005b2dd15bb42e0007b65053a2153b50659f24671abd83a434991661168a5778b94bc
-DIST sip-4.19.7.tar.gz 1022209 BLAKE2B 51b29bd436ce7af2d4a3b45ace100075bd257c23982c6e1fcd3f8b2998ee360f1ac42683fbd0e3a371cb044a682c326e00e907db0961aebc70bfb6b583ad2bc7 SHA512 0cead34e129d25ee3d908e503a3853289bbfd77c58c563a2046ce7b65bd8f0b318b20af72346cbf4cb7a17e76c9c1374f686b5dabc284d7247897a1648c15f97
 DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
-EBUILD sip-4.19.3.ebuild 2121 BLAKE2B 697bf3c96b0de9bfbdce8dfffdaa3fb9e598714c98f0478767c8644990bc578ae5d1a2de1883df4d0b9ece9a9fce131080ec37f69f67b6b40b84dadb52e9468b SHA512 53029646c58a07a557095817d08aec6122ee7fd840e6c865da5cca77e302fdad3f1142f79c300bbf6d62d3b2a1f710ed04f8920c0a220015b6e032534f31bf98
-EBUILD sip-4.19.7.ebuild 2776 BLAKE2B 787ad402476cc19ed1a690d0c2fcf748b7c12429f9f61f6a2008dd772c21853745c2f110a3d1f4c57bfac8116636301ab1481fd54652d76b8fbc3c0b257e1f5b SHA512 a82ee1ad2f33b3b4df3b2816f0839a9ead6d52c55c23f9fdc0e79e68319e982d8827db3aa51c9334852e9ae5ae948fb692174e2234541d6c5d2d67f851c63f1d
 EBUILD sip-4.19.8.ebuild 2770 BLAKE2B a2f0bb2c65e93efb40da64942e4230d35626ac44d7c90240ec1e2ffefa7256bb00073882639d72e87c46876a21cba8334dc3b822e089c149ef6f2df4e8f2b961 SHA512 7f88d918131f92a3d5e0dd34b7c70b80facfc603cf9a504de45c9c69944fb15fe836ca6125d95cab4a8fdbb17d43a729cbe13e1aebde0472843d507d97424075
 EBUILD sip-4.9999.ebuild 2648 BLAKE2B 8e7fdbfc969f73f30cf5c26282f06439be6e7d01e9ee087e0377d946aced09295c01ed685e4988a09967c604c3d378e2716552076ca509f6d808fe3a02d470bc SHA512 be5b35c951f7a93d8fe1dd751d4b27132f0249a052cedc4877a3ea7bc56b646744a174a4e0796b127ab0c0082fbb2bfbb1dcb8ef4fd02ff5c10059b44eaf8ae7
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.3.ebuild b/dev-python/sip/sip-4.19.3.ebuild
deleted file mode 100644
index 38c05afc2964..000000000000
--- a/dev-python/sip/sip-4.19.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
-			$(usex debug --debug '')
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sip/sip-4.19.7.ebuild b/dev-python/sip/sip-4.19.7.ebuild
deleted file mode 100644
index 08a8e8d93775..000000000000
--- a/dev-python/sip/sip-4.19.7.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
-elif [[ ${PV} == *_pre* ]]; then
-	MY_P=${P/_pre/.dev}
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-else
-	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-if [[ ${PV} == *9999 ]]; then
-	DEPEND+="
-		sys-devel/bison
-		sys-devel/flex
-		doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-if [[ ${PV} == *9999 ]]; then
-	REQUIRED_USE+=" || ( $(python_gen_useflags 'python2*') )"
-fi
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	if [[ ${PV} == *9999 ]]; then
-		python_setup 'python2*'
-		"${PYTHON}" build.py prepare || die
-		if use doc; then
-			"${PYTHON}" build.py doc || die
-		fi
-	fi
-
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
-			$(usex debug --debug '')
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index 2ffbbe11830b..a2c472bb4ecf 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1,5 +1,7 @@
 DIST tooz-1.58.0.tar.gz 81688 BLAKE2B 06e282850c549261a312d5381ac9004d13c96a90b10b3f682f2edbe3df5a1b4516a2e618d40d4625242fc18408bb38de56d1c9a58a998b843dd5c98f3d89917c SHA512 44886aed3b37e2a9cb2896fa30e22c7101f19fa766c75a2d7c82c9bcd13b47804ba6d140fe65d2b7c7f3ce3e12bf2f19fa1e92a8e147103204a608aba28f5ccd
 DIST tooz-1.60.0.tar.gz 85364 BLAKE2B 7c1f8cca02830accd5c72d09333f027a02d79944402affc80bb645c11a5a6ecbf94dc8acb62a1d1e98773458763a289134fe8603291e32b25dac507c68571a7d SHA512 610b7d30ce68954a687237c02d5529e93c1babe79bcf16de3674ae3c1d395202738a01dea91f8ffcb184717d884f777300152f54e6f971a4a42fc8bd500ad982
+DIST tooz-1.60.1.tar.gz 85330 BLAKE2B 0b75ebc5dcc3c9873fc41ce92e61be0591955b4bbbc4c7f16b87bcd27c24c8f83bd079fd9c24164563908fbb488ec4a259d65ee583146324b67acf048504817e SHA512 5dafaea570cc104b0e82eff3ec54d0969bf84c5d84e20c69957c55b2cd9e80bee2925e2ace6977fd499044df0bae02a18c17dcba9592ee3c4ccdb6b2b1dfae38
 EBUILD tooz-1.58.0-r1.ebuild 1263 BLAKE2B ca34f0ecbf42876e1a4a862abb48dd2aa7881ea64f3d3dee11a9746b17b9ace9da37001b63df9b3463ea0e1fe3d6f751d824a527d4be178d0c18f57da4798eb7 SHA512 a6f2d3710582f9de384c2e95f8dab9ad91a8233db536b32a21e94ff4e0655966048ea8394a32daf5d20b4d755ad6ddae8c0e778bb69e6c9a429c64bca0f7e1be
 EBUILD tooz-1.60.0-r1.ebuild 1262 BLAKE2B 9b4f3eef111a70bad4d4a953453f9efaab941735b0dab0dcede7bf93ab596c62adf4b338e85c0f2f5a23a46268a59f3ec615f299d01538175c24ca76edfc7b34 SHA512 fc6fe0d66d328ad283b56233f7bf2432d29b10b2123ce26e855fb0e44042c89ae3158488b8334952d395cc6018b578998a74a48ff8abe931f9b861b666720a78
+EBUILD tooz-1.60.1.ebuild 1264 BLAKE2B 3e6be13bf6fe8ca059def056bd0f6a353580b516bfd2ad218eb6d3ae0a59e0f07f9ecdabf11f4f54e78814c04be231ca50914342afb8f82fff453000e2a58577 SHA512 0e68d141b012e69de7c732f87a9da91cc06ad42e10821ed01d0cd83576396df93cd1579d39190a542e19f4593042154c5d43da24ed228624b815ccf45f44e700
 MISC metadata.xml 614 BLAKE2B b93f65d4b322a9cdd753886cfa8d506676fcbea6c8ab9656c310b245b42aa296667db500584fd19295fa978543834724c17358591f8450cf761907a83cd04d22 SHA512 2185ff992babb09b9c51b350c94237ac4d48e3b10ee118871f59aeb2a265f34b86f798b46c272db76a976d83f1cd005a01e4c965476227334084b0e1ff10d1d6
diff --git a/dev-python/tooz/tooz-1.60.1.ebuild b/dev-python/tooz/tooz-1.60.1.ebuild
new file mode 100644
index 000000000000..1d97d2da6418
--- /dev/null
+++ b/dev-python/tooz/tooz-1.60.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library centralizing the most common distributed primitives"
+HOMEPAGE="http://docs.openstack.org/developer/tooz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 990ac12061b1..c77af449a66f 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index db8c0d404698..421c7914a753 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,13 +1,11 @@
 AUX assistant-4.8.2+gcc-4.7.patch 500 BLAKE2B 359cb062c9406b9afd8e4a427c5da36952ab7a1d821e127e74667d7752d3393cfce95fe9cd7a7134533eb4a1d6916b8b0f96da7fa0fd3efdee63f98ceaa18c4a SHA512 1948a7b47e5e15da47408af18c518762818542b42f2768a73acba698f23fca837a690be9821974be01662b45b7b3823b314577fa79472cf3f96620c0a1155a18
 AUX disable-webkit.patch 872 BLAKE2B 3856945120fbc7c27a32acc0663e74ec8302012c2c646cadb3467505797ee0a2233d3556646d532cfe1a2d3cb1b8b1fda53ff7a94ad302fba952202baa7927ca SHA512 9c05843197aab2a5e49aefb4aaa8e1ee73b4c410ec54ede9ca958672962713b1949493447a06bf7aaa1733bf22b3a67a77f94e4063b47bb30bade1522d29830b
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645
-DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
+DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
 EBUILD assistant-4.8.7.ebuild 1477 BLAKE2B c722e0a293112ba58f292566de3d3730e5a12430e107f9fe95ed45841e55731340a298b23dda9bbdbfcd29e3b51342077e7fc3f632755ee54fefab72f72dcb05 SHA512 2f01f97502f9990a048b3dc974e6295cdb8f97f2804f0a20a9f515e7a8a04611718d680778ce35ddac45b6406dfb4fcf05a60a7f24acdcbfd3787c3e2961eb6b
-EBUILD assistant-5.11.0_beta4.ebuild 1198 BLAKE2B f2b40ee9a585e0a0fcb98b6999728b633a3c9cf3c9bfc767ba2f5d6948156684596bf02aa9e006008f50474def97051562faa6baad271662c33c78095e1c7f39 SHA512 cca326bf91461ef72f110f6c0c23ef13c65eb0fa51eebdce468797e89f5969846dff93ce75a93ed1d1f699044e7dc3a32b0659e922f26531b71702390f6f318c
-EBUILD assistant-5.7.1.ebuild 749 BLAKE2B 1b6cd7fbcbad8dba7f72a0a4b9604ccbf3c4e97b194a4d2ba93d29731219261f44964b97e0647ffe0ee46bef04c6c1c1f2a24f11d31011f3dd8f05f446088a94 SHA512 a25bcd1d1737a0cc3368d38e0dc91a224bc37205547be3969b546a4ac6104157296e0b568a39056f1340a2c248a5867a74ec27ce3b9e965a75da89c7c3cc4f45
+EBUILD assistant-5.11.0_rc.ebuild 1198 BLAKE2B f2b40ee9a585e0a0fcb98b6999728b633a3c9cf3c9bfc767ba2f5d6948156684596bf02aa9e006008f50474def97051562faa6baad271662c33c78095e1c7f39 SHA512 cca326bf91461ef72f110f6c0c23ef13c65eb0fa51eebdce468797e89f5969846dff93ce75a93ed1d1f699044e7dc3a32b0659e922f26531b71702390f6f318c
 EBUILD assistant-5.9.4.ebuild 1195 BLAKE2B 9fd15cfd04a7544046cccdc503169417f53ee3a808aeb58a745063e62acb3deed5d761275c1c9a812c92a38427c447f542a77feb312517556c15b4da7681a2b3 SHA512 9139269fee4450c028b112203655a5917beefe83ef07544c8c129c4efee9815448af5cb59312b53821d0c2fa53214e439f02343b84952207a1f8cb57c3e09ee6
 EBUILD assistant-5.9.5.ebuild 1198 BLAKE2B f2b40ee9a585e0a0fcb98b6999728b633a3c9cf3c9bfc767ba2f5d6948156684596bf02aa9e006008f50474def97051562faa6baad271662c33c78095e1c7f39 SHA512 cca326bf91461ef72f110f6c0c23ef13c65eb0fa51eebdce468797e89f5969846dff93ce75a93ed1d1f699044e7dc3a32b0659e922f26531b71702390f6f318c
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/assistant/assistant-5.11.0_beta4.ebuild b/dev-qt/assistant/assistant-5.11.0_rc.ebuild
index 0fe2bc14566e..0fe2bc14566e 100644
--- a/dev-qt/assistant/assistant-5.11.0_beta4.ebuild
+++ b/dev-qt/assistant/assistant-5.11.0_rc.ebuild
diff --git a/dev-qt/assistant/assistant-5.7.1.ebuild b/dev-qt/assistant/assistant-5.7.1.ebuild
deleted file mode 100644
index a584bed1d994..000000000000
--- a/dev-qt/assistant/assistant-5.7.1.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
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~hppa ppc64 x86"
-fi
-
-IUSE="webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qthelp-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-	webkit? ( ~dev-qt/qtwebkit-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/assistant
-)
-
-src_prepare() {
-	qt_use_disable_mod webkit webkitwidgets \
-		src/assistant/assistant/assistant.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 39a555214784..c115a54a0c70 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,11 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645
-DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
+DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
 EBUILD designer-4.8.7.ebuild 1746 BLAKE2B a6d8990f6498a02e3bc67d420ea5bdf2c942b20167e9ab9856ded2c48c115773464e4f932c7fd4fe5ec39b84055310b2758c4cd8df29f8bf55a75b1f5f4d2eb9 SHA512 69c7c89fde7f2bfb98ee87f0fa3af6bff2a815c0bf71436fc32a5d1d2e8dfa0184f2383b341be942c6581c0c218ad7d2ccef2ca2406da9b046180a7e79aba191
-EBUILD designer-5.11.0_beta4.ebuild 1244 BLAKE2B ad0534b8270814a5be1fd476da3a03c9eaaacca6c9188a3fe01237e7fa78dccf2734b5fab06e2a7aa40590229ed7cf18df208dbbf3c9a7bcce1ee5bf0cb34e99 SHA512 892e94e9ed8c3d90462f8141a18ae68304b8d096383a6d5d1dbf09ca439480ca6f289f0b59e16734477a845ae1a742235decdcb3b5f6224e2b2d8f65e7cafffc
-EBUILD designer-5.7.1.ebuild 864 BLAKE2B 026e933a2f0b48df1361bf84062a2b66da71727b8025586dc69c78c0e32d35c4641c1375f99c0b13a34ef1b8bc729c22044d4950db8de3180faea78cfafad756 SHA512 83ff83ebc13fb2063ef779306a3739d2acac28447821601a1e2544288bb360803fd6e59a42c70fed5f3c99835122c56a9856542b5089a4b007feb87dd6f79fe8
+EBUILD designer-5.11.0_rc.ebuild 1244 BLAKE2B ad0534b8270814a5be1fd476da3a03c9eaaacca6c9188a3fe01237e7fa78dccf2734b5fab06e2a7aa40590229ed7cf18df208dbbf3c9a7bcce1ee5bf0cb34e99 SHA512 892e94e9ed8c3d90462f8141a18ae68304b8d096383a6d5d1dbf09ca439480ca6f289f0b59e16734477a845ae1a742235decdcb3b5f6224e2b2d8f65e7cafffc
 EBUILD designer-5.9.4.ebuild 1240 BLAKE2B 4e9a38c065ef1952e11e1aecb64641713a60158fb871366148b2a14e38f37f3bba3dd851af6785c60c4abb724a3f665a4420b04f6b4b94b0d95d0b2de3f57a6c SHA512 ce7311a632c53fac6ef6203136ca190518e5463f47536aa6bf32cfe9f06b8f2984889c23a0452c5f7c95d1f1e70df5ff20f133b9555c4546faf21b3c68be9a23
 EBUILD designer-5.9.5.ebuild 1244 BLAKE2B ad0534b8270814a5be1fd476da3a03c9eaaacca6c9188a3fe01237e7fa78dccf2734b5fab06e2a7aa40590229ed7cf18df208dbbf3c9a7bcce1ee5bf0cb34e99 SHA512 892e94e9ed8c3d90462f8141a18ae68304b8d096383a6d5d1dbf09ca439480ca6f289f0b59e16734477a845ae1a742235decdcb3b5f6224e2b2d8f65e7cafffc
 MISC metadata.xml 879 BLAKE2B 4d8a4c31c5cb415d18d59f54243bdb9b49bdbd6c374576d7294d2db2ce6505e31fa8da57966b04d9223e9a474d06f7078bab7432051629fa0a5dafdb9ca59152 SHA512 fba36502504141e09462fb211dacbfe43db6cb6e750f699058c757c1fc24072eb5ed50bbbb20e2bbacb831f165a58c20cb9c012ccbe96665969e1fc8fc153489
diff --git a/dev-qt/designer/designer-5.11.0_beta4.ebuild b/dev-qt/designer/designer-5.11.0_rc.ebuild
index c561782d0aad..c561782d0aad 100644
--- a/dev-qt/designer/designer-5.11.0_beta4.ebuild
+++ b/dev-qt/designer/designer-5.11.0_rc.ebuild
diff --git a/dev-qt/designer/designer-5.7.1.ebuild b/dev-qt/designer/designer-5.7.1.ebuild
deleted file mode 100644
index d836a6ad68ea..000000000000
--- a/dev-qt/designer/designer-5.7.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="declarative webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
-	webkit? ( ~dev-qt/qtwebkit-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/designer
-)
-
-src_prepare() {
-	qt_use_disable_mod declarative quickwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt_use_disable_mod webkit webkitwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index ee5dfc706410..f3d7c730f65d 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,9 +1,7 @@
-DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645
-DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
+DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
-EBUILD linguist-tools-5.11.0_beta4.ebuild 693 BLAKE2B 39864f535257e8a5a878e9e1bada7bf211ca59c25a873bbd719f0f754ea44ca73b6bf60bf40e84956e9ab80c783d4d8f544ff1fe160ad5287fbda01b884e000a SHA512 9fbaa96994c68ba5cf1ad2c50cfde9c5ce1f3aad36a3c7072a8e9104f5e085d4fb6c5698e720a120b8c963c106cb228926499360734f6092a7dc3b301ee80306
-EBUILD linguist-tools-5.7.1.ebuild 676 BLAKE2B 891a6b8d53de45067fe730fcb40a5481dc3ed7a72f013558fafd9d085514240bce60ffa5ccf11d34583f393548061588a66436d42e871577515adc3ce2c7920d SHA512 cb62fb1f219d8ee064952132b4f208a4cd0be6d208564a26f60df53ce6f0d3f60f8b20ae626b9f1cc5edd1101d556b002589dec22052863ee37e0b9867edf64e
+EBUILD linguist-tools-5.11.0_rc.ebuild 693 BLAKE2B 39864f535257e8a5a878e9e1bada7bf211ca59c25a873bbd719f0f754ea44ca73b6bf60bf40e84956e9ab80c783d4d8f544ff1fe160ad5287fbda01b884e000a SHA512 9fbaa96994c68ba5cf1ad2c50cfde9c5ce1f3aad36a3c7072a8e9104f5e085d4fb6c5698e720a120b8c963c106cb228926499360734f6092a7dc3b301ee80306
 EBUILD linguist-tools-5.9.4.ebuild 689 BLAKE2B a9c6a757c7a558d2d29ec22f75be9be7d692706017422a5ea0020ec2b5eaf685a23d9894acbedf5ce493a094bbe5b23dfbf26bd4ba45cb669d6eb5395f61f265 SHA512 e4c747c0b392fda0a754a40832db8e7d6ee98b4caca74a07e608690497fbf5d09297ecd5a6dc1ea970a01075d064eea9cc889e57b5f4ddae6ebcafdd9019fd86
 EBUILD linguist-tools-5.9.5.ebuild 693 BLAKE2B 39864f535257e8a5a878e9e1bada7bf211ca59c25a873bbd719f0f754ea44ca73b6bf60bf40e84956e9ab80c783d4d8f544ff1fe160ad5287fbda01b884e000a SHA512 9fbaa96994c68ba5cf1ad2c50cfde9c5ce1f3aad36a3c7072a8e9104f5e085d4fb6c5698e720a120b8c963c106cb228926499360734f6092a7dc3b301ee80306
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.11.0_beta4.ebuild b/dev-qt/linguist-tools/linguist-tools-5.11.0_rc.ebuild
index 72c04bdc9e06..72c04bdc9e06 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.11.0_beta4.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.11.0_rc.ebuild
diff --git a/dev-qt/linguist-tools/linguist-tools-5.7.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.7.1.ebuild
deleted file mode 100644
index f43b11c69bbd..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.7.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
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tools for working with Qt translation data files"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtxml-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist
-)
-
-src_prepare() {
-	sed -i -e '/SUBDIRS += linguist/d' \
-		src/linguist/linguist.pro || die
-
-	qt_use_disable_mod qml qmldevtools-private \
-		src/linguist/lupdate/lupdate.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 1214b74c9056..a040b9f7e20c 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,11 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645
-DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
+DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
 EBUILD linguist-4.8.7.ebuild 1156 BLAKE2B 69663d5d63aeb2c60a97fb6fb16124d16683350dec8da4bfd6303d85e4afe0f1c63202fa9ad61c04cb7e18ae2a95ca665f1641124893cd93ccd297ba3af71e84 SHA512 c8468dc810ce46dcc6adbfb0d178b173299ec0bbc19936f6ff85df59759b4e710b6afe270d345653ca209e5c4d541ba03a20fafb596d3c1c83e74f46d152d9f6
-EBUILD linguist-5.11.0_beta4.ebuild 992 BLAKE2B 5db73329127034e7a71336bb845b7fe68ed45becabbe1206f24972ac1b4302923c504953198389da8d8021d415498460054c8d1191b1f13bf0c9f8685f3feab5 SHA512 25cac8c8a214be7467b58c73543693cd2165e6055516f74ac64fe6e33263da564b64957fa7c801be7d1ccb70c2673752ca4653c12821247dec56d8e7ffa4551d
-EBUILD linguist-5.7.1.ebuild 533 BLAKE2B bc33f6b78c6aabc73ffbfdb6946bcc33402b29dfff662f09778e548de3d65789a731069351b380a9e3b65c50241d810fc7a17cad523453e65dc9b32d95eebfa6 SHA512 e26d05555ead69ec45d7b748ce7cba2e303c3f133cbfb4c7af8d82be2fbad1fa2d756518658c20fc8beb671a377d351c2a499d1573f0db6c93aab96bec3317ae
+EBUILD linguist-5.11.0_rc.ebuild 992 BLAKE2B 5db73329127034e7a71336bb845b7fe68ed45becabbe1206f24972ac1b4302923c504953198389da8d8021d415498460054c8d1191b1f13bf0c9f8685f3feab5 SHA512 25cac8c8a214be7467b58c73543693cd2165e6055516f74ac64fe6e33263da564b64957fa7c801be7d1ccb70c2673752ca4653c12821247dec56d8e7ffa4551d
 EBUILD linguist-5.9.4.ebuild 989 BLAKE2B d3766d1ec8f65abc86909647bab3e4d28666f8ee11d27aa52138844d0b738bd522154e5f461f6540c856bce00377515caf9cb62035ac67d34e6600f053669be3 SHA512 11a3cad892735e439d1f2851c320bd54e3a2fa89f1b9c4901b0bd445e54709342d4bcb7792e7a14c332326e6e2a6bc1eaf93534298029972e59316735f836a85
 EBUILD linguist-5.9.5.ebuild 992 BLAKE2B 5db73329127034e7a71336bb845b7fe68ed45becabbe1206f24972ac1b4302923c504953198389da8d8021d415498460054c8d1191b1f13bf0c9f8685f3feab5 SHA512 25cac8c8a214be7467b58c73543693cd2165e6055516f74ac64fe6e33263da564b64957fa7c801be7d1ccb70c2673752ca4653c12821247dec56d8e7ffa4551d
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/linguist/linguist-5.11.0_beta4.ebuild b/dev-qt/linguist/linguist-5.11.0_rc.ebuild
index 38f06fe3f5d8..38f06fe3f5d8 100644
--- a/dev-qt/linguist/linguist-5.11.0_beta4.ebuild
+++ b/dev-qt/linguist/linguist-5.11.0_rc.ebuild
diff --git a/dev-qt/linguist/linguist-5.7.1.ebuild b/dev-qt/linguist/linguist-5.7.1.ebuild
deleted file mode 100644
index 796aa4ae97b5..000000000000
--- a/dev-qt/linguist/linguist-5.7.1.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
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/designer-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist/linguist
-)
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index fb8466152d5c..a5d2699e5d4f 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,11 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645
-DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
+DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
 EBUILD pixeltool-4.8.7.ebuild 836 BLAKE2B c2dadbdf93032d63466f13462c3610a2401effb5884353cce3b53148407a52fa2757d5396a1ee5d8aed80ddbf8aa1e8bf845d82a04234c618f89550c64e96042 SHA512 2ea3e1e6dc5a40b63108785c6e08e59f395194fcf247f8ed77ce8ab874eef04a76384444093a3878ea0d41949344a212a4fa25e84c4dde8e5a26b96a64b94fa8
-EBUILD pixeltool-5.11.0_beta4.ebuild 427 BLAKE2B bffe3b0f18b8c401f3a8daeae201c9f43187b515ed2691c938beeb45276bc27b5d24db459f6ae83336775a50733fe41d4166963cda41ec30e9ad451e5728a0d1 SHA512 4efa3fb21649069309421a5fb10f21b474404d02d2a095bd5a978c26d357c62bd45cd8944ddb126a307f849ba5b3490685aa24a88e88b9744b739d35d7491eef
-EBUILD pixeltool-5.7.1.ebuild 448 BLAKE2B 5bc9445fbe3dbfe34516717038ce5440cf26d3f29d5f5e3cba82d7f20cc305436baf40e8a6ffefa2d89f15a24a5bd622851cf19a42ea6f827e225d9de328f8bf SHA512 04a7923d304f4f6b72e9a445938238c8ab75b4985003a33043e2c34925ebde30abfc8e58548b3d902eac7ae2619947a5b345bd8fa2fc4def8cc3db641df498a0
+EBUILD pixeltool-5.11.0_rc.ebuild 427 BLAKE2B bffe3b0f18b8c401f3a8daeae201c9f43187b515ed2691c938beeb45276bc27b5d24db459f6ae83336775a50733fe41d4166963cda41ec30e9ad451e5728a0d1 SHA512 4efa3fb21649069309421a5fb10f21b474404d02d2a095bd5a978c26d357c62bd45cd8944ddb126a307f849ba5b3490685aa24a88e88b9744b739d35d7491eef
 EBUILD pixeltool-5.9.4.ebuild 424 BLAKE2B f70a57ed314ef84a525eeadef282b1f8b526ece30980904fe79c5bb5a1b80d9cc0fabb79847e1eef9d70d419076c19ebad0a5d23ecd2b9d1b5832df5ed824721 SHA512 420f8831d949332c2f2f4625019476853f3073228fcd5a6e4173240647f340b80bf845dd0526ee5d0be466352d6faed48df3b18c67f59441cca06b81ed3411af
 EBUILD pixeltool-5.9.5.ebuild 427 BLAKE2B bffe3b0f18b8c401f3a8daeae201c9f43187b515ed2691c938beeb45276bc27b5d24db459f6ae83336775a50733fe41d4166963cda41ec30e9ad451e5728a0d1 SHA512 4efa3fb21649069309421a5fb10f21b474404d02d2a095bd5a978c26d357c62bd45cd8944ddb126a307f849ba5b3490685aa24a88e88b9744b739d35d7491eef
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/pixeltool/pixeltool-5.11.0_beta4.ebuild b/dev-qt/pixeltool/pixeltool-5.11.0_rc.ebuild
index 7bcdc97e3066..7bcdc97e3066 100644
--- a/dev-qt/pixeltool/pixeltool-5.11.0_beta4.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.11.0_rc.ebuild
diff --git a/dev-qt/pixeltool/pixeltool-5.7.1.ebuild b/dev-qt/pixeltool/pixeltool-5.7.1.ebuild
deleted file mode 100644
index 03975563162f..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt screen magnifier"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/pixeltool
-)
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 0ed49a36aa6f..9d416ebcf5ff 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,9 +1,7 @@
-DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645
-DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
+DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
-EBUILD qdbus-5.11.0_beta4.ebuild 472 BLAKE2B 132d4466bda8eaedaf2eb9cf3b25c7e5cba5965444201365888067f53b3377bc57f54139c773f4d9ec7e9704adb187fa45c34ab568f145f8e63abe131d448b8a SHA512 f39c7eecc004e07026934a0b569b9dd0b7e71f57478400d25762f83e52f6b4437f000d3e490e0fc696e9ce773782d4b96563ffc0c88cdc4858ea3a3f4e0ff3c6
-EBUILD qdbus-5.7.1.ebuild 467 BLAKE2B e216eef121f71203f76aa2dd44921d227a75ba16f00303949a42fd5e88200fb6aa1c98d3367fb898d5154dfe740ab57e4d68e0f9e9cf4c153c222608fab70b34 SHA512 539e4cc0ffa8ba1bdead79b03fab0aba1db8b1667b2b3a1472319a63db3fe6337e2e9335d33e18d247ef125dbec770eff3b8c05fc687d16dc436f3d41aecc137
+EBUILD qdbus-5.11.0_rc.ebuild 472 BLAKE2B 132d4466bda8eaedaf2eb9cf3b25c7e5cba5965444201365888067f53b3377bc57f54139c773f4d9ec7e9704adb187fa45c34ab568f145f8e63abe131d448b8a SHA512 f39c7eecc004e07026934a0b569b9dd0b7e71f57478400d25762f83e52f6b4437f000d3e490e0fc696e9ce773782d4b96563ffc0c88cdc4858ea3a3f4e0ff3c6
 EBUILD qdbus-5.9.4.ebuild 468 BLAKE2B 837861ba04ef44dfbcf8ac57956ef460c538a62706f80740ede9555afd3a668776b2da9a49ff45dffe70ef6016961ca987d0407b3f019e6d5c65ffcea8c0ea35 SHA512 371019253aaa5eec2f7b310ccd8378fb3c2516e95cfa9cfd3a39de4e7fc0251cae8b4a29f7801e9421e47bd016729f77fefe603eda385a49b655e1f8d69c9d91
 EBUILD qdbus-5.9.5.ebuild 472 BLAKE2B 132d4466bda8eaedaf2eb9cf3b25c7e5cba5965444201365888067f53b3377bc57f54139c773f4d9ec7e9704adb187fa45c34ab568f145f8e63abe131d448b8a SHA512 f39c7eecc004e07026934a0b569b9dd0b7e71f57478400d25762f83e52f6b4437f000d3e490e0fc696e9ce773782d4b96563ffc0c88cdc4858ea3a3f4e0ff3c6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.11.0_beta4.ebuild b/dev-qt/qdbus/qdbus-5.11.0_rc.ebuild
index 4736c7cd2dee..4736c7cd2dee 100644
--- a/dev-qt/qdbus/qdbus-5.11.0_beta4.ebuild
+++ b/dev-qt/qdbus/qdbus-5.11.0_rc.ebuild
diff --git a/dev-qt/qdbus/qdbus-5.7.1.ebuild b/dev-qt/qdbus/qdbus-5.7.1.ebuild
deleted file mode 100644
index 08547d397793..000000000000
--- a/dev-qt/qdbus/qdbus-5.7.1.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
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Interface to Qt applications communicating over D-Bus"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbus
-)
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index d5c53336eba5..d53b96d3c570 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,11 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645
-DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
+DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
 EBUILD qdbusviewer-4.8.7.ebuild 1174 BLAKE2B dda9669b7d58f473f583f5141f79df3175dd4830622761345809f2bfe6177528ac2b33958618ab9c7562a7df76384631a45e27e4cd1e5178c906c2d7d90a1630 SHA512 6f08b895885d8216d15a6ac7d35e8b4dccb504a7b2d9740ada1a48b2672eba530345e2af4bf7cdd4e27d01991d16c84177506f370bbf989680b62f711af828cc
-EBUILD qdbusviewer-5.11.0_beta4.ebuild 973 BLAKE2B d05999d018332cf922bb8ef1454b27a7c52b404f50ed2b6e1a3d4d4bc0a55d2ce4965a4c07cf22bcdf2e64a4305c0500dbb54e287bc39a0ecb718e32efd6659e SHA512 e2f468485c030cbbac2cd5532088588eb59ef8a89acea68274317d8f55e84f3aaadc0e80694dd45a202605f40880bd266c885a6527dc296400d12ad8f2d81859
-EBUILD qdbusviewer-5.7.1.ebuild 521 BLAKE2B 50b34805a4afc2ac7b5ee5aae2f2a994c7247616e91ef8b8107289e8c4ab94040e840ace1e7ba8625caa5dc78a9eaf444477e8094db455ee42deb920c275f74a SHA512 2ca60a21301ca8f5db6a4a4e87f48edfed84a3de9eef980c73c5a6aaf00410783bbc25a8abe518bf7f1e68568664b174ce2764822f3f1c608da564435668d667
+EBUILD qdbusviewer-5.11.0_rc.ebuild 973 BLAKE2B d05999d018332cf922bb8ef1454b27a7c52b404f50ed2b6e1a3d4d4bc0a55d2ce4965a4c07cf22bcdf2e64a4305c0500dbb54e287bc39a0ecb718e32efd6659e SHA512 e2f468485c030cbbac2cd5532088588eb59ef8a89acea68274317d8f55e84f3aaadc0e80694dd45a202605f40880bd266c885a6527dc296400d12ad8f2d81859
 EBUILD qdbusviewer-5.9.4.ebuild 970 BLAKE2B ef175f6e87bcee9a13ff081c8501ce41317fe0e2a45cc8489593cf79a3298480a1f0e70cf95b507fa56739f364ba53ccfcb5ab215cce8625d4c2a01b7f3c7648 SHA512 5fecd7efe36d0dd9cf956ffe573b2a395d32323c0096996e0afd153af7224094cc74926c3473ead047ccf3a2ab079e0a9c78c82427ddebfe567ae90e1c79040a
 EBUILD qdbusviewer-5.9.5.ebuild 973 BLAKE2B d05999d018332cf922bb8ef1454b27a7c52b404f50ed2b6e1a3d4d4bc0a55d2ce4965a4c07cf22bcdf2e64a4305c0500dbb54e287bc39a0ecb718e32efd6659e SHA512 e2f468485c030cbbac2cd5532088588eb59ef8a89acea68274317d8f55e84f3aaadc0e80694dd45a202605f40880bd266c885a6527dc296400d12ad8f2d81859
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.11.0_beta4.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.11.0_rc.ebuild
index ceb1e6f94f87..ceb1e6f94f87 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.11.0_beta4.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.11.0_rc.ebuild
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.7.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.7.1.ebuild
deleted file mode 100644
index df7e2925c889..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.7.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbusviewer
-)
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 3c9fbe33e013..1edff3284f98 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,9 +1,8 @@
-DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645
-DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
+AUX qdoc-5.11.0-revert-static-clang.patch 10328 BLAKE2B 0860936b2764e8b787f3153fb129ec4339538c9a0386dce94d1002dddcfd4404a87b74eb25f8d4321019b504198a24f150df82c890c05b34e40aedc111728ee3 SHA512 843f771f5e67a71426341fe1e85b5a0505d16a776aeec879ce4fe4dad9b4284aeb3b9a47e783b831a9f6548e10f637a2c02f826158e27bd042b961b6cb2b1a36
+DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
-EBUILD qdoc-5.11.0_beta4.ebuild 753 BLAKE2B a25c8f934982505e93a78e05b8772eb1476e31f4f3e3b315698aa518da2ed8dbec86867491bc5694ec1d6dd16e62869bd7d0b8abd59d39e7b8f9208053b14b4a SHA512 91546d1b9c02e16338186c56875222ac7fee28f99479f320d7cd1734908b96b9af036ea3c8dfe4a0f5d713a0731514bdeafe08e5542ca59ecc97cd51ba2036e1
-EBUILD qdoc-5.7.1.ebuild 404 BLAKE2B ac7a1447f06626bcb05eaea2b704e100bf8b3a72745e93e3f704cbe6af1e3149169386a80b715510a17fdc3de2640e0bd9b1331920f394b2c50f09a3c520e860 SHA512 64244aff93afc21ff69ce94032b6e722cb68e21842939acaf0971353889af1fa5a8d4854ed2f3cd3c93af5c054e8dcf56a73692be314668c70da1884d36949ed
+EBUILD qdoc-5.11.0_rc.ebuild 819 BLAKE2B 2f7e298536a0fe6bab61e115de0f59d3c4968492d8da3247619d19966a56e5e048dc0539a17ee01fd7f5615bdfca6972372984ac20dc1b34b8611ed3ae9f23aa SHA512 128ee5814b82ffdd7e86017dfef3509fbce3c8b049dd7faf53dce0d17949e01ab139c9aec92f7eba4cd2a6fc5104e0ca4fe06219b7d44f4cd0a1d7c8d47e568b
 EBUILD qdoc-5.9.4.ebuild 534 BLAKE2B 3817288c91c7c034346c8b9d093d243cbb37229c411117d20efad801fd483730f51de736fffd3f697a081b8be2a083b5e9ee50a1e73d646100aa409306389eb8 SHA512 ab20a092b666c13b4e248c6abe9e2fff6a79d740ee3ea996cd3aecd72b23857e950b9555fb0293908c49b4719f923876b5035247e28210bbd82cf19a99e3c57d
 EBUILD qdoc-5.9.5.ebuild 538 BLAKE2B 717a554d3d094d660b350fd7cad133ab97a695b11c7199e2ec2d1a0a7c0c7188b463b26e3fa3336de270dc103a1341e126056d0917b138f00b9195e4f4e76287 SHA512 d1872b17a326d91cae9e5edb425a0d5ed75ef3802f73f7b30ef5117636d11915686075f54ffd95f2b150cb6a6f2521a6e510a6dab27c8ef12d8c69eb34cf46ad
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch b/dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch
new file mode 100644
index 000000000000..e5496019b8e5
--- /dev/null
+++ b/dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch
@@ -0,0 +1,239 @@
+Reverting upstream regression.
+
+
+From fddf7ee536e4fd0061d0ee933707881cebe54223 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@qt.io>
+Date: Wed, 18 Apr 2018 13:35:10 +0200
+Subject: Link qdoc to static libclang
+
+Done-with: Mikhail Svetkin <mikhail.svetkin@qt.io>
+Change-Id: Ifbd4e1b27f658f7d4f287a8a51f0cda54814e754
+Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
+---
+ mkspecs/features/qt_find_clang.prf | 197 ------------------------------------+
+ src/qdoc/qdoc.pro                  |   8 --
+ 2 files changed, 3 insertions(+), 202 deletions(-)
+
+--- a/mkspecs/features/qt_find_clang.prf	2018-05-03 13:02:49.000000000 +0200
++++ b/mkspecs/features/qt_find_clang.prf	2018-05-10 12:54:26.778546039 +0200
+@@ -90,200 +90,9 @@
+ 
+     !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR): CLANG_LIBS = -L$${CLANG_LIBDIR}
+     equals(QMAKE_HOST.os, Windows): \
+-        CLANG_LIBS += -llibclang_static -ladvapi32 -lshell32 -lMincore
+-    else: {
+-        !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--start-group
+-        CLANG_LIBS += -lclangAnalysis \
+-                      -lclangApplyReplacements \
+-                      -lclangARCMigrate \
+-                      -lclangAST \
+-                      -lclangASTMatchers \
+-                      -lclangBasic \
+-                      -lclangChangeNamespace \
+-                      -lclangCodeGen \
+-                      -lclangCrossTU \
+-                      -lclangDaemon \
+-                      -lclangDriver \
+-                      -lclangDynamicASTMatchers \
+-                      -lclangEdit \
+-                      -lclangFormat \
+-                      -lclangFrontend \
+-                      -lclangFrontendTool \
+-                      -lclangHandleCXX \
+-                      -lclangIncludeFixer \
+-                      -lclangIncludeFixerPlugin \
+-                      -lclangIndex \
+-                      -lclangLex \
+-                      -lclangMove \
+-                      -lclangParse \
+-                      -lclangQuery \
+-                      -lclangReorderFields \
+-                      -lclangRewrite \
+-                      -lclangRewriteFrontend \
+-                      -lclangSema \
+-                      -lclangSerialization \
+-                      -lclang_static \
+-                      -lclangStaticAnalyzerCheckers \
+-                      -lclangStaticAnalyzerCore \
+-                      -lclangStaticAnalyzerFrontend \
+-                      -lclangTidy \
+-                      -lclangTidyAndroidModule \
+-                      -lclangTidyBoostModule \
+-                      -lclangTidyBugproneModule \
+-                      -lclangTidyCERTModule \
+-                      -lclangTidyCppCoreGuidelinesModule \
+-                      -lclangTidyFuchsiaModule \
+-                      -lclangTidyGoogleModule \
+-                      -lclangTidyHICPPModule \
+-                      -lclangTidyLLVMModule \
+-                      -lclangTidyMiscModule \
+-                      -lclangTidyModernizeModule \
+-                      -lclangTidyMPIModule \
+-                      -lclangTidyObjCModule \
+-                      -lclangTidyPerformanceModule \
+-                      -lclangTidyPlugin \
+-                      -lclangTidyReadabilityModule \
+-                      -lclangTidyUtils \
+-                      -lclangTooling \
+-                      -lclangToolingASTDiff \
+-                      -lclangToolingCore \
+-                      -lclangToolingRefactor \
+-                      -lfindAllSymbols \
+-                      -lLLVMAArch64AsmParser \
+-                      -lLLVMAArch64AsmPrinter \
+-                      -lLLVMAArch64CodeGen \
+-                      -lLLVMAArch64Desc \
+-                      -lLLVMAArch64Disassembler \
+-                      -lLLVMAArch64Info \
+-                      -lLLVMAArch64Utils \
+-                      -lLLVMAMDGPUAsmParser \
+-                      -lLLVMAMDGPUAsmPrinter \
+-                      -lLLVMAMDGPUCodeGen \
+-                      -lLLVMAMDGPUDesc \
+-                      -lLLVMAMDGPUDisassembler \
+-                      -lLLVMAMDGPUInfo \
+-                      -lLLVMAMDGPUUtils \
+-                      -lLLVMAnalysis \
+-                      -lLLVMARMAsmParser \
+-                      -lLLVMARMAsmPrinter \
+-                      -lLLVMARMCodeGen \
+-                      -lLLVMARMDesc \
+-                      -lLLVMARMDisassembler \
+-                      -lLLVMARMInfo \
+-                      -lLLVMARMUtils \
+-                      -lLLVMAsmParser \
+-                      -lLLVMAsmPrinter \
+-                      -lLLVMBinaryFormat \
+-                      -lLLVMBitReader \
+-                      -lLLVMBitWriter \
+-                      -lLLVMBPFAsmParser \
+-                      -lLLVMBPFAsmPrinter \
+-                      -lLLVMBPFCodeGen \
+-                      -lLLVMBPFDesc \
+-                      -lLLVMBPFDisassembler \
+-                      -lLLVMBPFInfo \
+-                      -lLLVMCodeGen \
+-                      -lLLVMCore \
+-                      -lLLVMCoroutines \
+-                      -lLLVMCoverage \
+-                      -lLLVMDebugInfoCodeView \
+-                      -lLLVMDebugInfoDWARF \
+-                      -lLLVMDebugInfoMSF \
+-                      -lLLVMDebugInfoPDB \
+-                      -lLLVMDemangle \
+-                      -lLLVMDlltoolDriver \
+-                      -lLLVMExecutionEngine \
+-                      -lLLVMFuzzMutate \
+-                      -lLLVMGlobalISel \
+-                      -lLLVMHexagonAsmParser \
+-                      -lLLVMHexagonCodeGen \
+-                      -lLLVMHexagonDesc \
+-                      -lLLVMHexagonDisassembler \
+-                      -lLLVMHexagonInfo \
+-                      -lLLVMInstCombine \
+-                      -lLLVMInstrumentation \
+-                      -lLLVMInterpreter \
+-                      -lLLVMipo \
+-                      -lLLVMIRReader \
+-                      -lLLVMLanaiAsmParser \
+-                      -lLLVMLanaiAsmPrinter \
+-                      -lLLVMLanaiCodeGen \
+-                      -lLLVMLanaiDesc \
+-                      -lLLVMLanaiDisassembler \
+-                      -lLLVMLanaiInfo \
+-                      -lLLVMLibDriver \
+-                      -lLLVMLineEditor \
+-                      -lLLVMLinker \
+-                      -lLLVMLTO \
+-                      -lLLVMMC \
+-                      -lLLVMMCDisassembler \
+-                      -lLLVMMCJIT \
+-                      -lLLVMMCParser \
+-                      -lLLVMMipsAsmParser \
+-                      -lLLVMMipsAsmPrinter \
+-                      -lLLVMMipsCodeGen \
+-                      -lLLVMMipsDesc \
+-                      -lLLVMMipsDisassembler \
+-                      -lLLVMMipsInfo \
+-                      -lLLVMMIRParser \
+-                      -lLLVMMSP430AsmPrinter \
+-                      -lLLVMMSP430CodeGen \
+-                      -lLLVMMSP430Desc \
+-                      -lLLVMMSP430Info \
+-                      -lLLVMNVPTXAsmPrinter \
+-                      -lLLVMNVPTXCodeGen \
+-                      -lLLVMNVPTXDesc \
+-                      -lLLVMNVPTXInfo \
+-                      -lLLVMObjCARCOpts \
+-                      -lLLVMObject \
+-                      -lLLVMObjectYAML \
+-                      -lLLVMOption \
+-                      -lLLVMOrcJIT \
+-                      -lLLVMPasses \
+-                      -lLLVMPowerPCAsmParser \
+-                      -lLLVMPowerPCAsmPrinter \
+-                      -lLLVMPowerPCCodeGen \
+-                      -lLLVMPowerPCDesc \
+-                      -lLLVMPowerPCDisassembler \
+-                      -lLLVMPowerPCInfo \
+-                      -lLLVMProfileData \
+-                      -lLLVMRuntimeDyld \
+-                      -lLLVMScalarOpts \
+-                      -lLLVMSelectionDAG \
+-                      -lLLVMSparcAsmParser \
+-                      -lLLVMSparcAsmPrinter \
+-                      -lLLVMSparcCodeGen \
+-                      -lLLVMSparcDesc \
+-                      -lLLVMSparcDisassembler \
+-                      -lLLVMSparcInfo \
+-                      -lLLVMSupport \
+-                      -lLLVMSymbolize \
+-                      -lLLVMSystemZAsmParser \
+-                      -lLLVMSystemZAsmPrinter \
+-                      -lLLVMSystemZCodeGen \
+-                      -lLLVMSystemZDesc \
+-                      -lLLVMSystemZDisassembler \
+-                      -lLLVMSystemZInfo \
+-                      -lLLVMTableGen \
+-                      -lLLVMTarget \
+-                      -lLLVMTransformUtils \
+-                      -lLLVMVectorize \
+-                      -lLLVMWindowsManifest \
+-                      -lLLVMX86AsmParser \
+-                      -lLLVMX86AsmPrinter \
+-                      -lLLVMX86CodeGen \
+-                      -lLLVMX86Desc \
+-                      -lLLVMX86Disassembler \
+-                      -lLLVMX86Info \
+-                      -lLLVMX86Utils \
+-                      -lLLVMXCoreAsmPrinter \
+-                      -lLLVMXCoreCodeGen \
+-                      -lLLVMXCoreDesc \
+-                      -lLLVMXCoreDisassembler \
+-                      -lLLVMXCoreInfo \
+-                      -lLLVMXRay
+-        !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--end-group
+-    }
++        CLANG_LIBS += -llibclang -ladvapi32 -lshell32
++    else: \
++        CLANG_LIBS += -lclang
+ 
+     !versionIsAtLeast($$CLANG_VERSION, "3.9.0") {
+         log("LLVM/Clang version >= 3.9.0 required, version provided: $${CLANG_VERSION}.$$escape_expand(\\n)")
+--- a/src/qdoc/qdoc.pro	2018-05-10 12:51:22.832458913 +0200
++++ b/src/qdoc/qdoc.pro	2018-05-10 12:54:27.746557021 +0200
+@@ -15,14 +15,6 @@
+ LIBS += $$CLANG_LIBS
+ !contains(QMAKE_DEFAULT_INCDIRS, $$CLANG_INCLUDEPATH): INCLUDEPATH += $$CLANG_INCLUDEPATH
+ 
+-# Support static libclang linking on different platforms
+-equals(QMAKE_HOST.os, Windows): {
+-    DEFINES += CINDEX_LINKAGE=
+-} else {
+-    LIBS += -lz -ldl
+-    equals(QMAKE_HOST.os, Darwin): LIBS += -lcurses -lm -lxml2
+-}
+-
+ !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR):!disable_external_rpath: QMAKE_RPATHDIR += $$CLANG_LIBDIR
+ DEFINES += $$shell_quote(CLANG_RESOURCE_DIR=\"$${CLANG_LIBDIR}/clang/$${CLANG_VERSION}/include\")
+ 
diff --git a/dev-qt/qdoc/qdoc-5.11.0_beta4.ebuild b/dev-qt/qdoc/qdoc-5.11.0_beta4.ebuild
deleted file mode 100644
index 4c656e1bf9f6..000000000000
--- a/dev-qt/qdoc/qdoc-5.11.0_beta4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	sys-devel/clang:=
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdoc
-)
-
-src_prepare() {
-	qt_use_disable_mod qml qmldevtools-private \
-		src/qdoc/qdoc.pro
-
-	export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
-	# this is normally loaded in qttools.pro, so skipped by using
-	# QT_TARGET_SUBDIRS causing build to fail
-	sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild b/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild
new file mode 100644
index 000000000000..2d1c8473347a
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt documentation generator"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	sys-devel/clang:=
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdoc
+)
+
+PATCHES=( "${FILESDIR}/${PN}-5.11.0-revert-static-clang.patch" )
+
+src_prepare() {
+	qt_use_disable_mod qml qmldevtools-private \
+		src/qdoc/qdoc.pro
+
+	export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
+	# this is normally loaded in qttools.pro, so skipped by using
+	# QT_TARGET_SUBDIRS causing build to fail
+	sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qdoc/qdoc-5.7.1.ebuild b/dev-qt/qdoc/qdoc-5.7.1.ebuild
deleted file mode 100644
index 4bcb43a00753..000000000000
--- a/dev-qt/qdoc/qdoc-5.7.1.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
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdoc
-)
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index dc3346946972..cd29f9612e4f 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -1,4 +1,3 @@
-DIST 5.7.1-0qt-everywhere-documentation-5.7.1.7z 173336041 BLAKE2B 3153398ee4cc9addb2bfec3f2da617d42762d073372d23c17b4c100fc7683f91ff122987ab0d76a18f78e3eaa5e891bc5057e5c747b52a470f2acd1ed6e897f6 SHA512 4fcbfcd29aa48937229d01d47569a5fcd81459b9444058c725bdbac14dd2b9c67c9e04944c74d351f4bca7d972e23c3832ba2dd8e979cc4e9fe677e2d51561e0
 DIST 5.9.4-0-201801220610qt-everywhere-documentation.7z 213285230 BLAKE2B 9ff6df25cef33164afb515f34238bb689b85582fdca106f4d6341a5cfd179d557b9497f8092018151e67bb28d420b12bbcc9d9c395e0fcfc3132b2db6f193f09 SHA512 b843c78200dfc9c5f0ebd656267ca2d0d0efcdb589be0735137b5ba0a15ad90c9dc7daedcfa6c595ec1fcd7fc60523c5d8d504c34d642ffa1219cbeba8d0f27a
 DIST 5.9.4-0-201801220610qtcharts-documentation.7z 9070277 BLAKE2B bab608541ef8b236257bd640bfa4cdd6d3b75b867de55570ced3c1be87938a66ed4711b1c1ef8349eb6e361a1d26c93deed7e49addf56335ea9eadf614b044dc SHA512 3d2825fe9356a34abaf42aea3efa4e27d83c6acf12fb100f3c5aa4cd3faf25fbc1f2e2b3481fe95845a5c0c2b88924c8de19af9e9d5689c702f56252c2620df1
 DIST 5.9.4-0-201801220610qtdatavisualization-documentation.7z 6615754 BLAKE2B 757ed0c5c50e82bf3c8c5927306001c1226385bdd0fa343a342fe83acaf61c10255fd14684a3fe15f5a4c325c8503f74f5e6e13a17d4d7597435ae3b30671293 SHA512 75515a40880f890c5a4c725bb96a093d8af3ad03d52bd22a5f7fb0cd068e8f589eedd8c4560d5eaa8f968d599a223a438a4b447b5ed79083989d995e7c265365
@@ -8,6 +7,5 @@ DIST 5.9.4-0-201801220610qtscripttools-documentation.7z 76290 BLAKE2B 998230165d
 DIST 5.9.4-0-201801220610qtspeech-documentation.7z 148926 BLAKE2B a1727de25d2e2ad13c2c0cc1d075d9ee28f913a5c788e55b5c25d4b976a4f9f775e4b2b2e96d71d2a51f124c4a6ee1b24762292a9f134a25fb8ae87128c80098 SHA512 437d2ce4172d823be6fbfca644ee9085c34a9e3a0abcd2783edda492647fe98e62d40abf81d519a15b7250491801bab48888de7d406c262e5444a4530df4e73d
 DIST 5.9.4-0-201801220610qtvirtualkeyboard-documentation.7z 449521 BLAKE2B 33cd1477544a0bfe8753b7027eb97eda72687b3624267953592a6e45c5f5d7cc7601b65ca3394e418d589af8a9386cfa78afc95b177bf6f30fa2d7c5eabab30e SHA512 927f7161cbd9d400bb2077ad1342962350e0b96c09ff83cec2eb00d961372de305e1a84840993cebc7c4243379f201dcda864773654060ff021f44e20723c71e
 DIST 5.9.4-0-201801220610qtwebengine-documentation.7z 3378943 BLAKE2B f3b37fc3105a02cf8a09191b21898e4cf64d1201069832af3e24e25ef7873b6a722ec3a202183c0f7e234a53e14f3db18b9a15bcd74d5b3c68f0ab8699bf0702 SHA512 b4232c9312bfd659135a4f7895cf7b6695afd4eb71457e2bcab0fa08a281e9bf2cc44b7a775452af91ba64cc2089181fc38acd9b22f92290ce1aeb2df16e02f6
-EBUILD qt-docs-5.7.1_p0.ebuild 900 BLAKE2B 9d30b855b116c99c3c01739ffcdc7bbb7eb09c4333c49ae59ffb986b3ed40ce2190c0fef5b8d7e9410a90aff88b30c7730645f727aa7406576a5d08633af8c74 SHA512 960e35f696593acdb0a2db5ee840b3cb276abf25d92a2ca66d17a161529170ccf2240d82ec102c6a43a0a8ae424d3c49f385aa4ce762e5989a6d31494366a90a
 EBUILD qt-docs-5.9.4_p201801220610.ebuild 1634 BLAKE2B 3e1aca6d063fdf9859bb9e175049472c9afeea6a8e36c201428d7d6c8a84183074d2f1fe917f4dd85dd9b80d1e988d94cb1afb16c3fd577520decc7a1203d77e SHA512 95a705d2c003e01b213f912e0dd862ca10c79d6ac06e6ab3c7fea6f37c01215ef6afe4151597f1825edd111be8544dc6363943ce6043e60f70144aa024ea04a8
 MISC metadata.xml 978 BLAKE2B d2732b8f9b6160a7bbc7fdac5ed9db5d76bac4965df284e2ccd11aa49c4c2936386a258ce3ce7219898064069b76fe244362e6a3e4b8cdd6da775486b861539f SHA512 ed280d83f2ceda62d36dc7a95b4ad4bc356929692dd0084627aba8af47518e736d76d1bdd8402e8e2772fea4d69ad6476f0f34d9502f8bf181efc75d6e380fb6
diff --git a/dev-qt/qt-docs/qt-docs-5.7.1_p0.ebuild b/dev-qt/qt-docs/qt-docs-5.7.1_p0.ebuild
deleted file mode 100644
index 20bbf21fb6ab..000000000000
--- a/dev-qt/qt-docs/qt-docs-5.7.1_p0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_PV=$(get_version_component_range 1)$(get_version_component_range 2)
-MY_P=${PV/_p/-}qt-everywhere-documentation-${PV%%_p*}
-
-DESCRIPTION="Documentation for Qt5, for use with Qt Creator and other tools"
-HOMEPAGE="https://www.qt.io/"
-SRC_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${MY_PV}_src_doc_examples/qt.${MY_PV}.doc/${MY_P}.7z"
-
-LICENSE="FDL-1.3"
-SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-DEPEND="app-arch/p7zip"
-
-S=${WORKDIR}/Docs/Qt-$(get_version_component_range 1-2)
-
-src_prepare() {
-	default
-
-	# bug 597026
-	rm -r global || die
-
-	# bug 602750
-	rm Makefile || die
-}
-
-src_install() {
-	# ${PV} instead of ${PF} is intentional
-	local dest=/usr/share/doc/qt-${PV%%_p*}
-	insinto "${dest}"
-	doins -r *
-	docompress -x "${dest}"
-}
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 38d1b9f0e6cb..2504cf973b8e 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,9 +1,7 @@
-DIST qt3d-everywhere-src-5.11.0-beta4.tar.xz 84758760 BLAKE2B d7570f8fd982361a4985a9d0a1a2c93c2d079bd90a57f729e7bf4cd0387a018933b0cf2a10a37cc642ba0ef2442358c1eddb8308dab616555a4319240e5b0018 SHA512 2775823605907a163d850e2297b03994c016408987bb5f485fc446a3384bf24a2174c1696de0b020bb7a14ff86f61d0c7b4e41cbabf2233a6fab952569daf57e
-DIST qt3d-opensource-src-5.7.1.tar.xz 19474848 BLAKE2B 9d922fe496bb2a44d146d989be1b7f7eaa453ac1e130dca3dbde94426f2bf275d90e4b1e71ffb3d747c90b7fe001c7d90bd8c8be71bb394657691107773f6be8 SHA512 fe124b939709185d9ac755d017f850a3f3d97f7f58c863a3da3df5dcac25391ca79e97830142fb263618e7afcb4bf43f363511539d508ec2a45a8a99f0e1a8a7
+DIST qt3d-everywhere-src-5.11.0-rc.tar.xz 84771024 BLAKE2B 118b5e0f384623fb16ef2e035477653e16131f63e11bdbf5b9b0d4d73feedb5ea0ec2f4495a391f7130aa116144de02c30629ad96ea59bdf67c77d4c4fd01d93 SHA512 827371bd40d6c46b5be907ac6f99edf432bbf563eca3d051ec0fecd9b36e6acfa0f512e86639a3bd874c021834deb7ed07379ac71bb25c8985e8f61d505a6b15
 DIST qt3d-opensource-src-5.9.4.tar.xz 28007244 BLAKE2B ea38270a01460045e7cb57ee5c750149553fc3eab5ca7773ea68104f97a12c81a8125c9375edf5f8c35e2b13ef0a56da01c0370a6acc2ff9f0a03d0cd40d20be SHA512 1887d9e4e2669b15e42ebc2db9c040e1f344f14a4cb2691821be2773c70d63bf6ec152a3dd0572748f77a09aed8067e6bff022fcd5dfc4bd5108af75e626d829
 DIST qt3d-opensource-src-5.9.5.tar.xz 83725448 BLAKE2B 04e244877156dc273a8467cec7ddbc05ae5b28226b6f9388d22e3f8f91bdc233259fc99953b5cf4a51794e4091bb5609fa5a22d122b74af259037e62d6ff0a33 SHA512 dd123cf60c3d7e2d71ab6de97b296ac9f899d4358c6b3babdd6dd788a7f0a1b1d77643418cee44fa133e33718869391b7b4db1658522f8b31ee1cff94fbe9318
-EBUILD qt3d-5.11.0_beta4.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
-EBUILD qt3d-5.7.1-r1.ebuild 598 BLAKE2B 96fd958dffe64740980f5b4f91baa5656ef9a220c1dcea35ddce489b0a46962369c4e8ec13992f1407e3c236ba218b3bf47b74d02827b0d2f16702c9cdca9e4a SHA512 cc06b602224b4f7bc375de93765419ee2a211ce8713e35d81e50482f3ee0a5702b357d6a20872a852de8f1dba753da1e5e4955ac7975b727854d806082ab8040
+EBUILD qt3d-5.11.0_rc.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
 EBUILD qt3d-5.9.4.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
 EBUILD qt3d-5.9.5.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
 MISC metadata.xml 622 BLAKE2B 0b8c25838c12efaeba3d6db640fe658b6c1bc12f4a6bacc06c88e405c16498eb0f7db196efb1b09b46476c0c9c4cfccc64666dd43f31366dd28b7ecaa8018757 SHA512 3edf4c4db2c08652dbc1b62aa216f62b887190e2e0bbfd0cde7410911ddf1e0ea8cc9a27e91db07a78dd6078fd4b1ad23b27f0dba37607771d3b6c2497552607
diff --git a/dev-qt/qt3d/qt3d-5.11.0_beta4.ebuild b/dev-qt/qt3d/qt3d-5.11.0_rc.ebuild
index e65630904901..e65630904901 100644
--- a/dev-qt/qt3d/qt3d-5.11.0_beta4.ebuild
+++ b/dev-qt/qt3d/qt3d-5.11.0_rc.ebuild
diff --git a/dev-qt/qt3d/qt3d-5.7.1-r1.ebuild b/dev-qt/qt3d/qt3d-5.7.1-r1.ebuild
deleted file mode 100644
index 17152f1a0586..000000000000
--- a/dev-qt/qt3d/qt3d-5.7.1-r1.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
-inherit qt5-build
-
-DESCRIPTION="The 3D module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# TODO: egl, tools
-IUSE="gles2 qml"
-
-DEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	sys-libs/zlib
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt5-build_src_prepare
-
-	if ! use qml; then
-		sed -i -e "/quick3d/s/^/#/" src/src.pro || die
-	fi
-}
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index cf2d19c27bfb..bf511181c2e3 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,9 +1,7 @@
-DIST qtconnectivity-everywhere-src-5.11.0-beta4.tar.xz 2721324 BLAKE2B a885ffddb8faabd591ecfde28f09e6e05899412fefbd42f497cfe626c3b087bd97ce80f9683d004f630e321f8e9952d5f79d6f376b2ae60bb319c3a9beb7400f SHA512 8174afc7e314f40f4c1f108cad5edf8db85eb53353b132ac274dff8dea2c6bc94dff913d800c43ea7419f29fa7c3d4e56101812d201722dce7ab277ab9003d20
-DIST qtconnectivity-opensource-src-5.7.1.tar.xz 2690688 BLAKE2B 4e9d0c11408224f03e6d0a4ce0b54b1c28cbe760459d7be3eb00477ee3f87b3108a8f4d3d84777944913c17ff6529c1c79eb80c84a37e045e9c6942f9c43c2b2 SHA512 3550be2ce365c7eea2adb41b6db63d0867ff1eaae15d6f4d22345bfdd8e4ac9c2f3983e5d3e897d5c4d7d32e466929c2cfdfac0921c0927c3955f021d37d9e61
+DIST qtconnectivity-everywhere-src-5.11.0-rc.tar.xz 2722416 BLAKE2B 94cb63dc67af0795361c91941887f9a8581ef1c2680de92d82fe6a0abf622d89d31c4c9977beca2b9a7ed3ac788ef67f558a10fcf91566d8f3ce13756e72f6dc SHA512 789bcf92d8dfd65f435c96775b138323ff97bc6bfc172fbb3ee8816ab988911c7be14d887af411bed2795bf7baa3b5d96a993d1233d8c53b3bb192ab5147034f
 DIST qtconnectivity-opensource-src-5.9.4.tar.xz 2724048 BLAKE2B c401cd0d3a5b064667f7114b2e95a6bedfcc3b686c37a9962527b4c8a5e73f194a2f07b45408756c38550e4c09f79321f698f017556a33ac2cc7af40dfafea9a SHA512 d4cb67279555872f8f0ba0a9d746774f393711727aec058ab9ee59c783a645d53fc76a8ddcd857b0beed1dfdbc16ee7b4a214b3e95e1d5ba23e66e942d041a2c
 DIST qtconnectivity-opensource-src-5.9.5.tar.xz 2712036 BLAKE2B 2f0eae70d857f0804660da5fc1e134d8bc1d27dd6a2e725d182b8e856ecd47a0b51a928ef1e1a371da48f9bcb831bec9858d5df837eae38c256f29e52fc7accf SHA512 def2dd384c50667eff73aea5a905dd004c39b975826713f6ef2b28bb041e8c1a85252220c7d8f491e0c2eb967ca055af29b9cf902d4dd187ffb6e7380c9d21f0
-EBUILD qtbluetooth-5.11.0_beta4.ebuild 641 BLAKE2B 922e93e07d44ed1f07466bf8f52af6908c2732894630e3920b8046727b03dfdfebe7841c03e66a5f60aaa69502595691748241d76469ece63250ac3fdc6bca16 SHA512 ea8e27764a21856845dbc2b805136b4f1b9386c60b1859d6782f7dd986591eba6af492887b4f56438599e8fda57c38dd64a04019a42c612aa94d463d0e7cffac
-EBUILD qtbluetooth-5.7.1.ebuild 636 BLAKE2B 8c6c8393c94cc634febcb426340b342a558c51a4aa0d57a14f95619ab4099316bf2b0811a0a83d91352e13a881fa403f98a65cc5fcbe27f8692db4cb4206b7e4 SHA512 ec143dc4467c7d38946d360622bfbb94c23e22ec35d990985c45fdff6c06c1cf509784833bd126b71da73bc0eb095e9a3dcceca9a8a1dca81e1f61aa27e17d37
+EBUILD qtbluetooth-5.11.0_rc.ebuild 641 BLAKE2B 922e93e07d44ed1f07466bf8f52af6908c2732894630e3920b8046727b03dfdfebe7841c03e66a5f60aaa69502595691748241d76469ece63250ac3fdc6bca16 SHA512 ea8e27764a21856845dbc2b805136b4f1b9386c60b1859d6782f7dd986591eba6af492887b4f56438599e8fda57c38dd64a04019a42c612aa94d463d0e7cffac
 EBUILD qtbluetooth-5.9.4.ebuild 639 BLAKE2B cc1e3489fce5a48b5965d387e34597ff602a15ec1834bc4e4f528700e91b3f171c23cce9134938a83205a938df91442e068b8f4ecea148d85e18fc4f9d39a4ef SHA512 8e4a38ede0f82c8ca87421bb297d2cf0023d863c3da155f11f4c7d8b5fe7e587160e8b93d5ac40db21ebc098c52108b81b212aa2756ee16f4160eda185177857
 EBUILD qtbluetooth-5.9.5.ebuild 641 BLAKE2B 922e93e07d44ed1f07466bf8f52af6908c2732894630e3920b8046727b03dfdfebe7841c03e66a5f60aaa69502595691748241d76469ece63250ac3fdc6bca16 SHA512 ea8e27764a21856845dbc2b805136b4f1b9386c60b1859d6782f7dd986591eba6af492887b4f56438599e8fda57c38dd64a04019a42c612aa94d463d0e7cffac
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.11.0_beta4.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.11.0_rc.ebuild
index 7f4a8b1b3eb7..7f4a8b1b3eb7 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.11.0_beta4.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.11.0_rc.ebuild
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.7.1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.7.1.ebuild
deleted file mode 100644
index 74513ea573c0..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtconnectivity"
-inherit qt5-build
-
-DESCRIPTION="Bluetooth support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	>=net-wireless/bluez-5
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}
-	~dev-qt/qtnetwork-${PV}
-"
-
-src_prepare() {
-	sed -i -e 's/nfc//' src/src.pro || die
-
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 0a88e8774224..5274fa06bf79 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,9 +1,7 @@
-DIST qtcharts-everywhere-src-5.11.0-beta4.tar.xz 4241012 BLAKE2B 4d0c5f1ba862751b281ae78c7c642296be0bb3a52942edf6aebabfdaa0035f96d25d2a2b2695934284bc3991107fcf4664b975b536e03cc7c144e97556022dd6 SHA512 53c3a53b48859d75aa81c3f39b3f99ef9d0c5388728eb34a0f2d78175985ceac556ecd9a2831e5554d94724b50d34a3440a00e668ba4c2a8e90bcae637a7347d
-DIST qtcharts-opensource-src-5.7.1.tar.xz 4086256 BLAKE2B 21b8e072b11955ec6fcb05355c3cc5903d916e8476a13529b2b71fae23aaa5f339fa56afe305ed39510d088d3db54cb142b069334257b7ee5c3e0dd454fa58b1 SHA512 2db2c5a956e84b4e080df71f6ba8bdf48ad3a456d334f59d50525a10cb7358129d7cf7855a11342192d03c10ab1cb84d94faaf94ce02f6786d32fe655bc8558c
+DIST qtcharts-everywhere-src-5.11.0-rc.tar.xz 4240708 BLAKE2B d35ee0b900619438c04d50bae61e09a7f4e97fcc0ace1c907cba01412908e533b41e8860daeeda47c6c378c0e8d7405cf88f57658e9eb2e8da7adb3c709a6496 SHA512 12bcc077f12a642360fba8cf7d3e7748e8abafd77a664d13a27fb5fdaf0408d93208737114361a0c78d712dc056e2bcad92d65c2f5be8643fb06ba9750bbb3cc
 DIST qtcharts-opensource-src-5.9.4.tar.xz 4158264 BLAKE2B 6e6ecfe3e8b7fc87f1211ef2a03fc7310cc2f4cc6b9711c9da69d8ad83e062137a371c74f6ca882143a5adf516e4caf4dfdab31a40c036fb79add2b80022156e SHA512 4d93d2f3a3c51967e0377a1fd1397109b0cc621644ca90ed587d45950b9a49971738132223a55b45d6ed45685d5bb8e77e159505bd96148ac495047178a4f35b
 DIST qtcharts-opensource-src-5.9.5.tar.xz 4155904 BLAKE2B 991b535139d7cd7b4b9d8e6f954af2a99dfc504d4d040a9e44e43a85d6d5b175b27b42ebda3b5eabd56e476266d93f9488823a1ea564b4ff0e11a79593b2fbed SHA512 bbb2f8056d42293d71d82799a18d2a0d9444ef52572972603332899e94f0c1730a5a4bd227e97879591b03c4eb0872184fecbc0e925287856247172d812febab
-EBUILD qtcharts-5.11.0_beta4.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
-EBUILD qtcharts-5.7.1.ebuild 521 BLAKE2B f2eb1cacabd96e3995125de8cfc7da8d451b1b41021b97f88021183e47795102b91d2b392106bc1eeb94bb6523efd39aaa530ba9d4b1c2a64317193eb7cbf91a SHA512 5dbc46795ec80a1dfd98d3aeae5e54e37582a1e26fcfb7d3b48531e1652fbfcc25872677a61683458c733e4dbb376f4262a3a186f460e5e453b93afdd0f39c10
+EBUILD qtcharts-5.11.0_rc.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
 EBUILD qtcharts-5.9.4.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
 EBUILD qtcharts-5.9.5.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtcharts/qtcharts-5.11.0_beta4.ebuild b/dev-qt/qtcharts/qtcharts-5.11.0_rc.ebuild
index ff3df69c0911..ff3df69c0911 100644
--- a/dev-qt/qtcharts/qtcharts-5.11.0_beta4.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.11.0_rc.ebuild
diff --git a/dev-qt/qtcharts/qtcharts-5.7.1.ebuild b/dev-qt/qtcharts/qtcharts-5.7.1.ebuild
deleted file mode 100644
index 02c51ca2242e..000000000000
--- a/dev-qt/qtcharts/qtcharts-5.7.1.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
-inherit qt5-build
-
-DESCRIPTION="Chart component library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 361b4f7f9f46..f4f144f14c8a 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,9 +1,7 @@
-DIST qtbase-everywhere-src-5.11.0-beta4.tar.xz 46815720 BLAKE2B bf21828ed94d02140ebc5b9f366b935f944c40b8fe15094161a9c3d0adc16b2e8bfa7f4d514030569f5f463f39dd8083b6cacb536e71b1e81f743749c8742682 SHA512 c70b575729bdbd580d32350a233dfa1db3f450a3e0f4f41a5c8d153df396edc3f795099e4bf3447d3a0751f9acbc1978b4e499c6dbb6d9357c0288288b83d5ca
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
+DIST qtbase-everywhere-src-5.11.0-rc.tar.xz 46807012 BLAKE2B 76bcc9c71470f09ddb119e0098b58e5f505eb985e39a131100e4b7ddfaa8f5785e534296052631ae1407398e548a8fbf4ce23e05d6d1b5242d35c9ba7d1d08cc SHA512 3cd738f7f3179703275a8604709af70fba4148132ef6f2f8d13f8ea7c767c5f9ae3a11fd96cce49f090ecdf85fa04df0a8551d31d9d05c9efca50ab21ebcfd36
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
-EBUILD qtconcurrent-5.11.0_beta4.ebuild 451 BLAKE2B ac3e1c49359c08572a277b8d73f07169cc8c69e15afb2c803c3d003252080d5f27128927d43b9a385bb0369730c13dc2853110f758e1c7c1d7f2d559010740fd SHA512 7939abc860de9aaa374d737e6e849408e9e48f21228a2a3895f72a73ae1edf7e71667795f51c57c5b5d2ddf3d498fc3ff8c55e1c2ac09c35d2b8fc78cdecf560
-EBUILD qtconcurrent-5.7.1.ebuild 434 BLAKE2B d70d97815a7124d999c113371707607a8f6f81c41b09f25456c9c8e36b1e67bd1a95d7dba22f53108cf833f50275619d1c2dab0bb858a41eccf62adc088b7a91 SHA512 a426a48a5c65b76fc2acd8d02a8f3efb14663b476ffcfe5474bb2079245d564b8881f017dea0b3a7b3437b673e66e9dbd57ab28ad4ce7f85ccc88271b41b5fbc
+EBUILD qtconcurrent-5.11.0_rc.ebuild 451 BLAKE2B ac3e1c49359c08572a277b8d73f07169cc8c69e15afb2c803c3d003252080d5f27128927d43b9a385bb0369730c13dc2853110f758e1c7c1d7f2d559010740fd SHA512 7939abc860de9aaa374d737e6e849408e9e48f21228a2a3895f72a73ae1edf7e71667795f51c57c5b5d2ddf3d498fc3ff8c55e1c2ac09c35d2b8fc78cdecf560
 EBUILD qtconcurrent-5.9.4.ebuild 447 BLAKE2B a2129ce135f8fe310e72e731bfbc99e8478815b8e6f67731ff7ff92a0de439808f828fcdba17ffc192fd0e5320bd4b79b31777150280b8ab8015116b9fdff862 SHA512 8993a8af2e1e394340faf5e3d6987c690739cb76a2aeb21b3684aaeee4b000db473c507e2d3b40cc25b56f078b9ca08111f3e2b2310e66b02297711fe42c84f5
 EBUILD qtconcurrent-5.9.5.ebuild 451 BLAKE2B ac3e1c49359c08572a277b8d73f07169cc8c69e15afb2c803c3d003252080d5f27128927d43b9a385bb0369730c13dc2853110f758e1c7c1d7f2d559010740fd SHA512 7939abc860de9aaa374d737e6e849408e9e48f21228a2a3895f72a73ae1edf7e71667795f51c57c5b5d2ddf3d498fc3ff8c55e1c2ac09c35d2b8fc78cdecf560
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.11.0_beta4.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.11.0_rc.ebuild
index 75e304af27a0..75e304af27a0 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.11.0_beta4.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.11.0_rc.ebuild
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.7.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.7.1.ebuild
deleted file mode 100644
index bcecd17cde13..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.7.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
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 52bd9173bd27..991bcb392e82 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -3,17 +3,12 @@ AUX qtcore-4.8.5-qeventdispatcher-recursive.patch 4017 BLAKE2B 13b105b166613516a
 AUX qtcore-4.8.7-libressl.patch 2161 BLAKE2B e6c5c494fe76840c0c3d1c7e91c72a825dd595194368af35ed824552e6e851b961a4f7242acc7982cc7b80331e4190d0544052a5aad29c3beea726306ee19c38 SHA512 c84b827fd5f0c504c9ab95352677dc2cfe926c81aa012b454d8260385215b510835ba693830b3a3a6fa374b299995ec14cbb07711f41031788fc6c3bec396021
 AUX qtcore-4.8.7-moc.patch 926 BLAKE2B 1fd7a9b6d7d69aa110761a587bbe1d13910f4537c0dd60e6f681c8242b150fc23a476d2011211565412f855bc1fb90a58e363d349bb18b40e6e299261e0a5a7a SHA512 cb64e3e2271d3031c11d2c8afe1bcfd5263bcf8b8c787d03059b4bca25f3dd2d8a092c80cb396a1a466d2ef667697c31856c7c675aa7c48b5680f5e91db95f86
 AUX qtcore-5.6.2-plugins.patch 3264 BLAKE2B 232cbd215d8c93475c08f614c74ce0227d23f2cbcfb0e5475295d37a6ee9bc4ed1e7fea8a53a3fc3daa27dc5bcd8e60b72c991048b45234153f549875663f34b SHA512 0d50ba6cd94fc29158931e2e09ec21c48780ecfaa75443efd842cce05cc3030f81a02385714b42d5cede3b0cbf8efc24d3c660ac4438cdd428a24bf8a624bb2d
-AUX qtcore-5.7.1-qipm.patch 5915 BLAKE2B 7b1c6550d39f55b91462e8139e8a0d662b28b6fe2648a860fc8c72d4b0cbbdfd117ceb8c15c63a87a46958a316692a6127afbaf95314b257c15d09a1310df21f SHA512 807c030c2059cddcd159cb537ba2e4be68d6f612f45e1e7b844fc045f661739aea7bc35743735cee364d692d51774e17edced1aac8d444abaa4e4435117a5b3d
-AUX qtcore-5.7.1-qsfpm-1.patch 8922 BLAKE2B 8f5003cbd4bce102219856c310eb79a84752c2405a155eab33e6988958e5c79f69f04fbcda481c54eb19283f90f3a7873fd3d1a816ad73e7f2d0bdfe2a3115f4 SHA512 3854fffa1181cebe4683c54d5e774301a8710bf784dcc18367d04d193a7ce76fc6f634096b6986af41c3f5e4432b702873181a8900fd18e7617ea472d23d6d92
-AUX qtcore-5.7.1-qsfpm-2.patch 7812 BLAKE2B d2cafac754d28cb7a13a15cf75dcb323a5de84400ce1b586ddd7c129c4b32db133f5828c4407144d3d10d3a01bb885819339836792639103be25e59408a88e13 SHA512 38b141aa7d30011d71ed9044c69f79b56698320600a64ed3cc37e8dd9d22bb9ec2f33f8348d074552a5046c2855e948e325d5421384cb4c66c0bbd566500174d
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtbase-everywhere-src-5.11.0-beta4.tar.xz 46815720 BLAKE2B bf21828ed94d02140ebc5b9f366b935f944c40b8fe15094161a9c3d0adc16b2e8bfa7f4d514030569f5f463f39dd8083b6cacb536e71b1e81f743749c8742682 SHA512 c70b575729bdbd580d32350a233dfa1db3f450a3e0f4f41a5c8d153df396edc3f795099e4bf3447d3a0751f9acbc1978b4e499c6dbb6d9357c0288288b83d5ca
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
+DIST qtbase-everywhere-src-5.11.0-rc.tar.xz 46807012 BLAKE2B 76bcc9c71470f09ddb119e0098b58e5f505eb985e39a131100e4b7ddfaa8f5785e534296052631ae1407398e548a8fbf4ce23e05d6d1b5242d35c9ba7d1d08cc SHA512 3cd738f7f3179703275a8604709af70fba4148132ef6f2f8d13f8ea7c767c5f9ae3a11fd96cce49f090ecdf85fa04df0a8551d31d9d05c9efca50ab21ebcfd36
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
 EBUILD qtcore-4.8.7-r4.ebuild 2866 BLAKE2B 323682baab556e3eca23f3c31d872fdb0b7d06d95be41b132b76793d4b3c99b983fba67861629a2cbef3f997b6d46c22816a43c30031f3f9fd1a399c72e9cfc0 SHA512 fe03ae3835572bf39090010e9740e3174c0b5eb2d1ea92b5fadc7d498c29c8ebfe21d86bc9b2783ab2c6957a28f0e65f1a57c36b903ce16bdb9e2cb0328e1875
-EBUILD qtcore-5.11.0_beta4.ebuild 1505 BLAKE2B ae9f8ad65f4b8eeb433cd2b544f7a69c5aee9beac809f00bf4c3241a37a411deff93f5ce6a5e7ad5dd04cc3ca570529923d5217304c268756f991d3a3a1a6952 SHA512 796e3958162b2805adbc0c227699b423a7ceaad4883b89439ff24468434195053bf3d486c1ae50dbbbf4dc485f2a9fdc4c74a3b36985c9d96dfec08e02789b2f
-EBUILD qtcore-5.7.1-r4.ebuild 925 BLAKE2B c622dd04c5eb8855773a637040f79a557a250e4fe077c65499edcc7cbd9168e9b548a2b6c280e003402f8a6c2e1048bc07fdf66e3c49021d2092b7c7d1e00071 SHA512 d0edfb903c4083cbad0456203d29301e46737c74471d857c017aed3c27f6b2d46f822674f9b999c3f17e511f9b482c85eb44044e30fcefdcec7ff20d2bcfddb1
+EBUILD qtcore-5.11.0_rc.ebuild 1505 BLAKE2B ae9f8ad65f4b8eeb433cd2b544f7a69c5aee9beac809f00bf4c3241a37a411deff93f5ce6a5e7ad5dd04cc3ca570529923d5217304c268756f991d3a3a1a6952 SHA512 796e3958162b2805adbc0c227699b423a7ceaad4883b89439ff24468434195053bf3d486c1ae50dbbbf4dc485f2a9fdc4c74a3b36985c9d96dfec08e02789b2f
 EBUILD qtcore-5.9.4-r2.ebuild 1501 BLAKE2B dce6d23557075493060d6899b641e01a30423bc8bf6144c036399c41b2decba8accf17a5e7b0af61f4f85be28c7eda77093fd6b3b770cd097c0c1ecba5130563 SHA512 21d2daaae4b90d677e568e8d7ad9c43582f22fdd2589d45685426b779c5ae8b01aac06996071c317cc5c37601c9a51cb042973f6189a34b23b1af947eed3ca4e
 EBUILD qtcore-5.9.5.ebuild 1505 BLAKE2B ae9f8ad65f4b8eeb433cd2b544f7a69c5aee9beac809f00bf4c3241a37a411deff93f5ce6a5e7ad5dd04cc3ca570529923d5217304c268756f991d3a3a1a6952 SHA512 796e3958162b2805adbc0c227699b423a7ceaad4883b89439ff24468434195053bf3d486c1ae50dbbbf4dc485f2a9fdc4c74a3b36985c9d96dfec08e02789b2f
 MISC metadata.xml 924 BLAKE2B 6be074e378d4e63efe0c6ff55cb99c3ab1318c1d05d8208f4deb8a54a3cc9ded99b63e788336d83633b03eb5d857394e189472a374184d852d3c5851e27555b6 SHA512 c9786a997109a6156ed4879cd94e3e368b7ce095fc43fced168bdc5fbc846411c145318020d0eab7024aa64003403435a6cad222ab3569d838b9450c526c8ddb
diff --git a/dev-qt/qtcore/files/qtcore-5.7.1-qipm.patch b/dev-qt/qtcore/files/qtcore-5.7.1-qipm.patch
deleted file mode 100644
index abea14588075..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.7.1-qipm.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From baad82d242a4d8c1af6c87faaa7f25584183fd53 Mon Sep 17 00:00:00 2001
-From: Stephen Kelly <steveire@gmail.com>
-Date: Tue, 20 Dec 2016 00:44:12 +0000
-Subject: [PATCH] QIPM: Persist model indexes after emitting layoutChange, not
- before
-
-Callers can persist a QModelIndex which was not persisted before in a
-slot connected to the signal, and such a persisted index must be updated
-in the course of the layoutChange.
-
-Store the indexes to persist after emitting the signal.
-
-Task-number: QTBUG-32981
-Change-Id: Ibee4c0d84817d72603a03fe5b22fdeefeac0695e
-Reviewed-by: David Faure <david.faure@kdab.com>
----
- src/corelib/itemmodels/qidentityproxymodel.cpp     | 18 ++---
- .../tst_qidentityproxymodel.cpp                    | 76 ++++++++++++++++++++++
- 2 files changed, 85 insertions(+), 9 deletions(-)
-
-diff --git a/src/corelib/itemmodels/qidentityproxymodel.cpp b/src/corelib/itemmodels/qidentityproxymodel.cpp
-index e537793..7c30679 100644
---- a/src/corelib/itemmodels/qidentityproxymodel.cpp
-+++ b/src/corelib/itemmodels/qidentityproxymodel.cpp
-@@ -496,15 +496,6 @@ void QIdentityProxyModelPrivate::_q_sourceLayoutAboutToBeChanged(const QList<QPe
- {
-     Q_Q(QIdentityProxyModel);
- 
--    const auto proxyPersistentIndexes = q->persistentIndexList();
--    for (const QPersistentModelIndex &proxyPersistentIndex : proxyPersistentIndexes) {
--        proxyIndexes << proxyPersistentIndex;
--        Q_ASSERT(proxyPersistentIndex.isValid());
--        const QPersistentModelIndex srcPersistentIndex = q->mapToSource(proxyPersistentIndex);
--        Q_ASSERT(srcPersistentIndex.isValid());
--        layoutChangePersistentIndexes << srcPersistentIndex;
--    }
--
-     QList<QPersistentModelIndex> parents;
-     parents.reserve(sourceParents.size());
-     for (const QPersistentModelIndex &parent : sourceParents) {
-@@ -518,6 +509,15 @@ void QIdentityProxyModelPrivate::_q_sourceLayoutAboutToBeChanged(const QList<QPe
-     }
- 
-     q->layoutAboutToBeChanged(parents, hint);
-+
-+    const auto proxyPersistentIndexes = q->persistentIndexList();
-+    for (const QPersistentModelIndex &proxyPersistentIndex : proxyPersistentIndexes) {
-+        proxyIndexes << proxyPersistentIndex;
-+        Q_ASSERT(proxyPersistentIndex.isValid());
-+        const QPersistentModelIndex srcPersistentIndex = q->mapToSource(proxyPersistentIndex);
-+        Q_ASSERT(srcPersistentIndex.isValid());
-+        layoutChangePersistentIndexes << srcPersistentIndex;
-+    }
- }
- 
- void QIdentityProxyModelPrivate::_q_sourceLayoutChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint)
-diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
-index e946f31..564b854 100644
---- a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
-+++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
-@@ -68,6 +68,8 @@ private slots:
- 
-     void itemData();
- 
-+    void persistIndexOnLayoutChange();
-+
- protected:
-     void verifyIdentity(QAbstractItemModel *model, const QModelIndex &parent = QModelIndex());
- 
-@@ -377,5 +379,79 @@ void tst_QIdentityProxyModel::itemData()
-     QCOMPARE(proxy.itemData(topIndex).value(Qt::DisplayRole).toString(), QStringLiteral("Monday_appended"));
- }
- 
-+void dump(QAbstractItemModel* model, QString const& indent = " - ", QModelIndex const& parent = {})
-+{
-+    for (auto row = 0; row < model->rowCount(parent); ++row)
-+    {
-+        auto idx = model->index(row, 0, parent);
-+        qDebug() << (indent + idx.data().toString());
-+        dump(model, indent + "- ", idx);
-+    }
-+}
-+
-+void tst_QIdentityProxyModel::persistIndexOnLayoutChange()
-+{
-+    DynamicTreeModel model;
-+
-+    QList<int> ancestors;
-+    for (auto i = 0; i < 3; ++i)
-+    {
-+        Q_UNUSED(i);
-+        ModelInsertCommand insertCommand(&model);
-+        insertCommand.setAncestorRowNumbers(ancestors);
-+        insertCommand.setStartRow(0);
-+        insertCommand.setEndRow(0);
-+        insertCommand.doCommand();
-+        ancestors.push_back(0);
-+    }
-+    ModelInsertCommand insertCommand(&model);
-+    insertCommand.setAncestorRowNumbers(ancestors);
-+    insertCommand.setStartRow(0);
-+    insertCommand.setEndRow(1);
-+    insertCommand.doCommand();
-+
-+    // dump(&model);
-+    // " - 1"
-+    // " - - 2"
-+    // " - - - 3"
-+    // " - - - - 4"
-+    // " - - - - 5"
-+
-+    QIdentityProxyModel proxy;
-+    proxy.setSourceModel(&model);
-+
-+    QPersistentModelIndex persistentIndex;
-+
-+    QPersistentModelIndex sourcePersistentIndex = model.match(model.index(0, 0), Qt::DisplayRole, "5", 1, Qt::MatchRecursive).first();
-+
-+    QCOMPARE(sourcePersistentIndex.data().toString(), QStringLiteral("5"));
-+
-+    bool gotLayoutAboutToBeChanged = false;
-+    bool gotLayoutChanged = false;
-+
-+    QObject::connect(&proxy, &QAbstractItemModel::layoutAboutToBeChanged, &proxy, [&proxy, &persistentIndex, &gotLayoutAboutToBeChanged]
-+    {
-+        gotLayoutAboutToBeChanged = true;
-+        persistentIndex = proxy.match(proxy.index(0, 0), Qt::DisplayRole, "5", 1, Qt::MatchRecursive).first();
-+    });
-+
-+    QObject::connect(&proxy, &QAbstractItemModel::layoutChanged, &proxy, [&proxy, &persistentIndex, &sourcePersistentIndex, &gotLayoutChanged]
-+    {
-+        gotLayoutChanged = true;
-+        QCOMPARE(QModelIndex(persistentIndex), proxy.mapFromSource(sourcePersistentIndex));
-+    });
-+
-+    ModelChangeChildrenLayoutsCommand layoutChangeCommand(&model, 0);
-+
-+    layoutChangeCommand.setAncestorRowNumbers(QList<int>{0, 0, 0});
-+    layoutChangeCommand.setSecondAncestorRowNumbers(QList<int>{0, 0});
-+
-+    layoutChangeCommand.doCommand();
-+
-+    QVERIFY(gotLayoutAboutToBeChanged);
-+    QVERIFY(gotLayoutChanged);
-+    QVERIFY(persistentIndex.isValid());
-+}
-+
- QTEST_MAIN(tst_QIdentityProxyModel)
- #include "tst_qidentityproxymodel.moc"
--- 
-2.7.4
-
diff --git a/dev-qt/qtcore/files/qtcore-5.7.1-qsfpm-1.patch b/dev-qt/qtcore/files/qtcore-5.7.1-qsfpm-1.patch
deleted file mode 100644
index 9edbe18617a2..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.7.1-qsfpm-1.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-From 3bd0fd8f97e7a33a874929a383a42e6c710bfff3 Mon Sep 17 00:00:00 2001
-From: Stephen Kelly <steveire@gmail.com>
-Date: Sat, 17 Dec 2016 06:20:06 +0000
-Subject: [PATCH] QSFPM: Fix handling of source model layout change
-
-In sourceLayoutAboutToBeChanged the source model update is ignored if
-the affected parents are filtered out anyway.  The same logic is
-attempted in the sourceLayoutChanged slot, but there the early-return
-logic is applied too late - the mapping is cleared before performing the
-early-return.  Because pointers into the mapping are used in the
-internalPointer of QModelIndexes in this class, persistent indexes used
-later will segfault when attempting to dereference it.
-
-Additionally, if a parent becomes invalid as a result of the
-layoutChange, it would be filtered out by the condition in the loop,
-resulting in a different result in the comparison of emptiness of the
-parents container.
-
-Fix that by persisting the parent's container, and performing the test
-for early-return before clearing the mapping.
-
-Task-number: QTBUG-47711
-Task-number: QTBUG-32981
-Change-Id: If45e8a1c97d39454160f52041bc9ae7e337dce97
-Reviewed-by: David Faure <david.faure@kdab.com>
----
- src/corelib/itemmodels/qsortfilterproxymodel.cpp   |  31 ++---
- .../tst_qsortfilterproxymodel.cpp                  | 126 +++++++++++++++++++++
- 2 files changed, 137 insertions(+), 20 deletions(-)
-
-diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
-index b0ddfa8..3331521 100644
---- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
-+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
-@@ -171,6 +171,7 @@ public:
-     QRowsRemoval itemsBeingRemoved;
- 
-     QModelIndexPairList saved_persistent_indexes;
-+    QList<QPersistentModelIndex> saved_layoutChange_parents;
- 
-     QHash<QModelIndex, Mapping *>::const_iterator create_mapping(
-         const QModelIndex &source_parent) const;
-@@ -1331,23 +1332,23 @@ void QSortFilterProxyModelPrivate::_q_sourceLayoutAboutToBeChanged(const QList<Q
-     Q_UNUSED(hint); // We can't forward Hint because we might filter additional rows or columns
-     saved_persistent_indexes.clear();
- 
--    QList<QPersistentModelIndex> parents;
-+    saved_layoutChange_parents.clear();
-     for (const QPersistentModelIndex &parent : sourceParents) {
-         if (!parent.isValid()) {
--            parents << QPersistentModelIndex();
-+            saved_layoutChange_parents << QPersistentModelIndex();
-             continue;
-         }
-         const QModelIndex mappedParent = q->mapFromSource(parent);
-         // Might be filtered out.
-         if (mappedParent.isValid())
--            parents << mappedParent;
-+            saved_layoutChange_parents << mappedParent;
-     }
- 
-     // All parents filtered out.
--    if (!sourceParents.isEmpty() && parents.isEmpty())
-+    if (!sourceParents.isEmpty() && saved_layoutChange_parents.isEmpty())
-         return;
- 
--    emit q->layoutAboutToBeChanged(parents);
-+    emit q->layoutAboutToBeChanged(saved_layoutChange_parents);
-     if (persistent.indexes.isEmpty())
-         return;
- 
-@@ -1359,6 +1360,9 @@ void QSortFilterProxyModelPrivate::_q_sourceLayoutChanged(const QList<QPersisten
-     Q_Q(QSortFilterProxyModel);
-     Q_UNUSED(hint); // We can't forward Hint because we might filter additional rows or columns
- 
-+    if (!sourceParents.isEmpty() && saved_layoutChange_parents.isEmpty())
-+        return;
-+
-     // Optimize: We only actually have to clear the mapping related to the contents of
-     // sourceParents, not everything.
-     qDeleteAll(source_index_mapping);
-@@ -1373,21 +1377,8 @@ void QSortFilterProxyModelPrivate::_q_sourceLayoutChanged(const QList<QPersisten
-         source_index_mapping.clear();
-     }
- 
--    QList<QPersistentModelIndex> parents;
--    for (const QPersistentModelIndex &parent : sourceParents) {
--        if (!parent.isValid()) {
--            parents << QPersistentModelIndex();
--            continue;
--        }
--        const QModelIndex mappedParent = q->mapFromSource(parent);
--        if (mappedParent.isValid())
--            parents << mappedParent;
--    }
--
--    if (!sourceParents.isEmpty() && parents.isEmpty())
--        return;
--
--    emit q->layoutChanged(parents);
-+    emit q->layoutChanged(saved_layoutChange_parents);
-+    saved_layoutChange_parents.clear();
- }
- 
- void QSortFilterProxyModelPrivate::_q_sourceRowsAboutToBeInserted(
-diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-index 38e3c68..6b98d9f 100644
---- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-@@ -145,6 +145,8 @@ private slots:
-     void canDropMimeData();
-     void filterHint();
- 
-+    void sourceLayoutChangeLeavesValidPersistentIndexes();
-+
- protected:
-     void buildHierarchy(const QStringList &data, QAbstractItemModel *model);
-     void checkHierarchy(const QStringList &data, const QAbstractItemModel *model);
-@@ -4181,5 +4183,129 @@ void tst_QSortFilterProxyModel::filterHint()
-              QAbstractItemModel::NoLayoutChangeHint);
- }
- 
-+/**
-+
-+  Creates a model where each item has one child, to a set depth,
-+  and the last item has no children.  For a model created with
-+  setDepth(4):
-+
-+    - 1
-+    - - 2
-+    - - - 3
-+    - - - - 4
-+*/
-+class StepTreeModel : public QAbstractItemModel
-+{
-+    Q_OBJECT
-+public:
-+    StepTreeModel(QObject * parent = 0)
-+        : QAbstractItemModel(parent), m_depth(0) {}
-+
-+    int columnCount(const QModelIndex& = QModelIndex()) const override { return 1; }
-+
-+    int rowCount(const QModelIndex& parent = QModelIndex()) const override
-+    {
-+        quintptr parentId = (parent.isValid()) ? parent.internalId() : 0;
-+        return (parentId < m_depth) ? 1 : 0;
-+    }
-+
-+    QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override
-+    {
-+        if (role != Qt::DisplayRole)
-+            return QVariant();
-+
-+        return QString::number(index.internalId());
-+    }
-+
-+    QModelIndex index(int, int, const QModelIndex& parent = QModelIndex()) const override
-+    {
-+        quintptr parentId = (parent.isValid()) ? parent.internalId() : 0;
-+        if (parentId >= m_depth)
-+            return QModelIndex();
-+
-+        return createIndex(0, 0, parentId + 1);
-+    }
-+
-+    QModelIndex parent(const QModelIndex& index) const override
-+    {
-+        if (index.internalId() == 0)
-+            return QModelIndex();
-+
-+        return createIndex(0, 0, index.internalId() - 1);
-+    }
-+
-+    void setDepth(quintptr depth)
-+    {
-+        int parentIdWithLayoutChange = (m_depth < depth) ? m_depth : depth;
-+
-+        QList<QPersistentModelIndex> parentsOfLayoutChange;
-+        parentsOfLayoutChange.push_back(createIndex(0, 0, parentIdWithLayoutChange));
-+
-+        layoutAboutToBeChanged(parentsOfLayoutChange);
-+
-+        auto existing = persistentIndexList();
-+
-+        QList<QModelIndex> updated;
-+
-+        for (auto idx : existing) {
-+            if (indexDepth(idx) <= depth)
-+                updated.push_back(idx);
-+            else
-+                updated.push_back({});
-+        }
-+
-+        m_depth = depth;
-+
-+        changePersistentIndexList(existing, updated);
-+
-+        layoutChanged(parentsOfLayoutChange);
-+    }
-+
-+private:
-+    static quintptr indexDepth(QModelIndex const& index)
-+    {
-+        return (index.isValid()) ? 1 + indexDepth(index.parent()) : 0;
-+    }
-+
-+private:
-+    quintptr m_depth;
-+};
-+
-+void tst_QSortFilterProxyModel::sourceLayoutChangeLeavesValidPersistentIndexes()
-+{
-+    StepTreeModel model;
-+    Q_SET_OBJECT_NAME(model);
-+    model.setDepth(4);
-+
-+    QSortFilterProxyModel proxy1;
-+    proxy1.setSourceModel(&model);
-+    Q_SET_OBJECT_NAME(proxy1);
-+
-+    proxy1.setFilterRegExp("1|2");
-+
-+    // The current state of things:
-+    //  model         proxy
-+    //   - 1           - 1
-+    //   - - 2         - - 2
-+    //   - - - 3
-+    //   - - - - 4
-+
-+    // The setDepth call below removes '4' with a layoutChanged call.
-+    // Because the proxy filters that out anyway, the proxy doesn't need
-+    // to emit any signals or update persistent indexes.
-+
-+    QPersistentModelIndex persistentIndex = proxy1.index(0, 0, proxy1.index(0, 0));
-+
-+    model.setDepth(3);
-+
-+    // Calling parent() causes the internalPointer to be used.
-+    // Before fixing QTBUG-47711, that could be a dangling pointer.
-+    // The use of qDebug here makes sufficient use of the heap to
-+    // cause corruption at runtime with normal use on linux (before
-+    // the fix). valgrind confirms the fix.
-+    qDebug() << persistentIndex.parent();
-+    QVERIFY(persistentIndex.parent().isValid());
-+}
-+
- QTEST_MAIN(tst_QSortFilterProxyModel)
- #include "tst_qsortfilterproxymodel.moc"
--- 
-2.7.4
-
-
diff --git a/dev-qt/qtcore/files/qtcore-5.7.1-qsfpm-2.patch b/dev-qt/qtcore/files/qtcore-5.7.1-qsfpm-2.patch
deleted file mode 100644
index 973649637e66..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.7.1-qsfpm-2.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From 0874861bcc70313c343aba5e5566ed30b69eed1c Mon Sep 17 00:00:00 2001
-From: Stephen Kelly <steveire@gmail.com>
-Date: Mon, 19 Dec 2016 21:13:57 +0000
-Subject: [PATCH] QSFPM: Remove data manipulation from move handlers
-
-Similar to the fix in the parent commit, incorrect updating of the
-internal data structures during layout changes can lead to dangling
-pointers being dereferenced later.  Moves are treated as layoutChanges
-by this proxy by forwarding to the appropriate method.  However, data is
-incorrectly cleared prior to that forwarding.  Remove that, and let the
-layoutChange handling take appropriate action.
-
-Change-Id: Iee951e37152328a4e6a5fb8e5385c32a2fe4c0bd
-Reviewed-by: David Faure <david.faure@kdab.com>
----
- src/corelib/itemmodels/qsortfilterproxymodel.cpp   | 67 ++++------------------
- .../tst_qsortfilterproxymodel.cpp                  | 46 +++++++++++++++
- 2 files changed, 58 insertions(+), 55 deletions(-)
-
-diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
-index 3331521..226a240 100644
---- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
-+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
-@@ -1418,49 +1418,27 @@ void QSortFilterProxyModelPrivate::_q_sourceRowsRemoved(
- void QSortFilterProxyModelPrivate::_q_sourceRowsAboutToBeMoved(
-     const QModelIndex &sourceParent, int /* sourceStart */, int /* sourceEnd */, const QModelIndex &destParent, int /* dest */)
- {
--    Q_Q(QSortFilterProxyModel);
-     // Because rows which are contiguous in the source model might not be contiguous
-     // in the proxy due to sorting, the best thing we can do here is be specific about what
-     // parents are having their children changed.
-     // Optimize: Emit move signals if the proxy is not sorted. Will need to account for rows
-     // being filtered out though.
- 
--    saved_persistent_indexes.clear();
--
-     QList<QPersistentModelIndex> parents;
--    parents << q->mapFromSource(sourceParent);
-+    parents << sourceParent;
-     if (sourceParent != destParent)
--      parents << q->mapFromSource(destParent);
--    emit q->layoutAboutToBeChanged(parents);
--    if (persistent.indexes.isEmpty())
--        return;
--    saved_persistent_indexes = store_persistent_indexes();
-+        parents << destParent;
-+    _q_sourceLayoutAboutToBeChanged(parents, QAbstractItemModel::NoLayoutChangeHint);
- }
- 
- void QSortFilterProxyModelPrivate::_q_sourceRowsMoved(
-     const QModelIndex &sourceParent, int /* sourceStart */, int /* sourceEnd */, const QModelIndex &destParent, int /* dest */)
- {
--    Q_Q(QSortFilterProxyModel);
--
--    // Optimize: We only need to clear and update the persistent indexes which are children of
--    // sourceParent or destParent
--    qDeleteAll(source_index_mapping);
--    source_index_mapping.clear();
--
--    update_persistent_indexes(saved_persistent_indexes);
--    saved_persistent_indexes.clear();
--
--    if (dynamic_sortfilter && update_source_sort_column()) {
--        //update_source_sort_column might have created wrong mapping so we have to clear it again
--        qDeleteAll(source_index_mapping);
--        source_index_mapping.clear();
--    }
--
-     QList<QPersistentModelIndex> parents;
--    parents << q->mapFromSource(sourceParent);
-+    parents << sourceParent;
-     if (sourceParent != destParent)
--      parents << q->mapFromSource(destParent);
--    emit q->layoutChanged(parents);
-+        parents << destParent;
-+    _q_sourceLayoutChanged(parents, QAbstractItemModel::NoLayoutChangeHint);
- }
- 
- void QSortFilterProxyModelPrivate::_q_sourceColumnsAboutToBeInserted(
-@@ -1522,42 +1500,21 @@ void QSortFilterProxyModelPrivate::_q_sourceColumnsRemoved(
- void QSortFilterProxyModelPrivate::_q_sourceColumnsAboutToBeMoved(
-     const QModelIndex &sourceParent, int /* sourceStart */, int /* sourceEnd */, const QModelIndex &destParent, int /* dest */)
- {
--    Q_Q(QSortFilterProxyModel);
--
--    saved_persistent_indexes.clear();
--
-     QList<QPersistentModelIndex> parents;
--    parents << q->mapFromSource(sourceParent);
-+    parents << sourceParent;
-     if (sourceParent != destParent)
--      parents << q->mapFromSource(destParent);
--    emit q->layoutAboutToBeChanged(parents);
--
--    if (persistent.indexes.isEmpty())
--        return;
--    saved_persistent_indexes = store_persistent_indexes();
-+        parents << destParent;
-+    _q_sourceLayoutAboutToBeChanged(parents, QAbstractItemModel::NoLayoutChangeHint);
- }
- 
- void QSortFilterProxyModelPrivate::_q_sourceColumnsMoved(
-     const QModelIndex &sourceParent, int /* sourceStart */, int /* sourceEnd */, const QModelIndex &destParent, int /* dest */)
- {
--    Q_Q(QSortFilterProxyModel);
--
--    qDeleteAll(source_index_mapping);
--    source_index_mapping.clear();
--
--    update_persistent_indexes(saved_persistent_indexes);
--    saved_persistent_indexes.clear();
--
--    if (dynamic_sortfilter && update_source_sort_column()) {
--        qDeleteAll(source_index_mapping);
--        source_index_mapping.clear();
--    }
--
-     QList<QPersistentModelIndex> parents;
--    parents << q->mapFromSource(sourceParent);
-+    parents << sourceParent;
-     if (sourceParent != destParent)
--      parents << q->mapFromSource(destParent);
--    emit q->layoutChanged(parents);
-+        parents << destParent;
-+    _q_sourceLayoutChanged(parents, QAbstractItemModel::NoLayoutChangeHint);
- }
- 
- /*!
-diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-index 6b98d9f..7b6c470 100644
---- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-@@ -146,6 +146,7 @@ private slots:
-     void filterHint();
- 
-     void sourceLayoutChangeLeavesValidPersistentIndexes();
-+    void rowMoveLeavesValidPersistentIndexes();
- 
- protected:
-     void buildHierarchy(const QStringList &data, QAbstractItemModel *model);
-@@ -4307,5 +4308,50 @@ void tst_QSortFilterProxyModel::sourceLayoutChangeLeavesValidPersistentIndexes()
-     QVERIFY(persistentIndex.parent().isValid());
- }
- 
-+void tst_QSortFilterProxyModel::rowMoveLeavesValidPersistentIndexes()
-+{
-+    DynamicTreeModel model;
-+    Q_SET_OBJECT_NAME(model);
-+
-+    QList<int> ancestors;
-+    for (auto i = 0; i < 5; ++i)
-+    {
-+        Q_UNUSED(i);
-+        ModelInsertCommand insertCommand(&model);
-+        insertCommand.setAncestorRowNumbers(ancestors);
-+        insertCommand.setStartRow(0);
-+        insertCommand.setEndRow(0);
-+        insertCommand.doCommand();
-+        ancestors.push_back(0);
-+    }
-+
-+    QSortFilterProxyModel proxy1;
-+    proxy1.setSourceModel(&model);
-+    Q_SET_OBJECT_NAME(proxy1);
-+
-+    proxy1.setFilterRegExp("1|2");
-+
-+    auto item5 = model.match(model.index(0, 0), Qt::DisplayRole, "5", 1, Qt::MatchRecursive).first();
-+    auto item3 = model.match(model.index(0, 0), Qt::DisplayRole, "3", 1, Qt::MatchRecursive).first();
-+
-+    Q_ASSERT(item5.isValid());
-+    Q_ASSERT(item3.isValid());
-+
-+    QPersistentModelIndex persistentIndex = proxy1.match(proxy1.index(0, 0), Qt::DisplayRole, "2", 1, Qt::MatchRecursive).first();
-+
-+    ModelMoveCommand moveCommand(&model, 0);
-+    moveCommand.setAncestorRowNumbers(QList<int>{0, 0, 0, 0});
-+    moveCommand.setStartRow(0);
-+    moveCommand.setEndRow(0);
-+    moveCommand.setDestRow(0);
-+    moveCommand.setDestAncestors(QList<int>{0, 0, 0});
-+    moveCommand.doCommand();
-+
-+    // Calling parent() causes the internalPointer to be used.
-+    // Before fixing QTBUG-47711 (moveRows case), that could be
-+    // a dangling pointer.
-+    QVERIFY(persistentIndex.parent().isValid());
-+}
-+
- QTEST_MAIN(tst_QSortFilterProxyModel)
- #include "tst_qsortfilterproxymodel.moc"
--- 
-2.7.4
-
-
diff --git a/dev-qt/qtcore/qtcore-5.11.0_beta4.ebuild b/dev-qt/qtcore/qtcore-5.11.0_rc.ebuild
index 489161041fcf..489161041fcf 100644
--- a/dev-qt/qtcore/qtcore-5.11.0_beta4.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.0_rc.ebuild
diff --git a/dev-qt/qtcore/qtcore-5.7.1-r4.ebuild b/dev-qt/qtcore/qtcore-5.7.1-r4.ebuild
deleted file mode 100644
index cbc2d6de22ea..000000000000
--- a/dev-qt/qtcore/qtcore-5.7.1-r4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="icu systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	>=dev-libs/libpcre-8.38[pcre16,unicode]
-	>=sys-libs/zlib-1.2.5
-	virtual/libiconv
-	icu? ( dev-libs/icu:= )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtcore-4.8.7-r4:4
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.6.2-plugins.patch
-	"${FILESDIR}"/${P}-qipm.patch
-	"${FILESDIR}"/${P}-qsfpm-{1,2}.patch
-)
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use systemd journald)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 66366f1d4ead..946750f62a88 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,9 +1,7 @@
-DIST qtdatavis3d-everywhere-src-5.11.0-beta4.tar.xz 5202776 BLAKE2B 9fc21677e6bd09d718e88415fda31596d827521910113b3b3626e09633a9ef0619980377ab745fdd4f1572a7fa9ffe93f1c31cf63b1de11ef7cbc220f9f8a435 SHA512 af83f268e1107a9acc2f0256dd157f495c4123e9220ccf21be8746bcb3fd75281a2a66f7a038f57788d056ce7a7258fa7506d1027a742f148d71857d6d96a528
-DIST qtdatavis3d-opensource-src-5.7.1.tar.xz 5155740 BLAKE2B bd0fbd04367dfbc328d1d63fe5e2557a491f8d2dddbca4efadc190bdfa640f3ae2c7db1b29ec9ff07e3b8e03cab2b4caa4cae2ffa396d82d4db728aff252dbbc SHA512 2739f7ddcf81fa53a2673e7073c1dac54ea15b70175e19697c7711d652101f0f9a41dc5f89ea33bc5675605ba760667ead8cfde10940dbad8ec75f6897c67b5a
+DIST qtdatavis3d-everywhere-src-5.11.0-rc.tar.xz 5202356 BLAKE2B 44151a8dce78ce3afac02ef308a7c08331152c111e043416a9f71b864462d386937f87b69efd38c8c845b0b9c1e79431468ca284ad9a5e993b0dff9d038b248a SHA512 edcd3e248583e4b6348844cb81bb6b4118cdb3f916c1e999b874368febeece208a8f47c652287b8978d7e1d5db889738b981606baac80bcf319e249e255a8164
 DIST qtdatavis3d-opensource-src-5.9.4.tar.xz 5164120 BLAKE2B e8e9586da6e261f22ac6dba12b530755b1b6914f702a33d196968f7c8812e4d5a6b86dd7584c109385fa2e9bc33fcfc067b2538f8d4cff69d3a0624a26822a8e SHA512 8e314d4b0324b6d9aa9a4a63bd3e21010545ce7ffa250614ceea6052b37d7519036a4e13ce1b3cd264e5ce00453bceb774234932cf3c3a49bcded0988d4110c2
 DIST qtdatavis3d-opensource-src-5.9.5.tar.xz 5161916 BLAKE2B a284269677d9a60ef13f4970a922706ba5ec3f7ba864175989ed37b5396529286cab3cd51d6cb2a9890fca6384438b41b2adeebe2099649da1735458e68be7ef SHA512 8f8b93a4e89c1d95068ae188d11f796f6ae161a01b53254f3ef9d434b2f9335a554f377d813e82de242cbcdf68815918430bdee8329b831f82b989f5c517da94
-EBUILD qtdatavis3d-5.11.0_beta4.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
-EBUILD qtdatavis3d-5.7.1.ebuild 625 BLAKE2B 83a990e7da20777008fa1f8db5ef6e0850d0d1764ae763cb0063e7b8198277225ab00ffb6895317fe6800c34bee77f08f76177a690020f72e382ef0d9889c5e6 SHA512 6498e8bc0b6baaf227a22c047e9e2587d08b632d3bd9ed747af513b8ef607e2bc7faa420a0147cc67be744ef8468696488863282c4ab23824bad42375a0b56eb
+EBUILD qtdatavis3d-5.11.0_rc.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
 EBUILD qtdatavis3d-5.9.4.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
 EBUILD qtdatavis3d-5.9.5.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
 MISC metadata.xml 634 BLAKE2B 00d75cb45e34923b64e3f841adbc930a8615b627ffb00e0a013965d6c7feec165d6124069241987341c43274f46ae54a3ad913a2ba46c3b7d4e51637baaaf07d SHA512 cf0c7257d0c332cdb2dd6295c26afc38f40eb2710e197c3767c7d828cafbd545faa1926f4cff3500a1b0cee1630399690ad107278a2da129cd682c771599bf32
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.0_beta4.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.0_rc.ebuild
index 647770499acf..647770499acf 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.0_beta4.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.0_rc.ebuild
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.7.1.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.7.1.ebuild
deleted file mode 100644
index e097dd607326..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="3D data visualization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="gles2 qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# eliminate bogus dependency on qtwidgets
-	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
-
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 60a1ad292b89..d20b93b92286 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,13 +1,11 @@
 AUX qtdbus-4.7-qdbusintegrator-no-const.patch 543 BLAKE2B c5db96f9b2b84e8da8ce82646ea8759f8bf39d0c73e92839b9a2bc5465a6e43ecf2a3dc7c7db5c56e3a7b4925368201c214bbc9b8155b37532d7dccfc2a4703a SHA512 1967f1b3f1a834eecf140df39c6e4826acf80fc2f8de85770252949910de357a4303d1c1b3202e2df164e8b1cd74b0ab4928a3b333df0a222bdf21e71696824f
 AUX qtdbus-4.8.4-qdbusconnection-silence-warning.patch 997 BLAKE2B 079b0ce31ab06ab26ac14d94a88ee524ee9459d62e25b5d4e5f16d95a2ded69a1d257de4af8d2f304fbb3eaf5a0aa194aaef7322cb4f65debd283865c5b2475c SHA512 b3135450bcd7ab50e5b559b0e8619606053845852159853498756e50777cfbe8b5871bd7b0c178b3de038dc9229f3564c4827b35fcb67b354f0814ca1b2c58e3
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtbase-everywhere-src-5.11.0-beta4.tar.xz 46815720 BLAKE2B bf21828ed94d02140ebc5b9f366b935f944c40b8fe15094161a9c3d0adc16b2e8bfa7f4d514030569f5f463f39dd8083b6cacb536e71b1e81f743749c8742682 SHA512 c70b575729bdbd580d32350a233dfa1db3f450a3e0f4f41a5c8d153df396edc3f795099e4bf3447d3a0751f9acbc1978b4e499c6dbb6d9357c0288288b83d5ca
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
+DIST qtbase-everywhere-src-5.11.0-rc.tar.xz 46807012 BLAKE2B 76bcc9c71470f09ddb119e0098b58e5f505eb985e39a131100e4b7ddfaa8f5785e534296052631ae1407398e548a8fbf4ce23e05d6d1b5242d35c9ba7d1d08cc SHA512 3cd738f7f3179703275a8604709af70fba4148132ef6f2f8d13f8ea7c767c5f9ae3a11fd96cce49f090ecdf85fa04df0a8551d31d9d05c9efca50ab21ebcfd36
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
 EBUILD qtdbus-4.8.7.ebuild 856 BLAKE2B 45206407be68ca357eeaab6a5d6cf5e6f614c333bf7f094e54d32468d6dba97cf86042ca2230ad98d71382e35ede4609f1e2fdb2d64a0b4f1c2fec998727d594 SHA512 5e1a3bfa62a290548f111fa9ad6bcda6faf67a718cb689a8420bebc4154d8d7d194ba5de5485219f77e7e844ccce897b5f34fe3bca3d9b0ce8ab87f336ed2a4f
-EBUILD qtdbus-5.11.0_beta4.ebuild 695 BLAKE2B b349a7e84ad49448470ca329d51f76268885d26c729193dac37934e37042a28aca54858e14126c7a511d7977fc16f5abcc85c05691004e3c240ec73d1cfe0fbf SHA512 855287b2a6860add78f0c88d8da4f65861d50486c6690a709b04afb8347c5413b88f21a8d2df995d56d31be1749d4fc319a1ac4588fe2e3e3a9046aa268c2f2e
-EBUILD qtdbus-5.7.1.ebuild 626 BLAKE2B 0300dee0d4e838bd29c16e098ad3362d9dac83de816560334469ecf4ed75550deda4ae6f487a531ddca73e4620d33095ab6a8b975d6a44795a3cebd8f211895e SHA512 73b433dc98af92d58dd0aec68dbfa73afe1830068790120fe0e809562ef41fa413145d0d917e07d7c8861bfc7f4ca34e7db0b3c6947f19a32b86f089d23134d7
+EBUILD qtdbus-5.11.0_rc.ebuild 695 BLAKE2B b349a7e84ad49448470ca329d51f76268885d26c729193dac37934e37042a28aca54858e14126c7a511d7977fc16f5abcc85c05691004e3c240ec73d1cfe0fbf SHA512 855287b2a6860add78f0c88d8da4f65861d50486c6690a709b04afb8347c5413b88f21a8d2df995d56d31be1749d4fc319a1ac4588fe2e3e3a9046aa268c2f2e
 EBUILD qtdbus-5.9.4.ebuild 691 BLAKE2B 64f68d852a92951dacbb397743fc5f6df49e11a49fd58ee8c9665f571be28133bdde594afe0c874eb80b1dafd65ad926adca7e88845b621d62426645f364baf9 SHA512 f25adcbd53b903dfdeff2fde800419c11b8b42df29d44f40b7b5b4cfad08233ef64f6e467ab65b2610e2415b44d0994f549355d13df306d90cfee6f0bb1766ad
 EBUILD qtdbus-5.9.5.ebuild 695 BLAKE2B b349a7e84ad49448470ca329d51f76268885d26c729193dac37934e37042a28aca54858e14126c7a511d7977fc16f5abcc85c05691004e3c240ec73d1cfe0fbf SHA512 855287b2a6860add78f0c88d8da4f65861d50486c6690a709b04afb8347c5413b88f21a8d2df995d56d31be1749d4fc319a1ac4588fe2e3e3a9046aa268c2f2e
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qtdbus/qtdbus-5.11.0_beta4.ebuild b/dev-qt/qtdbus/qtdbus-5.11.0_rc.ebuild
index b31a0a2f03dc..b31a0a2f03dc 100644
--- a/dev-qt/qtdbus/qtdbus-5.11.0_beta4.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.11.0_rc.ebuild
diff --git a/dev-qt/qtdbus/qtdbus-5.7.1.ebuild b/dev-qt/qtdbus/qtdbus-5.7.1.ebuild
deleted file mode 100644
index e2958fec929f..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.7.1.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
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	>=sys-apps/dbus-1.4.20
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/dbus
-	src/tools/qdbusxml2cpp
-	src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
-	:dbus
-	:dbus-linked:
-)
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index cc8955eaac27..1cce6554be9f 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,13 +1,11 @@
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
 AUX qtdeclarative-5.9.5-texture-memleak.patch 2199 BLAKE2B 7b0f531e095fd80731983faf106811ef32d38ce83c2bb595683203d81d671d105720c6ee840740c4c30b0027c52825844bd1fe60a7ab52499feb2699ada92729 SHA512 20c83cd85120475fcec31c6394c149ab6d271f8f4856cd9da60346faebb67e3b119001fc3b0cbfd3f198f5237c4330e878d68d530f859192b6dd9560d7a949e5
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtdeclarative-everywhere-src-5.11.0-beta4.tar.xz 22274616 BLAKE2B b7ce482a34686f3b27cea4a204fa6726d13374a3657bbbe1698823e8ac1582986f6b4b30cd8b2bd1e0cb33e2dbe511c3ffce254839c82b545f9ed2e75ac4b898 SHA512 3084af1e8958fef8878a842a68cca88f97968a08ce1a60b4ae9afe1b20038f2bb81ea182a0000557c6f98f4d080c0e7683abb0614d095ff66d1d4af5e2f6bdb7
-DIST qtdeclarative-opensource-src-5.7.1.tar.xz 18976920 BLAKE2B f451622bd896445b21db99c0896a58051b8cd78b98062ff9ae71285ea66a692b7f236e0c8b69ee9b7a2685f46344525554caf73f6a9d5b45ef7d6df15f8e4b17 SHA512 8c56099a13103f4831a7ceb29223722c1f8efb0e9a87a4c1fdf0b55a3c5b4cedfdac6e06960ea5d03df4184b3d1c6bc3f21bdcdbd2400591143930aa8e32a2ab
+DIST qtdeclarative-everywhere-src-5.11.0-rc.tar.xz 22161644 BLAKE2B 0d41b2bd4982f4c92b6b7d4e3bf977e59b9ed2b82b8e13606c439585a24998a546218a8986a3f231b6cec5c82ce88cc9d79789d5ce902e05f71a8d0e5f5ecf6e SHA512 70e13b74401422f1a51b3c1794682a9bdeb16f5add7ab8c8d1eddee53c83054aeb26c0394e05add70ac520f5b0e94e3a613a3906593c8d681eb8700359c0cbcd
 DIST qtdeclarative-opensource-src-5.9.4.tar.xz 21454140 BLAKE2B a7e792406c2eb42422aba1b779e2249f081840c8237a119cf4d9a001fa34d1f5e48e30216c08be431a89bca52dd56d4241d92cdfdb8b684b0912449bd0c9301e SHA512 e9e425665df42826c2525566e08b3588aa73b0efea295eed301ba5caeea7208b90c5a91a55cc16986ea9e0ceb9c6658bd59f56a3a276601ad5780f2c67f5ad5c
 DIST qtdeclarative-opensource-src-5.9.5.tar.xz 21413796 BLAKE2B d8b365654eda101d5fa62736d6ed523c097310cce8c9a1ed4854b694903f9084aebf408c8f4a6a021175d6ee00763928201a071a798caf46c4245a9fda45436a SHA512 0d04b9f7ee299d1bad125dd839cac850c11ee8dff06192852489c5e8c8054b5b6e256bc20866ce45e3dad3eb0e11796994d649052645c6ff6fb289485038dcd4
 EBUILD qtdeclarative-4.8.7.ebuild 1493 BLAKE2B 1fc9ba56b9dd67fb840611e38e19a5bbc4b5f50d16cf7afbf9f384367ea03728f2d44aa1d14adf11ab44f8fba5532ce5f742803a5139f3ed25cf4f404e117d51 SHA512 b01c643b5d27f41e862260743be6701464ed145063ebb6642f5887b648b2f6e8c92c960d81e221a46c8aa7abc9461588953756390f080a7c6a02c53011338ca1
-EBUILD qtdeclarative-5.11.0_beta4.ebuild 1415 BLAKE2B e7d19fe7f65ae602510a2bdf1c3a76ceb0081caedf59f5a9f0bf9ed416c02ac4289c1bf079b84074ee377b6b8dbf8a18389c551710b55845692d4ec7978a08bc SHA512 b627a0c784670d6a4d660160b131b42ad7fb11874965535cd631836e0cc8bdba0ac46d9c790ec3d58e9bd6eb1af27c02d1ec7a2c7991bd8005cd75175befe603
-EBUILD qtdeclarative-5.7.1-r1.ebuild 1598 BLAKE2B 4ae8442e6f8febb5323bf7335bee054487bf5b8df757562129f9c3051ff0fb745fe50c2cea7efb50e0ca4b1b81298121f47f5de436a940b88396179d81bf8e91 SHA512 732fca74557642bb5cf5ec64f9d5efcb2a78bd81fd4f8bef8fcc9a1201c24b8c580faa37fd79c2c22aed5babb69cf61341f6bb44fc5d75b949b51af8c4737538
+EBUILD qtdeclarative-5.11.0_rc.ebuild 1415 BLAKE2B e7d19fe7f65ae602510a2bdf1c3a76ceb0081caedf59f5a9f0bf9ed416c02ac4289c1bf079b84074ee377b6b8dbf8a18389c551710b55845692d4ec7978a08bc SHA512 b627a0c784670d6a4d660160b131b42ad7fb11874965535cd631836e0cc8bdba0ac46d9c790ec3d58e9bd6eb1af27c02d1ec7a2c7991bd8005cd75175befe603
 EBUILD qtdeclarative-5.9.4.ebuild 1323 BLAKE2B ca629dea8c113c90fc4e6da40be37bcc43d89fa240cd836eb162e70268f329c6050eabbacc00575ba22084639bcf9a577648c46f5dffe6be740806dd965f19a3 SHA512 a6ecf2a3c673529b97c08fe45596dc84b5378797c14c8afc8eb7ed48bf6013c8f70aee4948a6d7b7c16cfaf070d147f70473c7dd03f1fe4de9a2006977b1c175
 EBUILD qtdeclarative-5.9.5-r1.ebuild 1381 BLAKE2B 93d66133efe327db501588288fb8ada735ef53aed5db25edc10a2c7638f5e90fd0540185218defc397e114d2f1f603cb93e465fffb6bc83d50458f76677d51ac SHA512 408d299677b09658b01911001b3b6c1547ff122a797464287fec2826feb0934b07e340454615e5e39811c5800082200c582a08470ae1119c1e55dc299e8019a4
 EBUILD qtdeclarative-5.9.5.ebuild 1327 BLAKE2B 23b4bc4d8e3ac878279add6e045450e842d0b59f42a2c4f7c61900f1e2455fff1964f189840b0fbca91b2592ebb656a41a27882295d7fa744fe6e2ca71b9209d SHA512 bd7a1a4a8b21fb3ce0ec122368eb4aa7543b2cab3a48b15c003aa80370a65f4babb5d6d55df9d55497d5bdd3f59ae7d6ac5a2da54416c687bdd047295e979e6c
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.0_beta4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.0_rc.ebuild
index 3da293ee8c4e..3da293ee8c4e 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11.0_beta4.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.0_rc.ebuild
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.7.1-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.7.1-r1.ebuild
deleted file mode 100644
index ed679ec61a54..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.7.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-inherit flag-o-matic python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="gles2 +jit localstorage +widgets xml"
-
-# qtgui[gles2=] is needed because of bug 504322
-COMMON_DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qttest-${PV}
-	localstorage? ( ~dev-qt/qtsql-${PV} )
-	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
-	xml? (
-		~dev-qt/qtnetwork-${PV}
-		~dev-qt/qtxmlpatterns-${PV}
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-qt/qtquickcontrols-5.7:5
-"
-
-src_prepare() {
-	# this is supposed to be handled by the build system (src/qml/qml.pro),
-	# fails because we override QMAKE_CXXFLAGS. bug 626070
-	if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then
-		append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse
-	fi
-
-	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
-
-	use localstorage || sed -i -e '/localstorage/d' \
-		src/imports/imports.pro || die
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt_use_disable_mod xml xmlpatterns \
-		src/imports/imports.pro \
-		tests/auto/quick/quick.pro \
-		tests/auto/quick/examples/examples.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index b2f7dffcaa80..9207eb66fa23 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,9 +1,7 @@
-DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645
-DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
+DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
-EBUILD qtdiag-5.11.0_beta4.ebuild 716 BLAKE2B d55f92d3fd1e005b7e156404d74d09137ca66da313e26b387e14780da28ff157957d13c6e460a36bdfd9167fe876fce79ff57618ea4e5a3375527dcddc7f27a5 SHA512 d795a0f96ca8fce4d58f8d5e79544956784f507a6b5bc35e141e104486dae1b8c25a8ac27b26726a44b9fa391897bfcc6dc55238f68bca2db1757224e7716f6d
-EBUILD qtdiag-5.7.1.ebuild 485 BLAKE2B 6314a5d4ce429af5278ac7882322a8695b7faaec8f26a29c6db4a8c5343890286bba1a68e3e2f8c8bc9d354411543e7e63978ad15f68b5d4fb5047c86ef37d1f SHA512 42d93ab515ab238de2bced22e53d32087a878617bac64357748ca727d8f83d99c7a585bc8cd17633592762c676cf65bc86417250902725c768c62ca8bf67f283
+EBUILD qtdiag-5.11.0_rc.ebuild 716 BLAKE2B d55f92d3fd1e005b7e156404d74d09137ca66da313e26b387e14780da28ff157957d13c6e460a36bdfd9167fe876fce79ff57618ea4e5a3375527dcddc7f27a5 SHA512 d795a0f96ca8fce4d58f8d5e79544956784f507a6b5bc35e141e104486dae1b8c25a8ac27b26726a44b9fa391897bfcc6dc55238f68bca2db1757224e7716f6d
 EBUILD qtdiag-5.9.4.ebuild 716 BLAKE2B d55f92d3fd1e005b7e156404d74d09137ca66da313e26b387e14780da28ff157957d13c6e460a36bdfd9167fe876fce79ff57618ea4e5a3375527dcddc7f27a5 SHA512 d795a0f96ca8fce4d58f8d5e79544956784f507a6b5bc35e141e104486dae1b8c25a8ac27b26726a44b9fa391897bfcc6dc55238f68bca2db1757224e7716f6d
 EBUILD qtdiag-5.9.5.ebuild 716 BLAKE2B d55f92d3fd1e005b7e156404d74d09137ca66da313e26b387e14780da28ff157957d13c6e460a36bdfd9167fe876fce79ff57618ea4e5a3375527dcddc7f27a5 SHA512 d795a0f96ca8fce4d58f8d5e79544956784f507a6b5bc35e141e104486dae1b8c25a8ac27b26726a44b9fa391897bfcc6dc55238f68bca2db1757224e7716f6d
 MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/qtdiag-5.11.0_beta4.ebuild b/dev-qt/qtdiag/qtdiag-5.11.0_rc.ebuild
index 85c0174e71a2..85c0174e71a2 100644
--- a/dev-qt/qtdiag/qtdiag-5.11.0_beta4.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.11.0_rc.ebuild
diff --git a/dev-qt/qtdiag/qtdiag-5.7.1.ebuild b/dev-qt/qtdiag/qtdiag-5.7.1.ebuild
deleted file mode 100644
index b1d4835c3258..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.7.1.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
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="+ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}[ssl=]
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtdiag
-)
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 48a64a028b8d..eee3498d5863 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,9 +1,7 @@
-DIST qtgraphicaleffects-everywhere-src-5.11.0-beta4.tar.xz 14269024 BLAKE2B a641ef6f426ae1d9ec59782e823e6d3b526f9d2a22409872ebb6faa20ced4f64d0b99e4929bef35c2e2b5ff38afce9535865e41128d56a973921ba53a78d81cb SHA512 7afcb94ba16543c94474f3aaae8be798e8879c432d11fea67e94d9462090cf1d800a2b2a8fe2f2287cdd0b046a518db995cc25983dbc7ddbc06c6e73e2d4331c
-DIST qtgraphicaleffects-opensource-src-5.7.1.tar.xz 14486948 BLAKE2B 62e0f19fdce08561848ab87768bfc56502d6f243769ee1b847dec018cbc231b1b64f95ca4032bc2fb1e6a73fb7f85dc51ebde2d551ec8be3b6571d07bfcd97e9 SHA512 2eb5fa078be65fbf1b57aca7106cd77c840aea3f13671445552ea4a5e0c6ff1625e30f58ca4919ea6dd76229931a307a77f172b604a55fc115569c4e446b5a3d
+DIST qtgraphicaleffects-everywhere-src-5.11.0-rc.tar.xz 14268564 BLAKE2B c9625092595f5c66f65ecbb2c2ab3a1d635b0e77db1cab0d4cb07a2f408f6cbf58bc3b06ed61a44c14deffe6910ca0b030d9814eef020a16cf1ff481131af126 SHA512 4655661f8ab861a9a5238a5ba27c7b2071a9d6fcecb170d615f0713aaf9f4e0baf85a7338eee75bece563b3eca57e429f14493e502689d3b1b643a8d1e0e7cf7
 DIST qtgraphicaleffects-opensource-src-5.9.4.tar.xz 14480512 BLAKE2B 1ec184f4b42bdd775dbeaf627844670c0f6316469f269d66845c84286b21dff94badb50e2f5a7e0f4335db0b04b12e37ae2b220cfee950e3eadbd6a2c2efffb1 SHA512 efe4d0fc022bff8e9f20b1224ed624a9499bae069576db957dd73c1da98922cc98e4c1e556180bc3512215631116581d1f76030b11ac9ece4f29a64564fdc6b7
 DIST qtgraphicaleffects-opensource-src-5.9.5.tar.xz 14226764 BLAKE2B e10589a569a164a3a1795e5db3038eea2b5e26809f26bdea634dd832376b0072ebb4887f245a518112b1bd22e061809e5182f41dc0ddaf48f04d7fba2b78fb7d SHA512 3707ce790802554862193b06bdcc7cb77d206ec071555feae69c3acada8c1b81396483a9ec07168d9203c382a7b2af694931ce15cb49738d3d1cfb48f66d333f
-EBUILD qtgraphicaleffects-5.11.0_beta4.ebuild 451 BLAKE2B b46592374ae4e7fd7c3bb609ec72b9718f62fa502148fb48a83fccf1e702d84c36a41fae24ed7365928545afd8431f28830116ee3a9557bb08321b109153a32b SHA512 ac77df06caaceac667ce524e3d22fe6a5831cf2d0cc9c2d59105e3b67b4983bbc426a6745eb7253effedf5472f1b7a4271679936608327fdccfe0ada5b4aff97
-EBUILD qtgraphicaleffects-5.7.1.ebuild 446 BLAKE2B 9a1d9b17096ff197c0eeaedce020777d32846ab0c08e87f2384c4902fca9cf6d07a25f8a3d05bddad6b4f622ff4463a7e29ee831ec199947a35bc30afa2b11ad SHA512 30184a13d86002cf18b3e9d5929021210134de9e08aee6e5a7c204ddb8a999fb5dfc936871f2d6720e69c19c03794a76678f6a49a80cedf4b520e4a2bdb7d210
+EBUILD qtgraphicaleffects-5.11.0_rc.ebuild 451 BLAKE2B b46592374ae4e7fd7c3bb609ec72b9718f62fa502148fb48a83fccf1e702d84c36a41fae24ed7365928545afd8431f28830116ee3a9557bb08321b109153a32b SHA512 ac77df06caaceac667ce524e3d22fe6a5831cf2d0cc9c2d59105e3b67b4983bbc426a6745eb7253effedf5472f1b7a4271679936608327fdccfe0ada5b4aff97
 EBUILD qtgraphicaleffects-5.9.4.ebuild 447 BLAKE2B f072e4fc5a96c5915f39f9db34a5df078ce6a7ef0aa329e7c19cf0bc27f3988e89ac44e1d9b03936c60573ccbee43ea23942d65353ace51e53ef8d9172688def SHA512 8081f61362bd69b686b3e26e26da1e9c074f3196a48171d50f72d5e31204ab05584af5f7b6074e598709efde88e05821b665d8413de9a8f9547ea14f07b72a1c
 EBUILD qtgraphicaleffects-5.9.5.ebuild 451 BLAKE2B b46592374ae4e7fd7c3bb609ec72b9718f62fa502148fb48a83fccf1e702d84c36a41fae24ed7365928545afd8431f28830116ee3a9557bb08321b109153a32b SHA512 ac77df06caaceac667ce524e3d22fe6a5831cf2d0cc9c2d59105e3b67b4983bbc426a6745eb7253effedf5472f1b7a4271679936608327fdccfe0ada5b4aff97
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.0_beta4.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.0_rc.ebuild
index 51a225a5a40d..51a225a5a40d 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.0_beta4.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.0_rc.ebuild
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.7.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.7.1.ebuild
deleted file mode 100644
index 916da510e991..000000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index a9c9b417f084..9bb2691aa12f 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,20 +1,16 @@
 AUX qtgui-4.7.3-cups.patch 3297 BLAKE2B 45c8668ffca24a7cfe9e02ec3fb3839f436470d55fb6f03a6a5890c7598bd3ec62c0bc62ecfd87ec530c210ef1c8e4d684c72109897ffe82456aa4225ce2b6ed SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee
 AUX qtgui-4.8.5-disable-gtk-theme-check.patch 1166 BLAKE2B 638fa282166a5ede48ff2b91532decab28969b392ae75c49860329e30018283f5206a367216027880e914e9a7ff4e16275fd364e8e99e52bacf460ecf6a637bb SHA512 c0f8b0c5bfb83552edc92af94669b15c85171aef72418dfa37a237f34b49e3999c939afed8b6c90391104c9ea305152ea85b0b0ad0e2400f5c64d6301a2c8d14
 AUX qtgui-4.8.5-qclipboard-delay.patch 1135 BLAKE2B 5972ab258ba5c60346f83a0c402edd39ea3c1fa777c59c6691e793d300956f1d966f37f6f35c187c95074872f8ccfb4b4cac8b255da462ddd3744cc67bc21108 SHA512 00c901fc9b9bd5b8ce45e8bb4dd4eda8832df7eda104ae1614d7cdac681d23f0daad543d0480f1d9366e2644833db680e0526660472a6cf1a907b803acf76517
-AUX qtgui-5.7.1-qclipboard.patch 1791 BLAKE2B a7753b78631bab6774ab5bd20deba153ee44dd41202531824571ff0596f9b731958b125a75fe464d8039bc327e5588f53f70b3be4c5a4eb640bf77af554d5552 SHA512 c765e7f1cf2e10b4fa90b2c4e3a4a39c9001996d4837eb86c1d298531dd30fc1f6a215addfd1bec88526451d7b2ff3ba8a53a330776c94851e79b1964336759c
-AUX qtgui-5.7.1-x32.patch 1161 BLAKE2B 5d475369d8a6312f0a2ab205b64739c9d7fd8b44132b10b00d29fb774ad837c45d6f50b4af776f7fa5fc2b19de9068922d1df5951084c5770e8a23f57b14f9c9 SHA512 61f6cc40c2897e17c0a71cb1d79bf8e6c69cbacf6409ae0d96f485584bd6a930484ecff709c208ca78335418e022c68151d096505f5db2179cb6c4c8b065c116
 AUX qtgui-5.9.4-libinput-pixeldelta.patch 3597 BLAKE2B 88f54e4c832f132472aea296e8bcc4cf318456af48db3e260eed30b620acf98af0cfa2abd6d396a1396be678e133f5721cccbc79877d4f8934606aba6a0d6d39 SHA512 47aa0fb3971cd956d08fac4ace0b98b4034178d00c89db3fe31060d548acb8a075621dc2fb43ef0357dee79a927f82a7626e6cdf784b009028ae1435f68176d4
 AUX qtgui-5.9.4-opengl.patch 3586 BLAKE2B 56e5192b0455c8d6ccd307466fe9583c7ac8f3a6114bc3bfed62dad36aa7f72eb505452da4fd2af1ea3b2bb24241ac1716332064e5a97d0c97951ea92ddd55a6 SHA512 d77fbd4e44d32f70b9047f7ae4531684e7d142b659be03ead0bce0252635a6bd35eaa8cd5d0cbcca59a19ee740f809ca6ad950dd199805fa6a379e41fbb68582
 AUX qtgui-5.9.4-qsimpledrag.patch 6887 BLAKE2B 9da87acfe69c1cb8b1dd92b05a7b919d01227d0aa1316adfe97261bd59a7e0eb3b1e6d9b0896cc2f6a6a64eac3f31f72039a3acc2767998a668656acc8d8ffc2 SHA512 8229b87a40287c3c6e74d5aec9bfc346a1e0f7002687ba661573566ff5f700c99819850fc97f07d3a36d63ba83348f2ab315f835e44abce22242b4d1f29e7c7b
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtbase-everywhere-src-5.11.0-beta4.tar.xz 46815720 BLAKE2B bf21828ed94d02140ebc5b9f366b935f944c40b8fe15094161a9c3d0adc16b2e8bfa7f4d514030569f5f463f39dd8083b6cacb536e71b1e81f743749c8742682 SHA512 c70b575729bdbd580d32350a233dfa1db3f450a3e0f4f41a5c8d153df396edc3f795099e4bf3447d3a0751f9acbc1978b4e499c6dbb6d9357c0288288b83d5ca
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
+DIST qtbase-everywhere-src-5.11.0-rc.tar.xz 46807012 BLAKE2B 76bcc9c71470f09ddb119e0098b58e5f505eb985e39a131100e4b7ddfaa8f5785e534296052631ae1407398e548a8fbf4ce23e05d6d1b5242d35c9ba7d1d08cc SHA512 3cd738f7f3179703275a8604709af70fba4148132ef6f2f8d13f8ea7c767c5f9ae3a11fd96cce49f090ecdf85fa04df0a8551d31d9d05c9efca50ab21ebcfd36
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
 DIST qtgui-systemtrayicon-plugin-system.patch 51377 BLAKE2B 2b57d485c9ceb2b7e23cd6f8aa3be955e70d779ab0ca849148435e2a212a2db48948dc689c06eb8aea484513081df56d86584cb98ad4d64fb86ceb15eb802f38 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679
 EBUILD qtgui-4.8.7.ebuild 5502 BLAKE2B 13e6c5954107a56b929e32402307c352d417b6a41b71d1265fd35fec5534050637ed76707e33d040d26e6d66e863337802a9b3c4b5dc82ac11f78123b561bb8a SHA512 ebb51a68680d6c89ce16aa31378c59c9c66283cac71ecd970ba3998437303a936b601bef3292dc58c24dd63e0ca6a3e1a2945175901d3757a58f05f16edfc697
-EBUILD qtgui-5.11.0_beta4.ebuild 3575 BLAKE2B 15a7cffcd567f34536923caae3ff68eca1d84fa4b1be92be840d25d8f6e20c1b34335ae5b17bcfdfc86a466c00db146a29a019a9177d73b520a263cbf7cf17e9 SHA512 a06f49a90f143375151bb3951cbfa9d9e6beda95a5b398df331115341a678c909b496f5be846818435f86d855decdbac40859c662307a3e504c92197e5dbb59e
-EBUILD qtgui-5.7.1-r1.ebuild 3792 BLAKE2B 0a65c076358bcacde64a74df90e471d4fdde27308b88556c7dc66563f9ffaafae2cf2d073cfd6232a31a488f240f357960a9daa8989c203bc904b710b8d7555f SHA512 f8d57932f30b17ea72cdebe7aa268e022df15a29bc3c3e2789f8c68b54a29e89d8c9b9a489cd6d5492e88dbc6f35cd9872d02ce920ef7b8d17878bfbfee10a7e
+EBUILD qtgui-5.11.0_rc.ebuild 3575 BLAKE2B 15a7cffcd567f34536923caae3ff68eca1d84fa4b1be92be840d25d8f6e20c1b34335ae5b17bcfdfc86a466c00db146a29a019a9177d73b520a263cbf7cf17e9 SHA512 a06f49a90f143375151bb3951cbfa9d9e6beda95a5b398df331115341a678c909b496f5be846818435f86d855decdbac40859c662307a3e504c92197e5dbb59e
 EBUILD qtgui-5.9.4-r3.ebuild 3725 BLAKE2B d83d8e0c8407a8d4e9c0b7ab22f9c5bea55d4ebccba03b17ea70d22d00bff15ffe9bf8bedc1c8ce860d3f80ccbe38bfbef60ba656c0524d6a4dddac95c0f7488 SHA512 9d1e09c76bc4581c54a17b635de66a478a95dbc23072c27e593f4fad0b207b4825ccd2ccac83c873f68cc4ecbd97cfe10cec40c07f784e2420c0d245656e877b
 EBUILD qtgui-5.9.5.ebuild 3557 BLAKE2B be2706465423cfc18e78f1a24bb883d630d2ea92248e67547412e3e838d8ee3ae4ac69ee7cecb54b34f6b32f08384361a970d1c53853b43d6a162646d8446a0b SHA512 d86f8853f952d48dc70c749240852a1ebf0baf3703b26ceade7b018c7b68e14fad83ef5bd2d0ca927842d360b0e0d5db3e8c295e0cd723fcb2372e51755702fc
 MISC metadata.xml 1862 BLAKE2B 062b123eab07ca09b1b6d63a9ce814a921b523c1861552a4f12903ccc8f627cf78e240d322c52b3a404ff154822a9cb42f894da5bc74a924d89dd51a42576115 SHA512 cba45629873eba71f152885640e51ad324b0dbb702c45811b4a1785a0af3baa7ce39923dfd0dbf7748d604e9a053d6580defdad75ad5ae228d37424d9b54e530
diff --git a/dev-qt/qtgui/files/qtgui-5.7.1-qclipboard.patch b/dev-qt/qtgui/files/qtgui-5.7.1-qclipboard.patch
deleted file mode 100644
index 42ee58b611fe..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.7.1-qclipboard.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 291eba6f8099a0fec8fbd9cf8a1fb67e5c9f4f8d Mon Sep 17 00:00:00 2001
-From: Palo Kisa <palo.kisa@gmail.com>
-Date: Mon, 7 Nov 2016 18:27:17 +0100
-Subject: QClipboard: Fix emitting changed() in XCB
-
-In XCB environment the QClipboard::changed() was not delivered if the
-QClipboard::clear() was issued by other Qt app/process.
-
-If the QClipboard::clear() is used, then the owner in
-xcb_xfixes_selection_notify_event_t is XCB_NONE, so we need make the
-decission to handle this event by the selection_timestamp and our
-m_timestamp[mode].
-
-Task-number: QTBUG-56972
-Change-Id: If4c486ac02223eac506465cac7ff1a07bd02a187
-Reviewed-by: Lars Knoll <lars.knoll@qt.io>
----
- src/plugins/platforms/xcb/qxcbclipboard.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp
-index d44ebae..40abef4 100644
---- a/src/plugins/platforms/xcb/qxcbclipboard.cpp
-+++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp
-@@ -723,8 +723,10 @@ void QXcbClipboard::handleXFixesSelectionRequest(xcb_xfixes_selection_notify_eve
-     if (mode > QClipboard::Selection)
-         return;
- 
--    // here we care only about the xfixes events that come from non Qt processes
--    if (event->owner != XCB_NONE && event->owner != owner()) {
-+    // Note1: Here we care only about the xfixes events that come from other processes.
-+    // Note2: If the QClipboard::clear() is issued, event->owner is XCB_NONE,
-+    // so we check selection_timestamp to not handle our own QClipboard::clear().
-+    if (event->owner != owner() && event->selection_timestamp > m_timestamp[mode]) {
-         if (!m_xClipboard[mode]) {
-             m_xClipboard[mode].reset(new QXcbClipboardMime(mode, this));
-         } else {
--- 
-cgit v1.0-4-g1e03
diff --git a/dev-qt/qtgui/files/qtgui-5.7.1-x32.patch b/dev-qt/qtgui/files/qtgui-5.7.1-x32.patch
deleted file mode 100644
index 9cfc29d1d088..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.7.1-x32.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 92805a0e9c488e47280e93f65e5378818e340ad1 Mon Sep 17 00:00:00 2001
-From: Laszlo Agocs <laszlo.agocs@qt.io>
-Date: Mon, 7 Nov 2016 11:23:21 +0100
-Subject: Fix EGL break on Debian X32
-
-Change to QT_POINTER_SIZE instead of Q_PROCESSOR_WORDSIZE. The latter
-is 8 due to targeting 64-bit, but pointers are 32-bit still in such
-builds. For the condition in question it is the pointer size that
-matters.
-
-Task-number: QTBUG-56686
-Change-Id: I96c203cae91ceb8404606de605c4fdb1a02a9d5f
-Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- src/platformsupport/eglconvenience/qt_egl_p.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/platformsupport/eglconvenience/qt_egl_p.h b/src/platformsupport/eglconvenience/qt_egl_p.h
-index 615ee4b80a..b1495c9f9d 100644
---- a/src/platformsupport/eglconvenience/qt_egl_p.h
-+++ b/src/platformsupport/eglconvenience/qt_egl_p.h
-@@ -83,7 +83,7 @@ struct QtEglConverter<uint32_t, uintptr_t>
-     { return v; }
- };
- 
--#if Q_PROCESSOR_WORDSIZE > 4
-+#if QT_POINTER_SIZE > 4
- template <>
- struct QtEglConverter<uintptr_t, uint32_t>
- {
--- 
-cgit v1.1-6-g87c4
-
diff --git a/dev-qt/qtgui/qtgui-5.11.0_beta4.ebuild b/dev-qt/qtgui/qtgui-5.11.0_rc.ebuild
index 034e4220eea8..034e4220eea8 100644
--- a/dev-qt/qtgui/qtgui-5.11.0_beta4.ebuild
+++ b/dev-qt/qtgui/qtgui-5.11.0_rc.ebuild
diff --git a/dev-qt/qtgui/qtgui-5.7.1-r1.ebuild b/dev-qt/qtgui/qtgui-5.7.1-r1.ebuild
deleted file mode 100644
index fc48b79fe7bd..000000000000
--- a/dev-qt/qtgui/qtgui-5.7.1-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk
-	ibus jpeg libinput +png tslib tuio +udev +xcb"
-REQUIRED_USE="
-	|| ( eglfs xcb )
-	accessibility? ( dbus xcb )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	xcb? ( gles2? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.0.6:=
-	>=sys-libs/zlib-1.2.5
-	virtual/opengl
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
-	eglfs? (
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-		!!x11-libs/cairo[qt4]
-	)
-	gles2? ( media-libs/mesa[gles2] )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( x11-libs/tslib )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	xcb? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libXi-1.7.4
-		x11-libs/libXrender
-		>=x11-libs/libxcb-1.10:=[xkb]
-		>=x11-libs/libxkbcommon-0.4.1[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qclipboard.patch" # QTBUG-56972, KDE bug #348390
-	"${FILESDIR}/${P}-x32.patch" # bug 623882
-)
-
-QT5_TARGET_SUBDIRS=(
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl
-	eglfs
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev
-	evdev:mtdev:
-	:fontconfig
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2::OPENGL_ES
-	gles2:opengles2:OPENGL_ES_2
-	gtk:gtk3:
-	!:no-gui:
-	:system-harfbuzz:HARFBUZZ
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon-evdev:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib
-	udev:libudev:
-	xcb:xcb:
-	xcb:xcb-glx:
-	xcb:xcb-plugin:
-	xcb:xcb-render:
-	xcb:xcb-sm:
-	xcb:xcb-xlib:
-	xcb:xinput2:
-	xcb::XKB
-	xcb:xrender
-)
-
-src_prepare() {
-	# egl_x11 is activated when both egl and xcb are enabled
-	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
-	# avoid automagic dep on qtdbus
-	use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
-		src/platformsupport/platformsupport.pro || die
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	# avoid automagic dep on qtnetwork
-	use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
-		src/plugins/generic/generic.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usex dbus -dbus-linked '')
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usex eglfs '-gbm -kms' '')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usex gif '' -no-gif)
-		$(qt_use gtk)
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		$(qt_use libinput xkbcommon-evdev)
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use xcb xcb system)
-		$(qt_use xcb xkbcommon-x11 system)
-		$(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 159c3ff6b341..5dcf023bd207 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -3,13 +3,11 @@ AUX qthelp-4.8.6-compat-syncqt.patch 884 BLAKE2B 25cb103e5c013c262d8c99cf2121808
 DIST qt-assistant-compat-headers-4.7.tar.gz 448 BLAKE2B ca3318ff64a4484faec0254d17f3831f75bc5d96ff6eef8dd57219076074c3b5cf23bdbc84266dc40c66231aba7342d9fb2cf9102c2bec05ce33d8854935a8e3 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb
 DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 BLAKE2B b84c207a7633229a1b06aee1560f969bc5088ef65d1c6366ac817017a5713c6c50915df95109fa1a8fadef4bf8c2de22d16dc95e36325a92f419051c1dcfe5b3 SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645
-DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
+DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
 EBUILD qthelp-4.8.7.ebuild 3122 BLAKE2B 5c8e30e3826be0493b2304890022648b2073a2e30bcea15c620aef22763dd0f7bbb6805553f44b411482dbfdab8bd83ba7412a331a605c29bbbb845d0d88c46f SHA512 d06253208591e380d378db2e3496c42940581b781c1c4e82fdd3dba9d2bea6623161d4ada16b80bd6fcf503d78f0eb83972932e3ada501104539587857261d58
-EBUILD qthelp-5.11.0_beta4.ebuild 652 BLAKE2B 7f6f32e0e641cb4fc3cb370b28ce1eb2cfef9a1179bf3201c29167928d8e46665ffbbc2699d54f61b31cbc8e10de6b2bc15665897dea40abbf6f2006c418b483 SHA512 430038abf54f5b7d4394fe6a02f488a59fb8cc2a09fd2431ca9b41f4a77456f6e7d56fa9ba6c1ae53b03c79f3cc0cf5af545959bbd3da3917fa179ad4404e99a
-EBUILD qthelp-5.7.1.ebuild 658 BLAKE2B a3b7559c278fc42b516582809f5fe2ed375ddba547eef32e484b08874b2e6978af1be0c95c738d00b3430f3fd8a7892c208b717e638a35cfed523cb1c91048c7 SHA512 40143c4add608d5971d4abeb557513f55e4c345ac3bc1ff4e38532267c8a9a9ec5a8c73eb29bc6e6146f839a2142e58067dc3fbe215231fd2888b6eed8dc5806
+EBUILD qthelp-5.11.0_rc.ebuild 652 BLAKE2B 7f6f32e0e641cb4fc3cb370b28ce1eb2cfef9a1179bf3201c29167928d8e46665ffbbc2699d54f61b31cbc8e10de6b2bc15665897dea40abbf6f2006c418b483 SHA512 430038abf54f5b7d4394fe6a02f488a59fb8cc2a09fd2431ca9b41f4a77456f6e7d56fa9ba6c1ae53b03c79f3cc0cf5af545959bbd3da3917fa179ad4404e99a
 EBUILD qthelp-5.9.4.ebuild 648 BLAKE2B 0d520f2d3f9d4670aebc9fe0f1d33298f90802818363f0314fbe0a8500be839adf3433ecdc436bae0944190b24de11a114fbd117f83a412b753c2dad0d517962 SHA512 cd10ec0a0413197b7558a0b3749ba70f8100316faae82df3b92c2bcc2389cf8e934623d06e905c04269211cbd563020e320e007e02ce45a24ff3dd3f087cb88b
 EBUILD qthelp-5.9.5.ebuild 652 BLAKE2B 7f6f32e0e641cb4fc3cb370b28ce1eb2cfef9a1179bf3201c29167928d8e46665ffbbc2699d54f61b31cbc8e10de6b2bc15665897dea40abbf6f2006c418b483 SHA512 430038abf54f5b7d4394fe6a02f488a59fb8cc2a09fd2431ca9b41f4a77456f6e7d56fa9ba6c1ae53b03c79f3cc0cf5af545959bbd3da3917fa179ad4404e99a
 MISC metadata.xml 825 BLAKE2B de978b130ccf71032fb98469ae3562a483b4fd791a13bab4f0d34990ad5638325c90b2ae057e870cc9d4af156114b90498d13828ea51dd2cbe9d3f1c3709b9a7 SHA512 54d474dfe7325966022026beab59b144932f523ced472f0d5d49f72727f6129923af821211fff3d42bc8dd02701e80f313e9e8c0f34e2cf18db1888ad8907026
diff --git a/dev-qt/qthelp/qthelp-5.11.0_beta4.ebuild b/dev-qt/qthelp/qthelp-5.11.0_rc.ebuild
index 1e0ee9ab67fe..1e0ee9ab67fe 100644
--- a/dev-qt/qthelp/qthelp-5.11.0_beta4.ebuild
+++ b/dev-qt/qthelp/qthelp-5.11.0_rc.ebuild
diff --git a/dev-qt/qthelp/qthelp-5.7.1.ebuild b/dev-qt/qthelp/qthelp-5.7.1.ebuild
deleted file mode 100644
index 612fcb84d0d1..000000000000
--- a/dev-qt/qthelp/qthelp-5.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating online documentation into applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/clucene
-	src/assistant/help
-	src/assistant/qcollectiongenerator
-	src/assistant/qhelpconverter
-	src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 048b01e605b3..d711c0274a03 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,9 +1,7 @@
-DIST qtimageformats-everywhere-src-5.11.0-beta4.tar.xz 2187636 BLAKE2B ba288cc54ffb1e167a67f54bc3b451b78a625a703249c7100770557b308fe9755e157bbda6aca2140f5769dcf492f9bd70cd1fb07adef53d8e708c9f5d0ebc70 SHA512 d9f6113dd1382edd8e6fcc5328e83844c809082027f849f4ec034426fff5d04fa4eb472c78ee8044b6f5b7dfc983df3c640a9d929927e91b64fc598714464178
-DIST qtimageformats-opensource-src-5.7.1.tar.xz 2004376 BLAKE2B 9cc015133ca70dc6d6e542e9c10921352b5c1e529ea03165e0b0443e679fee8987d2fb4f4ec430d0ae164b77b50029e61f149e063501a6f855fcc78050cfc4c9 SHA512 b70fe30b20da8f613f05ae68bf879956341206005d1eff3c34fc279da6b219ff7983d41c2c0c057c85500a2c5826286c63f4c209dc2db84d03848241257be553
+DIST qtimageformats-everywhere-src-5.11.0-rc.tar.xz 2187272 BLAKE2B a131670813b23077d7e6c20332f08da995c2e517084e42059e9bd48ce008bc754c9c6c4b3b8934c8407b993d789d7a5c6e133f337dabbb277ad90c919225ff01 SHA512 0f30bb7b47cd423a1b8a4b5d584a298658f4a04dfcd113eaeb20caca6291c97ccb81aad421541799030e1cc3a36eb2d02a35a9a2a04b2683d7694f25085ed44a
 DIST qtimageformats-opensource-src-5.9.4.tar.xz 2106852 BLAKE2B 31f0f5d6c545f04b2be4bd657acce63adb15a45d4b0471b249e39063ae47635a8c5338f44cc0af88ca0c960d399384a911add12f7cd2815c808ddc28d7f5e924 SHA512 91ebe0d4cc67b3d3c55da4dd5d08028f7046819fdc4034ed0ddec075443ebe3775690856a7aa7704ee3ad8893948f79bdc72467fdfea6a0a8ce6fb16b3f5ab5a
 DIST qtimageformats-opensource-src-5.9.5.tar.xz 2107848 BLAKE2B 086ea0f32174329910f7ad56425d18e8b46005bacd5dd4aa7446deb004d6a5d5940a087c63641589dd62415de813d56f971f59ae5c1b34e375b7ef3d2eacf86a SHA512 0cf4b8c06b8b25b2a82070f96d7887234765495f38ef5ff9247b8b58a9601f75e1d588fe365dede2b1435b798df3c2ce9b52ea0a6de46c0d8c9b74dca094dd05
-EBUILD qtimageformats-5.11.0_beta4.ebuild 603 BLAKE2B cec8884f77d29bdbe71a53356ceb70d9ba84ad1d835d04c822228def82139a37232e38699cdbb32dce0ce13def2bf8aa18e2bdd773b582ebfc6f98a1eb3eba08 SHA512 32f9dc774d5a0ac1837384975a7487f75a12aed24f059d7c17a1d377a5085b363c0d1992dee852f79b143a92366e4533db326db447dbb4e8e9c517425be19d09
-EBUILD qtimageformats-5.7.1.ebuild 455 BLAKE2B 55d81da37a7f8c55bda94fe77d7a7411217e738bf32d0a93f632e1cefea47c29d30877ff36a55cb61481e9f0b47c2e70641d1bff1abd4541cd0dcda25b0049e4 SHA512 e0b66f1116601b4782913cda26836d42e13170887f00e5a74ab0983bdf1d53c9c60c98499b75a556e627df106268b40f0f8a0f5cc5b3877e6b1896cf33fd55b9
+EBUILD qtimageformats-5.11.0_rc.ebuild 603 BLAKE2B cec8884f77d29bdbe71a53356ceb70d9ba84ad1d835d04c822228def82139a37232e38699cdbb32dce0ce13def2bf8aa18e2bdd773b582ebfc6f98a1eb3eba08 SHA512 32f9dc774d5a0ac1837384975a7487f75a12aed24f059d7c17a1d377a5085b363c0d1992dee852f79b143a92366e4533db326db447dbb4e8e9c517425be19d09
 EBUILD qtimageformats-5.9.4.ebuild 600 BLAKE2B 39cf7f793293f6096eceaa89c41425b4ecb88cb063e5d1c44d0e42e2f4b183cc94e6f1638961296cec7974fb2ee3b20345d3d444ec8f4ae0b7644d084c5205c4 SHA512 aadcee78707fca3ca8fc643fe48b32f0b9fda320ddaec62766ab012fc0e7b9eeb43f4dfe384b2eb302421f56d87e1b7576b52acedadde039ff3349cb8564314f
 EBUILD qtimageformats-5.9.5.ebuild 603 BLAKE2B cec8884f77d29bdbe71a53356ceb70d9ba84ad1d835d04c822228def82139a37232e38699cdbb32dce0ce13def2bf8aa18e2bdd773b582ebfc6f98a1eb3eba08 SHA512 32f9dc774d5a0ac1837384975a7487f75a12aed24f059d7c17a1d377a5085b363c0d1992dee852f79b143a92366e4533db326db447dbb4e8e9c517425be19d09
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.11.0_beta4.ebuild b/dev-qt/qtimageformats/qtimageformats-5.11.0_rc.ebuild
index 5b10805b2ac2..5b10805b2ac2 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.11.0_beta4.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.11.0_rc.ebuild
diff --git a/dev-qt/qtimageformats/qtimageformats-5.7.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.7.1.ebuild
deleted file mode 100644
index ddb527bde9d1..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.7.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
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	media-libs/jasper:=
-	media-libs/libmng:=
-	media-libs/libwebp:=
-	media-libs/tiff:0
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 5fd4b5fa23cd..5fc76807d958 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,9 +1,7 @@
-DIST qtlocation-everywhere-src-5.11.0-beta4.tar.xz 5520552 BLAKE2B b51c329738fb2d926cef11a4f0bbfd1bcfcac9170365896aa4e6d8752e3fbcc50530bbdf14d471e445315a765045ed216a9dd7695407e3b610bbca0a714ff164 SHA512 8e68df472c98d7c6aeb1f0d0a8444c3bb17ce92d96621454acc5ef86c02ad8f3576976b50d1ad83419e2b8439cafaa80d05d2605f753e56a2c86290cc9d6c272
-DIST qtlocation-opensource-src-5.7.1.tar.xz 3194112 BLAKE2B b5ac3bed420507c4a03b382c23d02cf0638c64e4921872930ec22394c3eaef7b7abaf7830d40c3aa2c9888e91724d5795b17a6d2a37f2f21b97285ef7d0dfd69 SHA512 a3e0318ad348edd6d9cb4762d4fc6230a47984fcf526f55cc2c9bc00e2e70fdb1380866ec8906e3f58669c62464f8747c948d85107a2d30be1e98da27c7739d4
+DIST qtlocation-everywhere-src-5.11.0-rc.tar.xz 5530380 BLAKE2B ee1074814a272dce3350814c5e3c3c4221ee35f3945948e934803f94aafcab8a8769ed7720f7deaac8a61615f32d2e7aca3112faa8673ecad78cb07042f0638a SHA512 72b1e3f351b64f8cd4c979325dd1916bf3f57ad1c31630dc21130c43269db75b2ac6a361cd18a5705d48e1fd870326e1de8001841a5d93b4bfe476524587b622
 DIST qtlocation-opensource-src-5.9.4.tar.xz 5405252 BLAKE2B 6474251b21baaac6182a0197a7736dcae86d0735e8be499c9bfefa639b3a45c750fa9bfef766849fbf6d7c5db518e5712e0862463e98168e2a3121582966d834 SHA512 a97de23a554f709a39ac8517de85c9beb7e1a8330ba3996593aeb3d64d1c5b8d8b08b0c94df435dcbb4ba5807e262ac6f87ec9620694805e0261a4b2ee8456cb
 DIST qtlocation-opensource-src-5.9.5.tar.xz 5405920 BLAKE2B cd405d3a1eeed95c1c9f8759cc0d3c34d532de6f11c030296cb652e37aba66628578551fc73d5e283a373426b1e7b816b092cad1329d0a61f349650e88836a53 SHA512 80d8a8f3e82238c8a7f3e37999d5f118857e0037e60979de00219db45b3c716e6ac092f0b848c00cccbeb0ac19a1a2f4479bf92c7db701de1b3d239161d46d15
-EBUILD qtlocation-5.11.0_beta4.ebuild 924 BLAKE2B 29c9eab14fd35bd299e880fb12d06df88f44c9ffea761f04f92d119224ea5554620cd044c66a9b0ef0f51a9b26162788fd4d48873353680ccbda8a20e17223a0 SHA512 df70b1dd13f3953790803cb768e84a53dfb05d988d4ce135c2c5828b1736f9f9b2a0df710eb2141396e4cb3633025e938ac99d46e1cdb92b3ae82fb3d096adcb
-EBUILD qtlocation-5.7.1.ebuild 537 BLAKE2B 8180f414cf9ce74285e91eed2aad13b298496e07ec5739bf09d22142a00db0fa546b1ac623820efc6702a66e1398408617bbc991fbac339a1ec21ec7e2889c68 SHA512 fd686ef629bcbdee03a9738b2a2d75464c2099830a38f165427ce475f386b5a459621a033e0ef0044fc10da2ca7d545a78e82a23b7328338ecc38407b53151a8
+EBUILD qtlocation-5.11.0_rc.ebuild 924 BLAKE2B 29c9eab14fd35bd299e880fb12d06df88f44c9ffea761f04f92d119224ea5554620cd044c66a9b0ef0f51a9b26162788fd4d48873353680ccbda8a20e17223a0 SHA512 df70b1dd13f3953790803cb768e84a53dfb05d988d4ce135c2c5828b1736f9f9b2a0df710eb2141396e4cb3633025e938ac99d46e1cdb92b3ae82fb3d096adcb
 EBUILD qtlocation-5.9.4.ebuild 922 BLAKE2B cbcea33ab0f866d580839df171c7d85cb75aeeb6c9cfdd27d8983520e38d1757bbecc899123058b18bca2a444562eee62a48d8b111be6703aad90b23ab6c4624 SHA512 26a0f3b6f88c3aebcbfaabc1da94771726c8a3181920a4f78f48770aac9ff119137099ffdc480276beeaacfeb11b375e85112482e0584615cf5bdbb6c92abd88
 EBUILD qtlocation-5.9.5.ebuild 924 BLAKE2B 29c9eab14fd35bd299e880fb12d06df88f44c9ffea761f04f92d119224ea5554620cd044c66a9b0ef0f51a9b26162788fd4d48873353680ccbda8a20e17223a0 SHA512 df70b1dd13f3953790803cb768e84a53dfb05d988d4ce135c2c5828b1736f9f9b2a0df710eb2141396e4cb3633025e938ac99d46e1cdb92b3ae82fb3d096adcb
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.11.0_beta4.ebuild b/dev-qt/qtlocation/qtlocation-5.11.0_rc.ebuild
index f791b5b325e3..f791b5b325e3 100644
--- a/dev-qt/qtlocation/qtlocation-5.11.0_beta4.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.11.0_rc.ebuild
diff --git a/dev-qt/qtlocation/qtlocation-5.7.1.ebuild b/dev-qt/qtlocation/qtlocation-5.7.1.ebuild
deleted file mode 100644
index 1606820cf103..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="The Location module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtpositioning-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty
-	src/location
-	src/imports/location
-	src/plugins/geoservices
-)
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index a1888b7e3e0e..1de71fff1716 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,13 +1,11 @@
 AUX qtmultimedia-4.8.0-alsa.patch 2155 BLAKE2B 23b713531f7e4c63f568fd284d74586506acee583afe897bb40b53f2eb5e2a0178b353107e64f8d85d1fdd2c2f04a7eb0dbdcdfa648bfa6d2d4769c05275c36d SHA512 725dc78b861c82393ecd97ce293f9c165067ca940332fab22ecc252880e1c08aae301d54ddcdf38df9d32907c57bc70d772891a6dc9fdacf740de32b363f4aa4
 AUX qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch 6852 BLAKE2B fb9507a5ee7793c20e435896e553df808860f0ba1a1a9495325b8ecd06b06b0070f03bcec9313c509cad0cef8dc844ff48e00073d8c5b320b980ff8d9b694fef SHA512 ff513b5c68a02179e0a36803367b4dfe9f8c351fb76296570a2b382d2a1dd43fcb99033ab7844c52253c95124e2246cb81d68aa8e64e16c89d37bccaffcd9dea
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtmultimedia-everywhere-src-5.11.0-beta4.tar.xz 3680544 BLAKE2B 24475dbfa9593dc1639ad0d0c79c07bdee710ade983ecc9b73640650eb5416e067466672488eb12f240a43f6cf8f642ff6863250c7e8673ba32b2105fc2d8f3b SHA512 ab858172f1350a32933780cf6c988aebf62828bf7b282f85cbbf45167ba1caa90efe11d00a8bd9441af09c7a7eb82e86b5f82d9bce3321fd2768a08d564cbf5a
-DIST qtmultimedia-opensource-src-5.7.1.tar.xz 3563676 BLAKE2B 51ff5ef507ae82eda236143326b2c553038ee01d77f70c3bd756160ce30851509e989244ca19edbfc18a9cdbe20189c8c84715c3ed79b76604e9c82144b51f92 SHA512 1415a4c29416ead2528ddb040a3c69480408509c6ba573f44295513bfe2aa62b8e8bb97cbd33713e605f094e1c1e1337507904d2b0c6480ddf9cf75393d8e97f
+DIST qtmultimedia-everywhere-src-5.11.0-rc.tar.xz 3676792 BLAKE2B 637c08d03a632228f63db7099965d43c97320159addd2254be862f7177d9ed0fac5dde38580b7930a97cba058d5248a4ff10b8dd0e669aef59de3f0bb484486b SHA512 7270d5902ab4c63221683c1a5a2dba52dbb4d57af4f1c9e14d6d449be34322288e9624df0ceb41df167fb8042589c37bfdc6663d0f706c5fc5bfd1b38621f587
 DIST qtmultimedia-opensource-src-5.9.4.tar.xz 3608792 BLAKE2B ac377b3cf33d727fa129fe623cc9ba9ea75555b2af7f70cf07524598d4044a94617b3627f7fd3a915596e51ac53040b9d72a5fcaa2faf316150a2c1ead220def SHA512 7a60434736f655900d00e70a68e5781f336446938f4f2b617e1d93205b7319bf01be987c001a9e6838ba5fd9e3afe3f20137597b6c27f6f77ee55486e283d425
 DIST qtmultimedia-opensource-src-5.9.5.tar.xz 3585644 BLAKE2B 38815c4668c70294f27fb7a6522ee4c3443636eb52d9beec3a640fce5a78b4be511ed5d632b5ae1346040554ccec961aab733f57fe314639a227e957fd5e117d SHA512 4e320c4f8a55b7801aac36f87e16a0284e0d0e6d7812318b56a1f82970e14794cf431bfdf19d24606d985a4d98e670baf2cd812edf8ced92d85b72aae4749a56
 EBUILD qtmultimedia-4.8.7.ebuild 1298 BLAKE2B 2e78e5f2f0dfbf43aaabd1abcf06fb05a3612029bb9ed2f1007cda90ed32665cea64b2f56e7b64b879400a3a66ba4907fbacefa5bd431fce1a08b0db3c61c8cc SHA512 d7a6fb8aa9927fadfd23e59a695818b8e066ccba71877848669358fa640064a6dee16c38ba988e2501e3350939fddc13c6ec90791c1b7c670f1e654b6a5fe6d0
-EBUILD qtmultimedia-5.11.0_beta4.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
-EBUILD qtmultimedia-5.7.1.ebuild 1500 BLAKE2B b7f6cb555da958ce36372c8f9e1ce586ae2442b58b06732ed60f4a6eb827fe9540fa6bd4a3de330696e5c1297fd6419fd6faa957058f7a04eec6c014fbca60ab SHA512 f01033996921f46760e8ad7c3028fa51b4a95da3756f855a36c6e47220110858f7c861e1f01ab2213b6203ba4896ec51e5c93c9fabc8f4798156c5c5f89e8959
+EBUILD qtmultimedia-5.11.0_rc.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
 EBUILD qtmultimedia-5.9.4-r1.ebuild 1460 BLAKE2B e845058b50a99d2744c32adc8044b0144988bfe898770e9f5f7a316eee2e5ed17974a36ad1e9ddef786ae8f789b16221534d56eea9d84ca713b7960e8810a764 SHA512 f5f1131f8915e62c8978663187f3a02b4f19fcb8285b4557f809fa1bef9c4277d7b2fe8b4c6fe92b3f55333bea1e4244f94e5af52539968aa15b98b810d55c5a
 EBUILD qtmultimedia-5.9.4.ebuild 1351 BLAKE2B 6ffd46d9ac8586ccd662757ba2119fd40f6788c9930436eeeaf8639d1f44c2c62c3251719e4752a8781a9cd422d3b52322eea88462f9f00f84156065cba22dc5 SHA512 40b7d32b7f77d1cb9e84be35ea9580b36c8aca9701a206616ffef299255b1fd67ac153ccb55e555ca779c5be82d657141e5fccf64f737912673b66cf9103bf21
 EBUILD qtmultimedia-5.9.5.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.0_rc.ebuild
index 04cc34da1d15..04cc34da1d15 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.0_rc.ebuild
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild
deleted file mode 100644
index 5c2c8c280424..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtnetwork-${PV}
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2=]
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	# do not rely on qtbase configuration
-	sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
-		qtmultimedia.pro || die
-
-	qt_use_compile_test alsa
-	qt_use_compile_test gstreamer
-	qt_use_compile_test openal
-	qt_use_compile_test pulseaudio
-
-	qt_use_disable_mod qml quick \
-		src/src.pro \
-		src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/gsttools/gsttools.pro \
-		src/plugins/gstreamer/common.pri
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex gstreamer 'GST_VERSION=1.0' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 6c611fb1c330..c42e44767a08 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,9 +1,7 @@
-DIST qtbase-everywhere-src-5.11.0-beta4.tar.xz 46815720 BLAKE2B bf21828ed94d02140ebc5b9f366b935f944c40b8fe15094161a9c3d0adc16b2e8bfa7f4d514030569f5f463f39dd8083b6cacb536e71b1e81f743749c8742682 SHA512 c70b575729bdbd580d32350a233dfa1db3f450a3e0f4f41a5c8d153df396edc3f795099e4bf3447d3a0751f9acbc1978b4e499c6dbb6d9357c0288288b83d5ca
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
+DIST qtbase-everywhere-src-5.11.0-rc.tar.xz 46807012 BLAKE2B 76bcc9c71470f09ddb119e0098b58e5f505eb985e39a131100e4b7ddfaa8f5785e534296052631ae1407398e548a8fbf4ce23e05d6d1b5242d35c9ba7d1d08cc SHA512 3cd738f7f3179703275a8604709af70fba4148132ef6f2f8d13f8ea7c767c5f9ae3a11fd96cce49f090ecdf85fa04df0a8551d31d9d05c9efca50ab21ebcfd36
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
-EBUILD qtnetwork-5.11.0_beta4.ebuild 1227 BLAKE2B bf6929d3cfa5142bde4baf968f50c5383b88c606a04a31ddca92514a249135cadcb130b53b3373bf83a394f8f48bc0c36bf7e163042a3658076e30bd412f7784 SHA512 194552deb74fd57d827872d53626c30e97f9a84a9aab160247c4711b621e13fe453b6ed291f92e77dbba9b1002f3f6806bdc5ecd9b531abf16e694829f0fbf12
-EBUILD qtnetwork-5.7.1.ebuild 1168 BLAKE2B 09b253aa055853e7a88ee0bf57a0a97b6cc7cbfa2b55f30a751c819a7be8b539f68aebe44e45bb3a85c03ebc9cc569bd0f4ecd45928da057e4e0b01223d16e0c SHA512 0d7d306fbc0dd47d697709e738a7f65f478d1fe2213aae5e5054151aedb1c2e8b0f1de2a40b1f19087d57cc98b84418b8e9df6f491af31742ab637f9ce9b53fe
+EBUILD qtnetwork-5.11.0_rc.ebuild 1227 BLAKE2B bf6929d3cfa5142bde4baf968f50c5383b88c606a04a31ddca92514a249135cadcb130b53b3373bf83a394f8f48bc0c36bf7e163042a3658076e30bd412f7784 SHA512 194552deb74fd57d827872d53626c30e97f9a84a9aab160247c4711b621e13fe453b6ed291f92e77dbba9b1002f3f6806bdc5ecd9b531abf16e694829f0fbf12
 EBUILD qtnetwork-5.9.4.ebuild 1287 BLAKE2B 970af30659e4e4df96b619d5db6d052d3141c4736ee8e5a6893d72208785f19af48008d5dd614b631429d38d4fb04aef2193093288eee8051b93d97e52bd05b2 SHA512 4e39ee832dba2c0de5210366e59d05b4acd917b67f3d09d5bf8e1f602626edb0f25afaad4f8f2d06ba52fdb0454d461b9d35cd6028e61a63f92df86a8ea7485b
 EBUILD qtnetwork-5.9.5.ebuild 1291 BLAKE2B 6bc80b4206a5f9ad29976872e56cd9df3058d3370fea848b59ecdf2f8b23690430fce266cf190da9cfe617752ee437a5ae5f1bf9d5aff56b86ac596b06a7c2ec SHA512 4336be7864fdf74dc2297dd844db3bed26e622b90a728886469af3ff00b686edbf5f525b724e4f1aff0967f6640955ab5757b42aae0339ed70938c158be22892
 MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/qtnetwork-5.11.0_beta4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.11.0_rc.ebuild
index 95290d66781c..95290d66781c 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.11.0_beta4.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.11.0_rc.ebuild
diff --git a/dev-qt/qtnetwork/qtnetwork-5.7.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.7.1.ebuild
deleted file mode 100644
index 445352fe2148..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.7.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="bindist connman libproxy networkmanager +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	>=sys-libs/zlib-1.2.5
-	connman? ( ~dev-qt/qtdbus-${PV} )
-	libproxy? ( net-libs/libproxy )
-	networkmanager? ( ~dev-qt/qtdbus-${PV} )
-	ssl? ( dev-libs/openssl:0[bindist=] )
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/network
-	src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
-	libproxy
-	ssl::SSL
-	ssl::OPENSSL
-	ssl:openssl-linked:LINKED_OPENSSL
-)
-
-pkg_setup() {
-	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
-	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
-	local myconf=(
-		$(use connman || use networkmanager && echo -dbus-linked)
-		$(qt_use libproxy)
-		$(usex ssl -openssl-linked '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index 437643cfe75c..a1f096fafad5 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,7 +1,7 @@
-DIST qtnetworkauth-everywhere-src-5.11.0-beta4.tar.xz 138816 BLAKE2B dab72a3ece98a6d1dafa47199b35bd4eb56781e15d21998742593f3bb182e944940ede7d05bef5ccf99cbd1975181749d481756db81d4f87161220e43d2b0475 SHA512 40ff2884929d97bffc2a4ce63d8645946bece7dd2848d106490ccc5fc3f71a60e07a26b2543bf6a8597b62abb7b075db9c876761e3f9b35c931804a5627248ba
+DIST qtnetworkauth-everywhere-src-5.11.0-rc.tar.xz 138720 BLAKE2B ea9245b09272ea43de1f382e418eb8e0d1397a2b546ca6e9ce93f560efc9e28b2649fb4285042c60621e1a9d27c0dfd22a00ab849a8a9a7fc32b8966fecdc131 SHA512 fe8eb3e0d039257961ae8d8e4797a359c289f62282af7a880a01014e28ee38e324ebbc70ec46ea0998817da97a9513dd2085845529590e7c4f490dbb747a2ed7
 DIST qtnetworkauth-opensource-src-5.9.4.tar.xz 112244 BLAKE2B 9e75f8f11062b064b98421d9b9ed73cc18351eec788398922b22fa5b528f34baf2290c0595e2cdcad6afe6a0061ddbf37d9bbd2ec977a5ba713c692a125fca6d SHA512 a38e0cd3619ec25b2f7c749522b42f72bb024ef2415449349f7cdceaa9cdf5905c78c6b82bb7ce58b0c8f00ff883d2d79d11e12a9bfead014b553d431190abb2
 DIST qtnetworkauth-opensource-src-5.9.5.tar.xz 112260 BLAKE2B 57b985f048723c4a4994fbcabd7aa2c37c084ccd69fbc855f59628307ee2456c6eeeb3b25fb61e99a7486947baf82f25d22c9db177fde5b06c11dbf7ab844ca9 SHA512 2def0d80065a77855d1b9f46e2760391cfd817167e4b93426306421a76bcf75da07ecf70b65f56ea5881e9a27d70dec1a1041605fd156b3cafb14b46b0d23e8b
-EBUILD qtnetworkauth-5.11.0_beta4.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
+EBUILD qtnetworkauth-5.11.0_rc.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
 EBUILD qtnetworkauth-5.9.4.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
 EBUILD qtnetworkauth-5.9.5.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.11.0_beta4.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.11.0_rc.ebuild
index a1e6dc628e9d..a1e6dc628e9d 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.11.0_beta4.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.11.0_rc.ebuild
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index ce1a01ca5012..5e6bd9a7365e 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,11 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtbase-everywhere-src-5.11.0-beta4.tar.xz 46815720 BLAKE2B bf21828ed94d02140ebc5b9f366b935f944c40b8fe15094161a9c3d0adc16b2e8bfa7f4d514030569f5f463f39dd8083b6cacb536e71b1e81f743749c8742682 SHA512 c70b575729bdbd580d32350a233dfa1db3f450a3e0f4f41a5c8d153df396edc3f795099e4bf3447d3a0751f9acbc1978b4e499c6dbb6d9357c0288288b83d5ca
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
+DIST qtbase-everywhere-src-5.11.0-rc.tar.xz 46807012 BLAKE2B 76bcc9c71470f09ddb119e0098b58e5f505eb985e39a131100e4b7ddfaa8f5785e534296052631ae1407398e548a8fbf4ce23e05d6d1b5242d35c9ba7d1d08cc SHA512 3cd738f7f3179703275a8604709af70fba4148132ef6f2f8d13f8ea7c767c5f9ae3a11fd96cce49f090ecdf85fa04df0a8551d31d9d05c9efca50ab21ebcfd36
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
 EBUILD qtopengl-4.8.7.ebuild 1100 BLAKE2B 38f986aed1ac6fc40b6037cb17fece5ab7d759a2f79d0d28ba18e3ac09691673ce0dab0942301d06bcb11675c96b48cde6435c80a9e22f865884f5b5559e1558 SHA512 d099ac28dc473121906eae72560d5a100a8a085a110d82ebeb87ca8e9109dcd62c5cb4dae107b0adf15d2ee34b0a13de095de00096a3dc0bfc7f535d97bbaf01
-EBUILD qtopengl-5.11.0_beta4.ebuild 648 BLAKE2B 2ed179d870443194faebbfeb074111043d3a75da80c89a61f7b94c104b9a0fedd4fc5c1788b657ad76f6f76e4cbcf779b0983c3cc321965f2471d570e81a4be8 SHA512 459886ec36695f2d441a9b3b869366b2e84d97b99924c94af111fac822ef406c7b226c50de93afd844dc372e14073cba23ae976d068abffaebab5da0aae15e8a
-EBUILD qtopengl-5.7.1.ebuild 631 BLAKE2B f2893aaee38cd132a7ce775da1ca7c5dce8eb6b1a8af8a68337d363723063cc4f761f98b8698e631f42e9a2d4a23080e841504de3a2e7ba92004d95614394e2f SHA512 d99c51bd8dcae9977a0e209893afeda6f2355a550960fbf4ba86afffa5c12a3dc7017b4a7b947eee259bc631ce5e1eafa285cc131923afcfd9a2e8fa3652b21e
+EBUILD qtopengl-5.11.0_rc.ebuild 648 BLAKE2B 2ed179d870443194faebbfeb074111043d3a75da80c89a61f7b94c104b9a0fedd4fc5c1788b657ad76f6f76e4cbcf779b0983c3cc321965f2471d570e81a4be8 SHA512 459886ec36695f2d441a9b3b869366b2e84d97b99924c94af111fac822ef406c7b226c50de93afd844dc372e14073cba23ae976d068abffaebab5da0aae15e8a
 EBUILD qtopengl-5.9.4.ebuild 644 BLAKE2B 39c9006f5b9bf93fc18b0e78b18026d0bf15ded8281c3b5327fcd8030b3fcbfd05443d7e7e37a5b8eabf8ab7086cb98fe786fb5ca601621b51b6f6ca2a8c4ecc SHA512 e7e3b6b1a7c5e708b150387416ae0435f52833dc070a193ed232bb531a3cf6d69acc32f267dde7afe96dc0eeeca618f564ff7112b4b1ca96c189f055c46c189a
 EBUILD qtopengl-5.9.5.ebuild 648 BLAKE2B 2ed179d870443194faebbfeb074111043d3a75da80c89a61f7b94c104b9a0fedd4fc5c1788b657ad76f6f76e4cbcf779b0983c3cc321965f2471d570e81a4be8 SHA512 459886ec36695f2d441a9b3b869366b2e84d97b99924c94af111fac822ef406c7b226c50de93afd844dc372e14073cba23ae976d068abffaebab5da0aae15e8a
 MISC metadata.xml 849 BLAKE2B 626ede10341fed23cd36a62710da3423c49fa4421d4f8dd883df3c1a0d157f4a4d343632763c542093566a8967050bb4a3cccac015f4aedba25471a4e03a591a SHA512 98644de5d50d3392db4099551755340012a29ef9ae129038eb64ff1aca49f2de34442d7fd8e4f6c457366148a7d9288843f7ea023d0759a71aadab3a419aad41
diff --git a/dev-qt/qtopengl/qtopengl-5.11.0_beta4.ebuild b/dev-qt/qtopengl/qtopengl-5.11.0_rc.ebuild
index 5dfd96944027..5dfd96944027 100644
--- a/dev-qt/qtopengl/qtopengl-5.11.0_beta4.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.11.0_rc.ebuild
diff --git a/dev-qt/qtopengl/qtopengl-5.7.1.ebuild b/dev-qt/qtopengl/qtopengl-5.7.1.ebuild
deleted file mode 100644
index f1c9248875d2..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.7.1.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
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="gles2"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/opengl
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 3f726f1ee72a..9b334ef88dd7 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,9 +1,7 @@
-DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645
-DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
+DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
-EBUILD qtpaths-5.11.0_beta4.ebuild 409 BLAKE2B 820f78dbae4037a591f1488a58215769ea69fb16c585df730f80e7ae33dbf599a42ab36cc645e88ec4dd704a470918ff3825aa17a380e5f7c534dda3b46e94bf SHA512 14ebdcb7dfc35806c5fc91eb01bfb9bb01134ff4003e43ec5e5b5aeaa292942be461893e0e792bbac90a9de612f0cf5b4680b7c925ae51e21f55ace890eb8740
-EBUILD qtpaths-5.7.1.ebuild 404 BLAKE2B 0f596a191ca7bd305b49b454d7a21b450cb0d75ad7ff0785c16abc0757fd78ae65ad67d1d964bc562aa321c8f1c045d4ceb1863032cce41ba48536c35cb88bf1 SHA512 e9e081e62b191f26395b65fafed9c98a5ab2e173985dafc610cbc1f86297e589188c803761f767d37f6a0ec23eb65bc8250bf8fe896d33d156219477e780f9a6
+EBUILD qtpaths-5.11.0_rc.ebuild 409 BLAKE2B 820f78dbae4037a591f1488a58215769ea69fb16c585df730f80e7ae33dbf599a42ab36cc645e88ec4dd704a470918ff3825aa17a380e5f7c534dda3b46e94bf SHA512 14ebdcb7dfc35806c5fc91eb01bfb9bb01134ff4003e43ec5e5b5aeaa292942be461893e0e792bbac90a9de612f0cf5b4680b7c925ae51e21f55ace890eb8740
 EBUILD qtpaths-5.9.4.ebuild 405 BLAKE2B 252aeaf3802e11f568ac54422fedc8d4b0c4d9b2af8f3884667b2bcaf182282f5cdcb69e84a8e7acb5d4f34702c8a2b2943d2be7dc25e5101f2eb7b01f07aec7 SHA512 a4a79854b5eb0f48745d8a8af9244614ba33d89fdda7cf670b26c1bd25beb5b6df33f2a045934b150f17ef3ffe193c2210df3749b3c6f5f62bcbf91c11cdc9fe
 EBUILD qtpaths-5.9.5.ebuild 409 BLAKE2B 820f78dbae4037a591f1488a58215769ea69fb16c585df730f80e7ae33dbf599a42ab36cc645e88ec4dd704a470918ff3825aa17a380e5f7c534dda3b46e94bf SHA512 14ebdcb7dfc35806c5fc91eb01bfb9bb01134ff4003e43ec5e5b5aeaa292942be461893e0e792bbac90a9de612f0cf5b4680b7c925ae51e21f55ace890eb8740
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.11.0_beta4.ebuild b/dev-qt/qtpaths/qtpaths-5.11.0_rc.ebuild
index bc5bdee2884b..bc5bdee2884b 100644
--- a/dev-qt/qtpaths/qtpaths-5.11.0_beta4.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.11.0_rc.ebuild
diff --git a/dev-qt/qtpaths/qtpaths-5.7.1.ebuild b/dev-qt/qtpaths/qtpaths-5.7.1.ebuild
deleted file mode 100644
index 177127c7b542..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.7.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
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Command line client to QStandardPaths"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtpaths
-)
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index bf84e9ea4f3e..698ec677b183 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,9 +1,7 @@
-DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645
-DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
+DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
-EBUILD qtplugininfo-5.11.0_beta4.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
-EBUILD qtplugininfo-5.7.1.ebuild 373 BLAKE2B 9ca1694a0fe8c2221ade025b3955439cc4d34baeed01472c8107baf22715ce5aaa89b9b0b75d79764f3cee6e2a1ca988d6b94db0fadcb9aea3d1a133ee9a65c8 SHA512 8825a6140078e4caad4ba8187c06f6840038b027c7cb989532f5a01c4008119d4c8f8285df269056d33e4111f82bdf024f04657c46d07c595fc48f49d0c18309
+EBUILD qtplugininfo-5.11.0_rc.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
 EBUILD qtplugininfo-5.9.4.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
 EBUILD qtplugininfo-5.9.5.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.11.0_beta4.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.11.0_rc.ebuild
index 43ae95d1cf5b..43ae95d1cf5b 100644
--- a/dev-qt/qtplugininfo/qtplugininfo-5.11.0_beta4.ebuild
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.11.0_rc.ebuild
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.7.1.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.7.1.ebuild
deleted file mode 100644
index f830ab762eb0..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 plugin metadata dumper"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtplugininfo
-)
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 1a4c943d3e6c..71a697cc58da 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,9 +1,7 @@
-DIST qtlocation-everywhere-src-5.11.0-beta4.tar.xz 5520552 BLAKE2B b51c329738fb2d926cef11a4f0bbfd1bcfcac9170365896aa4e6d8752e3fbcc50530bbdf14d471e445315a765045ed216a9dd7695407e3b610bbca0a714ff164 SHA512 8e68df472c98d7c6aeb1f0d0a8444c3bb17ce92d96621454acc5ef86c02ad8f3576976b50d1ad83419e2b8439cafaa80d05d2605f753e56a2c86290cc9d6c272
-DIST qtlocation-opensource-src-5.7.1.tar.xz 3194112 BLAKE2B b5ac3bed420507c4a03b382c23d02cf0638c64e4921872930ec22394c3eaef7b7abaf7830d40c3aa2c9888e91724d5795b17a6d2a37f2f21b97285ef7d0dfd69 SHA512 a3e0318ad348edd6d9cb4762d4fc6230a47984fcf526f55cc2c9bc00e2e70fdb1380866ec8906e3f58669c62464f8747c948d85107a2d30be1e98da27c7739d4
+DIST qtlocation-everywhere-src-5.11.0-rc.tar.xz 5530380 BLAKE2B ee1074814a272dce3350814c5e3c3c4221ee35f3945948e934803f94aafcab8a8769ed7720f7deaac8a61615f32d2e7aca3112faa8673ecad78cb07042f0638a SHA512 72b1e3f351b64f8cd4c979325dd1916bf3f57ad1c31630dc21130c43269db75b2ac6a361cd18a5705d48e1fd870326e1de8001841a5d93b4bfe476524587b622
 DIST qtlocation-opensource-src-5.9.4.tar.xz 5405252 BLAKE2B 6474251b21baaac6182a0197a7736dcae86d0735e8be499c9bfefa639b3a45c750fa9bfef766849fbf6d7c5db518e5712e0862463e98168e2a3121582966d834 SHA512 a97de23a554f709a39ac8517de85c9beb7e1a8330ba3996593aeb3d64d1c5b8d8b08b0c94df435dcbb4ba5807e262ac6f87ec9620694805e0261a4b2ee8456cb
 DIST qtlocation-opensource-src-5.9.5.tar.xz 5405920 BLAKE2B cd405d3a1eeed95c1c9f8759cc0d3c34d532de6f11c030296cb652e37aba66628578551fc73d5e283a373426b1e7b816b092cad1329d0a61f349650e88836a53 SHA512 80d8a8f3e82238c8a7f3e37999d5f118857e0037e60979de00219db45b3c716e6ac092f0b848c00cccbeb0ac19a1a2f4479bf92c7db701de1b3d239161d46d15
-EBUILD qtpositioning-5.11.0_beta4.ebuild 838 BLAKE2B f2010ba1dd1b763e7999911cd6322ef22c8882175a108a2a9bf72933b3174b735f8b6af7b05aea20f825de0be91d132cdeef29ebdbd80a3309a314e8cad6557e SHA512 4af68dc418fafebaf73cc6dc8b68690f4221ef869d382ba07208707e26fdb1ce1969d18bd3176074e45b87179ff465ed021b16c01e88976c6606f618638aaced
-EBUILD qtpositioning-5.7.1.ebuild 738 BLAKE2B 630a0eb0edc9b54fe80b3860578a497d9be346e55c0cdbdc36c6ed76fbaaa93e48f2cbe4580926787aa3ec19962c646d49e2f17df5872696ef6c1059adfd1f63 SHA512 1dd5a1827a28584cf35ef6f7d38cd6adce0602587bf618bd4e1f927868f08d3557d02d4f70910cb7f68c16a8e4bd53547b2bed4dc24194290d3a457668ddda32
+EBUILD qtpositioning-5.11.0_rc.ebuild 838 BLAKE2B f2010ba1dd1b763e7999911cd6322ef22c8882175a108a2a9bf72933b3174b735f8b6af7b05aea20f825de0be91d132cdeef29ebdbd80a3309a314e8cad6557e SHA512 4af68dc418fafebaf73cc6dc8b68690f4221ef869d382ba07208707e26fdb1ce1969d18bd3176074e45b87179ff465ed021b16c01e88976c6606f618638aaced
 EBUILD qtpositioning-5.9.4.ebuild 807 BLAKE2B 7cd8b965a356bd9ca259d82c1ec4c8b86a722f6b4b3401d30ab99ee92633ee35c88c34e52b04d1a04ed144720ce3ffbbf5ed16967258ce1ca458666e855acb98 SHA512 54c4d3c712ced3fa5bf1755b2df18a74303cf979ba21f5df24157f00e89b1c271fcf045d05492eb851bb31918476a0329cd7e2e09d153c07293093a6329ba584
 EBUILD qtpositioning-5.9.5.ebuild 810 BLAKE2B 86651857bcf1c8fe233d659b49c0d0b2fb85864b2177523df59b6495475eba2a7d78ccab5d73654131e50930425693bbdcd3afe1b4a7104c5a8d3162c2245f7b SHA512 acb350332bc1eac288607d78a287cc64a562e0e984cea7e9df2becd41f7f7e6b5f19288d3ede58354c48c64d0776a734fb2511635a6a47b3667303dc5c68fe39
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.11.0_beta4.ebuild b/dev-qt/qtpositioning/qtpositioning-5.11.0_rc.ebuild
index 0fb891e57cce..0fb891e57cce 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.11.0_beta4.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.11.0_rc.ebuild
diff --git a/dev-qt/qtpositioning/qtpositioning-5.7.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.7.1.ebuild
deleted file mode 100644
index 02c8756f8224..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.7.1.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
-QT5_MODULE="qtlocation"
-inherit qt5-build
-
-DESCRIPTION="Physical position determination library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc64 x86"
-fi
-
-IUSE="geoclue qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	geoclue? ( ~dev-qt/qtdbus-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	geoclue? ( app-misc/geoclue:0 )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/positioning
-	src/plugins/position/positionpoll
-)
-
-pkg_setup() {
-	use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
-	use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
-}
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 29c2be9f6697..e4467af9290a 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,9 +1,7 @@
-DIST qtbase-everywhere-src-5.11.0-beta4.tar.xz 46815720 BLAKE2B bf21828ed94d02140ebc5b9f366b935f944c40b8fe15094161a9c3d0adc16b2e8bfa7f4d514030569f5f463f39dd8083b6cacb536e71b1e81f743749c8742682 SHA512 c70b575729bdbd580d32350a233dfa1db3f450a3e0f4f41a5c8d153df396edc3f795099e4bf3447d3a0751f9acbc1978b4e499c6dbb6d9357c0288288b83d5ca
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
+DIST qtbase-everywhere-src-5.11.0-rc.tar.xz 46807012 BLAKE2B 76bcc9c71470f09ddb119e0098b58e5f505eb985e39a131100e4b7ddfaa8f5785e534296052631ae1407398e548a8fbf4ce23e05d6d1b5242d35c9ba7d1d08cc SHA512 3cd738f7f3179703275a8604709af70fba4148132ef6f2f8d13f8ea7c767c5f9ae3a11fd96cce49f090ecdf85fa04df0a8551d31d9d05c9efca50ab21ebcfd36
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
-EBUILD qtprintsupport-5.11.0_beta4.ebuild 773 BLAKE2B 4af1522c3b043c11f11ea9c79166bea281afc2799de2380b132349480d783cc60b95afe0121bb6ac4ceca1b4abbbbfff0d7662fae4103b2944631f29d9ebb26a SHA512 b0502204b1f03518c9597ae2fdfa6f1b1b4d58d1108250021a8b14a1fb73eaa263b6d7e6d5ff7e19dd420f49613ad5bfae5e0921869ecdded7c510b2f71e2430
-EBUILD qtprintsupport-5.7.1.ebuild 756 BLAKE2B 67dd32b9d0cc05c81f076a3547a69143c222b60970950d8d9b615ea83f290c789a20b9bf26b1975895bee71b7dc522f96a6722ab5bdd5b31357747a453d9cf02 SHA512 ec05254864dc55d52b3a773b019d37341f136c607ace697873926abeba01b08b9871e0ef5867bdde5a474c8cf4ad0728cdc89e02ff0de33c71700f4fb0c69561
+EBUILD qtprintsupport-5.11.0_rc.ebuild 773 BLAKE2B 4af1522c3b043c11f11ea9c79166bea281afc2799de2380b132349480d783cc60b95afe0121bb6ac4ceca1b4abbbbfff0d7662fae4103b2944631f29d9ebb26a SHA512 b0502204b1f03518c9597ae2fdfa6f1b1b4d58d1108250021a8b14a1fb73eaa263b6d7e6d5ff7e19dd420f49613ad5bfae5e0921869ecdded7c510b2f71e2430
 EBUILD qtprintsupport-5.9.4.ebuild 769 BLAKE2B d1e8987e2228f6c7218dd48b8aa85dcd3a9c83d2ce04fa3b26da6a8e9241bd68fa1c1b777d5e80fdb9d08bc0ddb7c6a7a89c1381630faf83029ae24ccb3cc836 SHA512 e4190edb33773bcc786519ed580e570f49fc4f29d7ebad5c87148e388cfc6d1219f5929ea179a495c5a507a24422b57b770dfddfab013844f0b9b1e52d43193d
 EBUILD qtprintsupport-5.9.5.ebuild 773 BLAKE2B 4af1522c3b043c11f11ea9c79166bea281afc2799de2380b132349480d783cc60b95afe0121bb6ac4ceca1b4abbbbfff0d7662fae4103b2944631f29d9ebb26a SHA512 b0502204b1f03518c9597ae2fdfa6f1b1b4d58d1108250021a8b14a1fb73eaa263b6d7e6d5ff7e19dd420f49613ad5bfae5e0921869ecdded7c510b2f71e2430
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.11.0_beta4.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.11.0_rc.ebuild
index b53ccddd18c8..b53ccddd18c8 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.11.0_beta4.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.11.0_rc.ebuild
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.7.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.7.1.ebuild
deleted file mode 100644
index 20de828991b4..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="cups gles2"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	cups? ( >=net-print/cups-1.4 )
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index bce14946b918..67e9724f455b 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,9 +1,7 @@
-DIST qtquickcontrols-everywhere-src-5.11.0-beta4.tar.xz 6054504 BLAKE2B 7057a0af73433a10e363c5073cfcd2805f3f53353a16bcc68d03cac82875ae0394a472e6a28ef79baa23836ddb51041afc9971c3ae5be5b57528e3b85c474037 SHA512 2d6c860af049b05a5e7b2894b76b0fddee0d724ded89dc4faa107371abaf36fbe2feec3f61371dff874725cf5e23c9ce1064bbcfd7a06c0952ca397a66ea1abf
-DIST qtquickcontrols-opensource-src-5.7.1.tar.xz 5943024 BLAKE2B d30320a19f58fe1c9ceec4be7f00a7aa1eb087b1a062169442fd6d97903fbfb428a57ef9632b23d7a5d202c4384c223903cca5bdca13c21762e28e30d608a198 SHA512 7f5d3a2fcb1da3ba5299f57935156e34dd61d019b29892794927148c7bda99e8e298522f1a7d807f2c2b9746efcc9418a9f89c6322257749036b046e03471368
+DIST qtquickcontrols-everywhere-src-5.11.0-rc.tar.xz 6053972 BLAKE2B 42d6ec8140e1f09f99823a03f2fbb41483943a18f3ad5656fac25b1634e660a03c6b4160833c5fb89d5659f714d596429d70688f6a5917f19517eb5beb69cbe3 SHA512 8a44d6dbea563297e90489cb686aa00ea5acbf3bcce851f482928bc09e502f69d6e7a19949c9feb696c3463231880578d80e01b137379fc8e3adde6c50d0a437
 DIST qtquickcontrols-opensource-src-5.9.4.tar.xz 5945756 BLAKE2B 9b22cbed8e92a9264a67777cd18eee2f8b20a9f2360ea376948563933852015b9b44f9c94410c73f09d2f7958b61228ae3634a6c2e0ad5de7e92249f26196461 SHA512 62f7578fa5253e85b8cb04fec295e1044a6b5946e4041e758f788643aa3336c9c48300dafbd5ab21b0e4b74e184344ad62a9d06f3bcb7466fbea79b0e165070d
 DIST qtquickcontrols-opensource-src-5.9.5.tar.xz 6014724 BLAKE2B 260160c126950e95bcb9745e7d98d5a145157bc3cde1ef0a395fb08217de7a354b6af88bf10714c84dead2357b1723ed3c64760213c58b2bcf95a04e4a74e24b SHA512 0134973c2c47d4d89984dc9b3eb2186641c604c3fc0a7e5697336843417d22d04bbb4bbbf5a7da10b01248149875e5465b629387949e255555b7c4be275f8427
-EBUILD qtquickcontrols-5.11.0_beta4.ebuild 751 BLAKE2B ffe5e136301939ea58a170a7382281ba2efe195963e2b0af6c04d6e156e399c108424a606d5fefc7b3cad952f366bcf9dc473fae32bd2448e1569c8ddc1c0077 SHA512 9ad5ed5880f169fbaaa028349a8065e393ab7deaf37e1435b0d5fc76b51049709977436f4ba88c38d1e8e66284881c57bd9e9ce2a942894b4940316a7a2f4026
-EBUILD qtquickcontrols-5.7.1.ebuild 746 BLAKE2B 7dc043cf9716224e6c868f129987537a3c297788397d563e28e961e90a9e9a3858525afc0d09ed2d613f7f5dac81169cbe0c1ae1e7704db40897fe8f18e27441 SHA512 a178ab0c0c0b963af3be4cf32fc12573a452c8f10d3ef533606c4809689bc617823c231371e2cdff4d42e204d2d4c75d6e985cc1c23ad2dd838145f9ec735b47
+EBUILD qtquickcontrols-5.11.0_rc.ebuild 751 BLAKE2B ffe5e136301939ea58a170a7382281ba2efe195963e2b0af6c04d6e156e399c108424a606d5fefc7b3cad952f366bcf9dc473fae32bd2448e1569c8ddc1c0077 SHA512 9ad5ed5880f169fbaaa028349a8065e393ab7deaf37e1435b0d5fc76b51049709977436f4ba88c38d1e8e66284881c57bd9e9ce2a942894b4940316a7a2f4026
 EBUILD qtquickcontrols-5.9.4.ebuild 747 BLAKE2B 41e87081cd3ecd0b2eeba5db2253ed4ef667fe748320c8911a3f74da279eece1b5247e9bed2e1ad0abd9e2a0c7685726091a56aa95f182e09c1d917a99bfc774 SHA512 414b59b57e1917d77c03f584795438c157459920532372adcc04e13059a75fcf04892d5d6ae72621f679675e932988073b3ae0d12d915a5b524c086644ac0b07
 EBUILD qtquickcontrols-5.9.5.ebuild 751 BLAKE2B ffe5e136301939ea58a170a7382281ba2efe195963e2b0af6c04d6e156e399c108424a606d5fefc7b3cad952f366bcf9dc473fae32bd2448e1569c8ddc1c0077 SHA512 9ad5ed5880f169fbaaa028349a8065e393ab7deaf37e1435b0d5fc76b51049709977436f4ba88c38d1e8e66284881c57bd9e9ce2a942894b4940316a7a2f4026
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.0_beta4.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.0_rc.ebuild
index e0dc94116163..e0dc94116163 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.0_beta4.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.0_rc.ebuild
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.7.1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.7.1.ebuild
deleted file mode 100644
index 5f4d9479f188..000000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="+widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/controls/Private/private.pri \
-		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
-		tests/auto/controls/controls.pro \
-		tests/auto/testplugin/testplugin.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 7e48d0686d35..7af80c67d760 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,9 +1,7 @@
-DIST qtquickcontrols2-everywhere-src-5.11.0-beta4.tar.xz 9035436 BLAKE2B dcdccfd6ed903d1bc2220e478215e4f7d1f602e08fd766eff2c03baf1a9384edd7136e177f49fdcbb3e1643459b5c05c217e6ffcdc36f5ae670f731d1ef8d384 SHA512 a86b2d0d4f4e4d1b23586b3e1edffd19f2457a7f994a613ad6df23f67aa5ec81342e9fa46a19f7eaeb420082ef123f3ebf34f6311ea98dcbc1348d3cc6820bd1
-DIST qtquickcontrols2-opensource-src-5.7.1.tar.xz 2212812 BLAKE2B 2af8643f254aeacc101546e05136ba7e40fbb2602eebe7ce03a0f7d263f26d03c47533d79c7da4cb789c74399f0aa890cafcf6a5c2d37d340300935c868458d5 SHA512 24b142f60f3dbc52084906249e261ea8b788135a3dc2e45bb3fc885fe14f9281178025433b28e227891070adff3fe4b64c8a1f83ac4c9bde7f4a6048ea44370e
+DIST qtquickcontrols2-everywhere-src-5.11.0-rc.tar.xz 9035208 BLAKE2B a8effe470e73810fb174f07d195fe07987847e82348e938e187e273bf219c7ae53b46b76898d1c655f3d85c7aeca1f72d25c6e96cf1341c8e98d3553885aaeb6 SHA512 5fb1d0d17dede44fdd01a67f2cbea36c6dbbc39e9c7ff817e00de235c3cfe186d44cbd731a31190ff17219059b038f095aae767aa8e9425e021d7ad328988719
 DIST qtquickcontrols2-opensource-src-5.9.4.tar.xz 4153488 BLAKE2B 39fab418b0875fd080228e8dc4103884d862924b2ab12d630303eae366294ec8c97b744db58aee1b00bc923d9abda1db4f7d73931699f3961cc2a28eac2e2e84 SHA512 17704cfd14dbc14d2971b82a81786bd7a5cfdd4e6ae6bc0c5b26c6a6a36d8391ba1ac9969cc5614c8d0fff8ed3b238ef57a481927f82fda509023838d3692762
 DIST qtquickcontrols2-opensource-src-5.9.5.tar.xz 4158380 BLAKE2B fa930195d1f36fad316d624b9acf5aae34bf8e985d0b40f80ae7276edf4e461729fde68c15e52573a5f04d8876e7ba03b3a82642b00036fd4df716a95891d571 SHA512 3ae498a9db816ef9e0a10801be85813fa69ed740d6a48770f858472d6c679a4d1ac802f3095d0c0d8cb9b1a004626e3abab6aa2a1d9845923f7600edd4ec8236
-EBUILD qtquickcontrols2-5.11.0_beta4.ebuild 605 BLAKE2B 386fa9c9e06b1ec5ff1fbbe204c3325a957ddc426c84a1ae2c85cb5943ead40195740a7becfc3054cd36ece82e2e6dbb45ce550138b6eecc9b32fca8e4ad7a52 SHA512 32a3b349c5afcc20162d2c42dfbf147eae4aa12a974fcb89add625f932d50f730ae3134aab0e3db143aea2dff2dfeb71970eae7a5b504f5e90222a8f7cb61a44
-EBUILD qtquickcontrols2-5.7.1.ebuild 433 BLAKE2B 489ff65898823f54b6c14da03c43c599ea0cde6b6ef95d66a646e6b0d6cdae0d5374ccff1b70c221bf7bceb41740197ddc09bae3fa2cc3fd5fbcfec7170b4f3c SHA512 a9a3396d6b63faee06d93c3596c68756b21dae17f6ff2c2725f28f33c87d3bef29ed2a8335f627f30a660530572d09b36f96a6a1e6828952a0112be87e12e70b
+EBUILD qtquickcontrols2-5.11.0_rc.ebuild 605 BLAKE2B 386fa9c9e06b1ec5ff1fbbe204c3325a957ddc426c84a1ae2c85cb5943ead40195740a7becfc3054cd36ece82e2e6dbb45ce550138b6eecc9b32fca8e4ad7a52 SHA512 32a3b349c5afcc20162d2c42dfbf147eae4aa12a974fcb89add625f932d50f730ae3134aab0e3db143aea2dff2dfeb71970eae7a5b504f5e90222a8f7cb61a44
 EBUILD qtquickcontrols2-5.9.4.ebuild 603 BLAKE2B 31f03722c98ac29f541c1d8dfe6cee0390aaf5c118920d9bf2a442698790612d808e2ddd64f23065205ab76198df0894671e77a94e95a8fb0322460ff78219bb SHA512 7d8c43914e579c6e096590192c0db4ecd616e57cc18eda59e058aaf5b865f20cc7666211b11ebc1aee4122f8eda48e5ab403504d1e040a865f00cd766804c5d0
 EBUILD qtquickcontrols2-5.9.5.ebuild 605 BLAKE2B 386fa9c9e06b1ec5ff1fbbe204c3325a957ddc426c84a1ae2c85cb5943ead40195740a7becfc3054cd36ece82e2e6dbb45ce550138b6eecc9b32fca8e4ad7a52 SHA512 32a3b349c5afcc20162d2c42dfbf147eae4aa12a974fcb89add625f932d50f730ae3134aab0e3db143aea2dff2dfeb71970eae7a5b504f5e90222a8f7cb61a44
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.0_beta4.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.0_rc.ebuild
index aa6bccf51564..aa6bccf51564 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.0_beta4.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.0_rc.ebuild
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.7.1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.7.1.ebuild
deleted file mode 100644
index eb8b809e3d6c..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgraphicaleffects-${PV}
-	~dev-qt/qtgui-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 2afe49e30fc4..07521de32708 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,12 +1,10 @@
 AUX 4.8.6-javascriptcore-x32.patch 1826 BLAKE2B 2a695f9c563675e0d1a36c9edda8b01dd83db6b377a4e72dd3b6ced8d11d0c206aadf56c35423d11841407452ab3e8f4ff3509a803e757536ad76cb87eaea76a SHA512 9b93ebdb9c474ad4e4d09de9d99d97351022863ae3a58fb0b03d1cd103dd012d0a12643f6e00f60cf0a9a4ac24db98039e87d5dd9a1afcf8dc65696b4bcd4efb
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtscript-everywhere-src-5.11.0-beta4.tar.xz 2668372 BLAKE2B 64eb39c5624b371bf37e42d62bafb627ecd345bcc78b14021b50b10352bd198f9b337cc7a46fa1c5e53ab39e37cbed1417e7e35e92a43c25b77395a6c6b87e9c SHA512 5d160dbc2cd8ffc856994759ff47e5441a33f4c24817e343a39eb30f626a8254027a94b3f00b314bbee6f4ff2b7843aae15c169476d1abc8e8334e771a3d0274
-DIST qtscript-opensource-src-5.7.1.tar.xz 2608180 BLAKE2B ac9f51c9bd67f1f2412d8c8fccb630ae3f6fcefc71c0c9bafee7e2e16f75997673c55960ddc26f8a11be646d78514802d4ba71f5b0d7d9559a1e5a894237a04a SHA512 6bde4add16745475d42c0fda0d3451a77717b14dca12b40a4e3cebc9e2b6edb04da23ebf9af46010135066524dd8ea0453a07420cf42228fd7ed5249b633a95c
+DIST qtscript-everywhere-src-5.11.0-rc.tar.xz 2665216 BLAKE2B a6d753b191920abaf2c6ce96069e1b74d5557156de759f5f654f2bf3125adcbbff297a51a4b8728f6c1948b2e2ee1c10d269e06f0cccd6a2836e0f3601854f79 SHA512 c169ec8ba72dc81bcc6689cde44455c61601c0d3f3f743847a7be3e038ffd7d1b5f16f1da8a3b5f8ec259a38a4803265c0b7c3ae98ab603fb213b0b9ec017ad5
 DIST qtscript-opensource-src-5.9.4.tar.xz 2612372 BLAKE2B 8213e2b70e23dfa6e42ffd0aaa1818a4794670de24fa5b30cdf4c7bd17f1a438d9d6a8bf9c03f2995a60b6e3ad6d57bf0273c6e1027ed3d0b77fc2987d285603 SHA512 e0c49e1286c4b1de6d197c42d8e4bcd82a5ea07e8c89f6f222fa62579b5d466336a5baa50372e5a9b514bd8be098e80f3793123cae09d7a923c4d1466b0e13c9
 DIST qtscript-opensource-src-5.9.5.tar.xz 2608320 BLAKE2B d4765ee7cb0b8807933c7b048b55c2bcb02459ce72c905ff3dd4d7e003fa085e6c7e5f101d4d2dc83f82c3434186809b8bf54ff9aca519ead72c6592a80af790 SHA512 5404ec7d2754588ba8dfddd2c69bbe7010c43125c97c84d83a95ee001192ab40f2331f86d4c2d20ffcdd59b9aecfb72425bd63ecd35691dc1672a235747895e7
 EBUILD qtscript-4.8.7.ebuild 1072 BLAKE2B eb4d2995271b4c1b3b083df9b9b657b49a6aebc66bdceddf78269590db9ae47f99a72112f6d2c2de9cd737cabffa8679eaa6545af5c509a58b5c7a962d2a5adf SHA512 c3b6a2933cbf054228051ae4eddc50940915a269aa5130dccdb9bbfc895678632cbdb3935f061565eed532faa48aa661c194549b62fb1c83c11057512afad8e5
-EBUILD qtscript-5.11.0_beta4.ebuild 686 BLAKE2B 2b5a8207e0fbb0f7f5222688b6f8e3c391a3684481e5fb9b71bd543d3111b3cf8d62a56d44ca030c0f2b1019585f740de542dbb78323e1389dd617d0c684d943 SHA512 8fecd4ac008262217070af2efb26729fd21c75818f0555697d6e04a3f6e3c536bf3efc14008a64cbffd7ca4c9092bd3b1746141a1648310133306a298b9df97a
-EBUILD qtscript-5.7.1.ebuild 664 BLAKE2B eb6a292ee6724d823d7f8dc1bd33726dfc1fb5b54fc7200a098ab5800fe70debbabfcffaa8487ac9d7efdc9d40672dc55ffddd3c0f375701361afb19242b95cd SHA512 d068ca8ac446cfef1c8b6e4421b243f2f0e4476baa2003ef1487b46a1989284ddcd2bb806d381e2c87de49de094fdec750699cbf4138c7d0f44fb2043b77df49
+EBUILD qtscript-5.11.0_rc.ebuild 686 BLAKE2B 2b5a8207e0fbb0f7f5222688b6f8e3c391a3684481e5fb9b71bd543d3111b3cf8d62a56d44ca030c0f2b1019585f740de542dbb78323e1389dd617d0c684d943 SHA512 8fecd4ac008262217070af2efb26729fd21c75818f0555697d6e04a3f6e3c536bf3efc14008a64cbffd7ca4c9092bd3b1746141a1648310133306a298b9df97a
 EBUILD qtscript-5.9.4.ebuild 682 BLAKE2B fc04d73b06779e8abfec714ae6b59e59a72237b56fbcf48eb24a5cceaf9860e5fc88ad36b68d9cacb6dc470a795c7d783908a55b638b1e884faf4bd3a143df05 SHA512 91eb46966db41a9718404c74cc2f18b723b9630fbd9b2a3fbbc42bc2eaf0edca796a0fcb72e32731880a3c13631eb7b92241180161b94f88a7f5cda949f6a75d
 EBUILD qtscript-5.9.5.ebuild 686 BLAKE2B 2b5a8207e0fbb0f7f5222688b6f8e3c391a3684481e5fb9b71bd543d3111b3cf8d62a56d44ca030c0f2b1019585f740de542dbb78323e1389dd617d0c684d943 SHA512 8fecd4ac008262217070af2efb26729fd21c75818f0555697d6e04a3f6e3c536bf3efc14008a64cbffd7ca4c9092bd3b1746141a1648310133306a298b9df97a
 MISC metadata.xml 714 BLAKE2B ad5f2175907ab5167fa16d75c1c538e4e66fcfb96d4a2dd2d19d92ccc39fc3283dc7b67505636834ea772727e5e50aaefc8468b9ecdc448fff33e6806c93d805 SHA512 8324b4dc7a26ce06a5c8af58768e337f1e96a2077b65f5996a4af535a07ac3a13c05af2fb0c89796335ea106eb82d0857dc20cb9d4c8131907313557a0319b6e
diff --git a/dev-qt/qtscript/qtscript-5.11.0_beta4.ebuild b/dev-qt/qtscript/qtscript-5.11.0_rc.ebuild
index 2644fc6ec232..2644fc6ec232 100644
--- a/dev-qt/qtscript/qtscript-5.11.0_beta4.ebuild
+++ b/dev-qt/qtscript/qtscript-5.11.0_rc.ebuild
diff --git a/dev-qt/qtscript/qtscript-5.7.1.ebuild b/dev-qt/qtscript/qtscript-5.7.1.ebuild
deleted file mode 100644
index 32cd7de69de3..000000000000
--- a/dev-qt/qtscript/qtscript-5.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="+jit scripttools"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	scripttools? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtwidgets-${PV}
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod scripttools widgets \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex jit '' JAVASCRIPTCORE_JIT=no)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 9fbc84e068bd..632b50174c6e 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,9 +1,7 @@
-DIST qtscxml-everywhere-src-5.11.0-beta4.tar.xz 433508 BLAKE2B af10476c27b20453a937482105e6aca6215e5dfc1a6f47ec65301ac473670f1dd4c887d24e43df4a1d81d02c7076f03455bf92b1ac87d8da2f16c3f2d83839f1 SHA512 91122595e5943d5f793dd31e263281be7e6224fb9d1e74ec631288fe3c9a20546062b37ba80dfe18b21f22b6c52abfaf7136c3fc8cc7edd374cd180231f25e09
-DIST qtscxml-opensource-src-5.7.1.tar.xz 346948 BLAKE2B 58dde6373c5901abcc73906085ab7896e6717094dcf2dc6d1aff0770a5f2a64b9bc4c21abcaf0531ef16a2576d188222a174c39759027d4ffb7eacb5440aa3dc SHA512 f5e2d6882a36dc08470502ede82862f4cd95f21b5b354e20ef5a2f9b458dbfdd35c1629a89217606aea5aead1d76d03c80e76387e1ee202bf73fe5c2022f1bb7
+DIST qtscxml-everywhere-src-5.11.0-rc.tar.xz 434008 BLAKE2B 12d4785d371bf96973532ec248b1570d7c1b1733907b4e89db6152997ebbfc6a641d6fc436dfadbc406dda1d7c86747b28edd3a78f7c57c8463c067b32b9d42c SHA512 8a9ec3c2c55923aae55795773f8720ea0fc9e5bf9ba5addb995f97a8f6a968cd587a9531ec2cb95ee2847716bc4c1379bbe9a772b20493d8c76c484cd0da47cf
 DIST qtscxml-opensource-src-5.9.4.tar.xz 414280 BLAKE2B 6fcea56794febf65b7e21b79893e9c3a849278ad6d4ad24a8f8e272ec101fdee72fe29d21bd99b1ba4d977e52dd3acc026660ce6d5a6ecc684590a8d190615b7 SHA512 e000411b82dfef08fbd5fce601530548a9b5959a4980309434572ec3475e6bc9cdf870cb82bfd5208b533d66a7e46dddf52f5ceaedaf3f0d438c4a4c8260c9b6
 DIST qtscxml-opensource-src-5.9.5.tar.xz 413984 BLAKE2B 3e39d97e162fb091643d4b8a1004946bb9a386cd41ac3ae52940c1878b165c9e4a6289f787c4dddaa0aa2d50504558d19979def12cebd57a7ba84d7378bc4bb1 SHA512 1e86f2e7da2a11c3f8d6bb838d32691b85ff0236b471b6b75b2cfc1c4576c4036d6b3f65e39aa81859f4ffbc41c67f2bab95e5ea93f7f3851bd52a9e04054261
-EBUILD qtscxml-5.11.0_beta4.ebuild 374 BLAKE2B f8297445522e981b840f4aee9e954bdc1f77e10a5bb7a8731f01539d2bbeeb1f7564c5a8df64f5170e2a7221191cc00bae435dd78f51fc8187de474840804b7b SHA512 55bc53954466df3f19a7a1378736538a8156df60f838f9cc783bc833cb91fab8339aea34d344327723efc3a60270a6c2656ca2f7e32f15f090292bdc05596ce6
-EBUILD qtscxml-5.7.1.ebuild 372 BLAKE2B fdef97048759cb3b128867a7d5cf5b8f8dbcbfc543693ad0045af78c68a0254b9f8424c1d758188c325596cbae9f0c5a097d54925182fdad396ccb8d37a30ca8 SHA512 eb5ba8623820f82531258a9b76321f50680779e29a518ca2e6973bdef8d27b50e3ad250f2b43460454123664c9bd63a072fc679dad97caf521134ea412cfdbb3
+EBUILD qtscxml-5.11.0_rc.ebuild 374 BLAKE2B f8297445522e981b840f4aee9e954bdc1f77e10a5bb7a8731f01539d2bbeeb1f7564c5a8df64f5170e2a7221191cc00bae435dd78f51fc8187de474840804b7b SHA512 55bc53954466df3f19a7a1378736538a8156df60f838f9cc783bc833cb91fab8339aea34d344327723efc3a60270a6c2656ca2f7e32f15f090292bdc05596ce6
 EBUILD qtscxml-5.9.4.ebuild 372 BLAKE2B 7c3d91f44fae4d6c6d66a32247299e6ac27be20617c8c4dcdbddbb3f7b53cd7eade1033bb5013e7d3bbdad991f6a4be3ba8a6b0eebaf24d3c7194028f299f77c SHA512 ff3500bb2effa2c6f19bff568c373c461e2fecc48b7ede945abe3c8ec119bc00eacbd2a9c3bf35fd374dcea1fa6a476db859dc3e42aac02366ebc0b193852917
 EBUILD qtscxml-5.9.5.ebuild 374 BLAKE2B f8297445522e981b840f4aee9e954bdc1f77e10a5bb7a8731f01539d2bbeeb1f7564c5a8df64f5170e2a7221191cc00bae435dd78f51fc8187de474840804b7b SHA512 55bc53954466df3f19a7a1378736538a8156df60f838f9cc783bc833cb91fab8339aea34d344327723efc3a60270a6c2656ca2f7e32f15f090292bdc05596ce6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/qtscxml-5.11.0_beta4.ebuild b/dev-qt/qtscxml/qtscxml-5.11.0_rc.ebuild
index 59b06ef21029..59b06ef21029 100644
--- a/dev-qt/qtscxml/qtscxml-5.11.0_beta4.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.11.0_rc.ebuild
diff --git a/dev-qt/qtscxml/qtscxml-5.7.1.ebuild b/dev-qt/qtscxml/qtscxml-5.7.1.ebuild
deleted file mode 100644
index dc5f1c74ae20..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index caad63c41ff9..1a7af456a435 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,9 +1,7 @@
-DIST qtsensors-everywhere-src-5.11.0-beta4.tar.xz 2028012 BLAKE2B da498c9f23af0960abe2f32680d1ff10a326d62d1ffe56c3b2bd07a21e18ef5225bcfebffab791195f1658edfc747714b8d971203390d08d0a31375d0bc783ca SHA512 60fe6cdeaedfa4582ad0b25c9001c72db1fe244c84546bbecd9ed0fa8a2445f4e35b75e525cff1e169765527cb7e43ccebaca60f61f712f957b4f55f49ba01dc
-DIST qtsensors-opensource-src-5.7.1.tar.xz 1987144 BLAKE2B 324af53f8875c406f60d1316fb87dbdf5075099c4c86ed8d9dfe25c1074f51e41f9fd86d8d1c3d73c319cc5917bd22fa86aff63e98dadb453f28145b681568b7 SHA512 5dff126e59f0bae4e5a8b1d3b971dc1c7318169f82dcb05907bad5dd460f2edadb317ffd111047af5a2d1db3a2c3adc204e5f8ec2b792c912a8e7e987f596914
+DIST qtsensors-everywhere-src-5.11.0-rc.tar.xz 2027416 BLAKE2B c002699d013c07590ba36cc982223083973ad2de68888b842a21034a75e612c0dc323b9a5c0e2c1d9cf29d6fe22dc928ea9276eadabb6bbb6a2de34bb8dc89f4 SHA512 a30eb2ef6a780c21814ac519ee9da9166c9aa838bc4649e6aec5fdb2cf220630b1164fc7558511db94c03f537ba7cf0a743c767c62a7a75093acda8648910ae3
 DIST qtsensors-opensource-src-5.9.4.tar.xz 1994992 BLAKE2B a7464ea11b7e74cf491a4629058f142f9e85d57e08e8b7fd1708cfe47951d0345445f853c89f8f8d0e4700eaa452e0c1ea00f4ebe12eda643fe512afc7dd6969 SHA512 10b0d4595ced97888c28ddb36626657250ed839004ee61cbb244326529d25c181acbad774e7d40733d9ac48485320e72e52bf52f10f2a18089a6a4ce4fa3097a
 DIST qtsensors-opensource-src-5.9.5.tar.xz 1994612 BLAKE2B 8b65b0781dd784942cec15456eab14453aac308ed948f62dd515fbefb8cae084f74b87736740a0a47043e22bcb82954cf0407209a7843445f6fc3cf47d791af5 SHA512 1413b15287d4dabf3a7541032f622a27b52ddb64b114bcb4a83641f9272f7785324a84c151b723568ad7106b07aaada32d1a006a9613f50532ca14b82886790a
-EBUILD qtsensors-5.11.0_beta4.ebuild 532 BLAKE2B 21e26e655c125242a339bb2b035bd7aa0a2ff71471eac52905c460c8836a038c4380605eefe5bfb5d56816d09a9c392a5335496e96c63ef34eab93100fd49ecf SHA512 6eed64f50257523e54a1ab7605e29627ebd60a37d599c0b8616c7494ddb72f08b7fa702620e4ccda71891eabf86a268f7197448981c507e07f4e4ad9112fc5fe
-EBUILD qtsensors-5.7.1.ebuild 488 BLAKE2B 6f4134731d4c9eef7694b52cd5913aa21dad9b18d3028241596400a5a81ab293f9595034acdb95dadbc779bbea776c5ef9dfde180d291375e3a62d929815b12c SHA512 d944b6c4be0bf4703941580b87a19aa737cadb8960fd59f1426bb4e51045cf0cf138cff7b028bcac139fc7652ce38997a4aa90cc71d880b08069e7ed7b14f80c
+EBUILD qtsensors-5.11.0_rc.ebuild 532 BLAKE2B 21e26e655c125242a339bb2b035bd7aa0a2ff71471eac52905c460c8836a038c4380605eefe5bfb5d56816d09a9c392a5335496e96c63ef34eab93100fd49ecf SHA512 6eed64f50257523e54a1ab7605e29627ebd60a37d599c0b8616c7494ddb72f08b7fa702620e4ccda71891eabf86a268f7197448981c507e07f4e4ad9112fc5fe
 EBUILD qtsensors-5.9.4.ebuild 529 BLAKE2B 6ea55cffff0218bf22db4721a22de169bf4b19aa56af940cf1cb615efb501a3b599e4a8e492d79d1a136fde81b4941b240d138cafccbb8a06daccb53c07acde7 SHA512 4d1dc97c80a8b984f60d23514db8bc13baf8006e08bf72f0c3a45deb75f9c140940e7b6bef4373823695c2b0a9ab526f16ab06608097fbffe3a0a08cb55aae55
 EBUILD qtsensors-5.9.5.ebuild 532 BLAKE2B 21e26e655c125242a339bb2b035bd7aa0a2ff71471eac52905c460c8836a038c4380605eefe5bfb5d56816d09a9c392a5335496e96c63ef34eab93100fd49ecf SHA512 6eed64f50257523e54a1ab7605e29627ebd60a37d599c0b8616c7494ddb72f08b7fa702620e4ccda71891eabf86a268f7197448981c507e07f4e4ad9112fc5fe
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.11.0_beta4.ebuild b/dev-qt/qtsensors/qtsensors-5.11.0_rc.ebuild
index 28845fe6f0fa..28845fe6f0fa 100644
--- a/dev-qt/qtsensors/qtsensors-5.11.0_beta4.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.11.0_rc.ebuild
diff --git a/dev-qt/qtsensors/qtsensors-5.7.1.ebuild b/dev-qt/qtsensors/qtsensors-5.7.1.ebuild
deleted file mode 100644
index 68e525a38e27..000000000000
--- a/dev-qt/qtsensors/qtsensors-5.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Hardware sensor access library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc64 x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index be457cf4cdf9..68aef8b7a1cc 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,7 +1,7 @@
-DIST qtserialbus-everywhere-src-5.11.0-beta4.tar.xz 315304 BLAKE2B e7fb9f5e923ea54d5e79fd5c2e83fd8bb786981d8f091390f77d31bda4144b99a8e174e189ef303be9a811854b3560b4edc316f81ff7488be2cfdcc739fda921 SHA512 dfbebf6991c4adb94d1b141121f18ac201dc0a9f1e9e9477dcfef13ea52f8aa3a9eacce2f2ba064cbcfe074bfb11e5faba9f722c38bd48c69c67c44a831f972c
+DIST qtserialbus-everywhere-src-5.11.0-rc.tar.xz 315720 BLAKE2B efc7377132f14c466b8a473306fa25a9da72812ab342e4011999a12dbe818aca933272bd66a8a7a972d084316b183a27f2af5a009a8ab1d93eb1046be996a313 SHA512 87868fe4ee6f24138dfed755a0963e0ab0971139c7a459e80deb4066ff79ae0188f9e28ca29875583be42cf4eea75b320722a04b779c2eb2fc182a66a5cec4fd
 DIST qtserialbus-opensource-src-5.9.4.tar.xz 279352 BLAKE2B 145154d86de8d968c26103c7eab21f2928e8666123c0d8ab20e9459bd86dbe54e70f4d83ff7f9c6203f078f2ab3ce21cd2d08ed268e0af29b0578d0b08e6dba9 SHA512 d4f09d67edc69b9063be114007eb7200ee043f37bbbad9bbe392249b37ec766bc2d0f5725e9af2df2fd68095ecedf71196ffaac30569bdf5ee2606a8fddc4321
 DIST qtserialbus-opensource-src-5.9.5.tar.xz 278920 BLAKE2B 80834c503e9afe195d043746d3558cfdb347a3c1422ee0dd31d78a11afcf2bb8e341fa01d93c8c6f008bc107753b5cd7b17094bb6a0dc89dee77909cb4be6510 SHA512 612dd75464246d1510a968f3a7f85691af1ab56923513f9b444e2f6c8ceb1c890195cd38315e0be64437e5c8f134aa966f5a460d1cea40b5f488c21e8987f52f
-EBUILD qtserialbus-5.11.0_beta4.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
+EBUILD qtserialbus-5.11.0_rc.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
 EBUILD qtserialbus-5.9.4.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
 EBUILD qtserialbus-5.9.5.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialbus/qtserialbus-5.11.0_beta4.ebuild b/dev-qt/qtserialbus/qtserialbus-5.11.0_rc.ebuild
index c6a1fac19557..c6a1fac19557 100644
--- a/dev-qt/qtserialbus/qtserialbus-5.11.0_beta4.ebuild
+++ b/dev-qt/qtserialbus/qtserialbus-5.11.0_rc.ebuild
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 75235c9848cc..bf93c3f358ed 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,9 +1,7 @@
-DIST qtserialport-everywhere-src-5.11.0-beta4.tar.xz 296292 BLAKE2B 35074c878062cc46d54030a5f61f16f91d8b4cac9c59a59e4c72f1f43746d87d3fefa829a35589bab233029525da14803eadd1141a1e2b16d89319076f5c55b0 SHA512 333d7aef2ab165ce4899118c57eb29bcfa4776feaa8f6b878a274521a96e32cba0466d6f0fc4ff8857791d823e76e357a4050d0857d925803e6c093af89a2f33
-DIST qtserialport-opensource-src-5.7.1.tar.xz 265616 BLAKE2B 43f3e8bdde334cd0f2a1df0b9aa4dec9033c8de96567e4877637f77163cc64ce8043e6bc99fdfab40f5e28f2c4143b2613dd6268c829f60cc4656cdaa6cf520d SHA512 090015dc2652399bee7c7d30c9f127be695e4c002b18dba1089d4bec555513774a587864989f33ad4059ff7b9b2bf24c387394c03a4024e2640b3642bc89ccbf
+DIST qtserialport-everywhere-src-5.11.0-rc.tar.xz 296476 BLAKE2B 8df84afc0a3138b3a7c885a4fb94472250bc72bfe900addba5cfeed884e7faa1f398205838f51bc8a73578e5ff8c42eb2b19c621fa4e31f5fa948fd4e5e2217e SHA512 4a3722ea81238783b8ce248f3885edda007f1530bbf582855b4633ad54e58b7f21464211b5daa143058d209ef375fc5c9478e10566034f67f3eca9341e0ab298
 DIST qtserialport-opensource-src-5.9.4.tar.xz 273252 BLAKE2B dc9a97465ac22521346da8d676ac31f48fbe1a8b1070e7c774e1d4ee8ea1fe713688775d590205e6149cd276427b35e7c503cfe5fb81cc0eb5063656ff92f745 SHA512 8eb6b850440e6e16ab0a9389259b15ccd7bd783755a6964a3d1ca07260821807c7a3e52237b69ed4e0e6333a74046b03c28e92a2e4e34c1140163af287b5f344
 DIST qtserialport-opensource-src-5.9.5.tar.xz 268296 BLAKE2B 77d78a651e54b04ad5ca2e816a4f2577d1830250fa199f53b1b9b7fba1418800e42a8a970bc5d2a0025dd4cb41d1fef0c1a1dd238893d8621a4bc943a514c65f SHA512 53b0f5002f72a6ffbf2c1cb076823e4b7b2de560d17b6c5af6f8320d755cdeb860e537f39abab22e892edda5e6b2b4e3e10cf5315550c54ad20b66e2b749a88a
-EBUILD qtserialport-5.11.0_beta4.ebuild 542 BLAKE2B e4294b0bd51fcfd1d6c605e26ca0496121dcd06fba63b8cf8870a0bc2a1e0292766210d0da7fbe38514c2db1245f5baf24c36a913db0165eefa34c3634cf2762 SHA512 724d9d28f4f2f75518685652207385f9a1d40845b744952e3f225ba08f6973cc5b306ac6919474fe02b454b3a85b7f0cd2ecffb43f6420d26f14c3d1246ce44f
-EBUILD qtserialport-5.7.1.ebuild 551 BLAKE2B a2e927ff88dff94421c1d55f9299f2ab7d1645a987316ec33293f10a519f68f3d0c2d136b1484c8f48e3afc0a0141c7b1915ad80fc96d872006035803cc44afd SHA512 97fccd4fcace165cb2f4241f2e8b44f137ef69fe7f02b5178d4812102839bb01dc33212766a25557d1978cf0459b151f8ab7ced897ffa574498c5b8fa19ef34f
+EBUILD qtserialport-5.11.0_rc.ebuild 542 BLAKE2B e4294b0bd51fcfd1d6c605e26ca0496121dcd06fba63b8cf8870a0bc2a1e0292766210d0da7fbe38514c2db1245f5baf24c36a913db0165eefa34c3634cf2762 SHA512 724d9d28f4f2f75518685652207385f9a1d40845b744952e3f225ba08f6973cc5b306ac6919474fe02b454b3a85b7f0cd2ecffb43f6420d26f14c3d1246ce44f
 EBUILD qtserialport-5.9.4.ebuild 539 BLAKE2B c2128a79328ce2effe83b6c2135fc07a1e1eeaf00d85b4148116fc30b9e6a459ca7b66983b9051f9e027d7af5ab3e2d39b04b888a730e24a219f4ee092542ba3 SHA512 200bf31da4b42d7ac46e684b2218b94ddb415988967ea175321dba67f4327693db43d86093d13bba151f045d601baf242824802cb1920379b1d3993a4bb214ab
 EBUILD qtserialport-5.9.5.ebuild 542 BLAKE2B e4294b0bd51fcfd1d6c605e26ca0496121dcd06fba63b8cf8870a0bc2a1e0292766210d0da7fbe38514c2db1245f5baf24c36a913db0165eefa34c3634cf2762 SHA512 724d9d28f4f2f75518685652207385f9a1d40845b744952e3f225ba08f6973cc5b306ac6919474fe02b454b3a85b7f0cd2ecffb43f6420d26f14c3d1246ce44f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.11.0_beta4.ebuild b/dev-qt/qtserialport/qtserialport-5.11.0_rc.ebuild
index 9798eabab40f..9798eabab40f 100644
--- a/dev-qt/qtserialport/qtserialport-5.11.0_beta4.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.11.0_rc.ebuild
diff --git a/dev-qt/qtserialport/qtserialport-5.7.1.ebuild b/dev-qt/qtserialport/qtserialport-5.7.1.ebuild
deleted file mode 100644
index 8560cf614830..000000000000
--- a/dev-qt/qtserialport/qtserialport-5.7.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Serial port abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	virtual/libudev:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# make sure we link against libudev
-	sed -i -e 's/:contains(QT_CONFIG,\s*libudev)//' \
-		src/serialport/serialport-lib.pri || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 71791289169c..9d92ce4d74e0 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,8 +1,8 @@
 AUX qtspeech-5.9.4-nogui.patch 321 BLAKE2B 0b97c282f271a1ba1d7cfa2ba15f75bb2964c3eeaa0a946346ae0725e2a7a9198fd0dce4bf85ad9b0d06e49234dc11203d5a0f52e11e17b879a9dc1712014e91 SHA512 8d2dce3280948bc0451d0f753d415552c556c089d5195172953215c3abdf14100a3284699e9d5cfd0feca83466d1a35945a8bd2a863b325ea5e257b277a0e71f
-DIST qtspeech-everywhere-src-5.11.0-beta4.tar.xz 102044 BLAKE2B 6a23fd8626855ee63c88b0dfb134f0ebb6baa56860c83b23178f02034fc9d6de00042b9c4ee6c1de743c593562ac7a1801f0ad34c70506eed650f3dc519403f5 SHA512 560b2ef70da0393f9d3e9cbbe653db77a6702c3ecfdf69a2f573b1ee75680e5bd23440a76c67d51dd39355787a00ceb0dbf4b3c9330913e140582af008f5aa99
+DIST qtspeech-everywhere-src-5.11.0-rc.tar.xz 102452 BLAKE2B 364db28d2d349b615f82813d761655c2cd74a4601e1bea8836e9c0f12c5e2fdb4130bda29402194e7aea1089818567637bd8365e54dd9b05da6b54e31f9ccff7 SHA512 07f3ca4e3295efb8142223e50140d7b212bacb091257e9ba6df76e2903113046a52a1888710f715469ff40f3e4a7058a413ed83d8430b86b4dd3755c5ee1c7e2
 DIST qtspeech-opensource-src-5.9.4.tar.xz 80860 BLAKE2B 8556d375edc5bf0e3edd9745cef6bccab3e2457efee1fa4cc3f6d4feb90da3f651135ba9034caac474ef2e9888bbb3a41771d85b4f8a13b16867ba516a42f47b SHA512 6e2913b23c57cb0dd407b09db78fbb9b6b15c721f6d7af65c744d71f8a66f235a1069b1098eb5cd8b35449255ef94af2a96b2c4a1c550fe0e03000e023c393d9
 DIST qtspeech-opensource-src-5.9.5.tar.xz 80812 BLAKE2B 043dc3d93deec7fe7a38343811eba3df5acc32ffee477651fb014726a3f82ef296253909389bca9ded3e77a1e7b27b88951054809487350b365e0cb400b9b07b SHA512 a4ca5b3fff120b02b62f25551b1f68ad44165707fbc02107dfc7eb915868e515d0fac7189d16f53d9ecc60fee2c082f34040ae95f7199feb5b23deee8b44872b
-EBUILD qtspeech-5.11.0_beta4.ebuild 478 BLAKE2B 258c4717dcc4774fd9fd621b5514fe8d042be51c7042cc2c9a8a17aa471b839a92026886384d5f9a53afa23285e66727c611f832dc60ebb0fedd97dd29680986 SHA512 50a9e1c505337b086db5b9ec4d734acd18559c768732f161aa7b936b3fb5c29866657bcd96995298440431881913892eca7e60447460ca09e64bad9f3155539a
+EBUILD qtspeech-5.11.0_rc.ebuild 478 BLAKE2B 258c4717dcc4774fd9fd621b5514fe8d042be51c7042cc2c9a8a17aa471b839a92026886384d5f9a53afa23285e66727c611f832dc60ebb0fedd97dd29680986 SHA512 50a9e1c505337b086db5b9ec4d734acd18559c768732f161aa7b936b3fb5c29866657bcd96995298440431881913892eca7e60447460ca09e64bad9f3155539a
 EBUILD qtspeech-5.9.4.ebuild 476 BLAKE2B cd2475975fd575808f8a4b377a27e1d06a2dad24b116a13151043a4d1d5f7b34e8e0b8f21cc1c05c9495edba49b4b9422aae30b8f34f2465d29d3472620d4388 SHA512 70c6608ebd1f2e986eb55d4a82b7a035a5cd5dee458200e0853833e7afa0926d8fd8f675247ddc38bb89bbf6b626dda226ead53ced0f2ecaa4b240eb204813da
 EBUILD qtspeech-5.9.5.ebuild 478 BLAKE2B 258c4717dcc4774fd9fd621b5514fe8d042be51c7042cc2c9a8a17aa471b839a92026886384d5f9a53afa23285e66727c611f832dc60ebb0fedd97dd29680986 SHA512 50a9e1c505337b086db5b9ec4d734acd18559c768732f161aa7b936b3fb5c29866657bcd96995298440431881913892eca7e60447460ca09e64bad9f3155539a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.11.0_beta4.ebuild b/dev-qt/qtspeech/qtspeech-5.11.0_rc.ebuild
index 24627d2b8665..24627d2b8665 100644
--- a/dev-qt/qtspeech/qtspeech-5.11.0_beta4.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.11.0_rc.ebuild
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 549a0d6035b3..875c42243b85 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,14 +1,11 @@
-AUX qtsql-5.7.1-mariadb.patch 1888 BLAKE2B bd8a93f2b28ac9db84c1da1d294c974f1bed0a87a99177c0ac9738d4057d168be7d563d1c34ba40c2695dad47c83b16a6d9d05257dd1e768e1f3c5049fe1cc65 SHA512 4fb0e066eaf848feb7379d4f0f92e26a1e60e9003d77b8976588036df09c04cc24431335cfe08616a4c23b10975ba44e6c25b92417a8f285308bc8f0b46c2c78
 AUX qtsql-5.9.4-mariadb-10.2.patch 1187 BLAKE2B 1ee0a4ad020a1d0e5bcaa19ac987eb5b472f9701adf876024003e377ca40060a52323bdfd3ec8213e6e8e199336bbfd92c7aab716be38b46fd105628eea447f6 SHA512 3ad71a5c3a31bb60484de09bb6503fd1c35f6e55aa2116f5ea468314a3c72cc43ddcfde6da01f479f91c381fbf2f2e64024ab88cf0e8f2e0a3edbda45bd44609
 AUX qtsql-5.9.5-mariadb-10.2.patch 1199 BLAKE2B cb5d5079aca9f9adb0343db8691418afc1e1b43c8a425f5c8f52ab24872047c9f9bdadfe48fee9e7c85b5cd1f886951aa3777f55ccada790113150c71a77ca42 SHA512 be4d8c3569ba3007a0b512184295f12043b79e09e948651fae3af5b4a6e7e0ebcf5c5f55c32c321c64a469eefeff16ee7169bbc03d7027ee04d62d384e04288d
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtbase-everywhere-src-5.11.0-beta4.tar.xz 46815720 BLAKE2B bf21828ed94d02140ebc5b9f366b935f944c40b8fe15094161a9c3d0adc16b2e8bfa7f4d514030569f5f463f39dd8083b6cacb536e71b1e81f743749c8742682 SHA512 c70b575729bdbd580d32350a233dfa1db3f450a3e0f4f41a5c8d153df396edc3f795099e4bf3447d3a0751f9acbc1978b4e499c6dbb6d9357c0288288b83d5ca
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
+DIST qtbase-everywhere-src-5.11.0-rc.tar.xz 46807012 BLAKE2B 76bcc9c71470f09ddb119e0098b58e5f505eb985e39a131100e4b7ddfaa8f5785e534296052631ae1407398e548a8fbf4ce23e05d6d1b5242d35c9ba7d1d08cc SHA512 3cd738f7f3179703275a8604709af70fba4148132ef6f2f8d13f8ea7c767c5f9ae3a11fd96cce49f090ecdf85fa04df0a8551d31d9d05c9efca50ab21ebcfd36
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
 EBUILD qtsql-4.8.7-r1.ebuild 2261 BLAKE2B 24e39792f5fd56b5d61a7b61dee71f00cae4a45436e74137de29460d89c5c13235811142dfb8f5499eea483890c4c39ff2fd9d86f0ac9e52f05d08499b1ac8ce SHA512 a81056b36b8a081403824b1102883d7d35e181c05bc6b8e56e29c227ec832fe712a1dde8a4178a30bad5454798aa17eaf33890403c15b08b67cb221487b8e4ca
-EBUILD qtsql-5.11.0_beta4.ebuild 1469 BLAKE2B cdd2ec18ec1e1487d311caa9f752aa0888e66d0130675ce3a9dafa1f1b58921cc5fb17a98fcf1bc552c41a3d8f003bdc5ffa2715afee4fc26d8aee240129798a SHA512 63ed07f225e86ce674b3d1f26c52eee4c44fcf00d5a96ba0e2104dc6cceafba8e21b9a05b9d23819738bf8e0e98b77b7184b3e35f0d8e91b983d99fc7027bd4d
-EBUILD qtsql-5.7.1-r1.ebuild 1468 BLAKE2B c8765bf757236f1556d55318f9777f7dffa3a68dd2e73e991836da5f05b48b8d28b3c80b99873d8f79e112acace4fd06348350e24fee06cbbdf5bc079f52222d SHA512 074c701f0d8d5dee3e4d496651ba8aea30be61e649ff6b26306fcbe2f13c22c8577a91eaa45f31116ee105e1fda8f84cba0f44e4e49c96ffe2f43b2d7bd83522
+EBUILD qtsql-5.11.0_rc.ebuild 1469 BLAKE2B cdd2ec18ec1e1487d311caa9f752aa0888e66d0130675ce3a9dafa1f1b58921cc5fb17a98fcf1bc552c41a3d8f003bdc5ffa2715afee4fc26d8aee240129798a SHA512 63ed07f225e86ce674b3d1f26c52eee4c44fcf00d5a96ba0e2104dc6cceafba8e21b9a05b9d23819738bf8e0e98b77b7184b3e35f0d8e91b983d99fc7027bd4d
 EBUILD qtsql-5.9.4-r1.ebuild 1576 BLAKE2B e87c3461b70676298963c099fa518a622e05cf054f5dfebb707584ba6c629c37844b3d29c5dd846128f38295abdf26b016347a2b34ff9b1592dbcda74d89fdd6 SHA512 d33dca9366dc91e4410eed715aa3e31028dfc4be35f3cdc9dc266d3a83ba12c77e210362320a5e78ae9d9f8d3e77ea08cba9409b4a79e1317daa1aa7c7f8569a
 EBUILD qtsql-5.9.5.ebuild 1587 BLAKE2B f33e314530ad8acddb838f505d74dee0e3638809a759ebc5f195ae31680ed393ba5426801b55eb2ed50c1354b0fca66ea920beafd5584faca27b2e9124c9ab29 SHA512 492ac2cb3cd76a1fab47161fdaa79a97a478798dc25d80429a6d77e4f219caf869bc9dc55eec74f3460c658241f1a02dfad04f44483b9f071f807655351382e5
 MISC metadata.xml 701 BLAKE2B b9f31dc4bdb158bda952ca941dc3a5f70004800c8874e310a2a9634223dde59e799df9b4f9d424d89870c191fe041ec29ecbab79c1f04be55c786170d921c10e SHA512 c807e5c85d7e4f23f15ef9f95f4bed3e303e25e355a096ee118e4846330948957dc44d16c97d3c687ee30a5895c511e9d1480a39ddf2360f8989d06daf0b91b8
diff --git a/dev-qt/qtsql/files/qtsql-5.7.1-mariadb.patch b/dev-qt/qtsql/files/qtsql-5.7.1-mariadb.patch
deleted file mode 100644
index 8aede46c3b4d..000000000000
--- a/dev-qt/qtsql/files/qtsql-5.7.1-mariadb.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d25346417238b7dc0fb37359a9b56eff2908a5dc Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Daniel=20Vr=C3=A1til?= <daniel.vratil@kdab.com>
-Date: Mon, 18 Sep 2017 22:33:55 +0200
-Subject: [PATCH] Only call mysql_library_end() once when using MariaDB
-
-MariaDB allows only a single call to mysql_library_end(), all subsequent calls
-to mysql_library_init() or any other API call will fail. Since QMYSQLDriver
-calls mysql_library_end() function whenever the refcount drops to 0, this
-breaks applications that close and reopen database connections.
-
-This change registers call to mysql_library_init() via qAddPostRoutine()
-when compiled against MariaDB, so that we only call it once.
-
-Task-number: QTBUG-63108
-Change-Id: I22c1f0c5b081216f12596a32748dca25cae919e9
-Reviewed-by: Andy Shaw <andy.shaw@qt.io>
----
- src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
-index ee439fa..6e428fb 100644
---- a/src/sql/drivers/mysql/qsql_mysql.cpp
-+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -1158,16 +1158,22 @@ static void qLibraryInit()
-     }
- # endif // MYSQL_VERSION_ID
- #endif // Q_NO_MYSQL_EMBEDDED
-+
-+#ifdef MARIADB_BASE_VERSION
-+    qAddPostRoutine(mysql_server_end);
-+#endif
- }
- 
- static void qLibraryEnd()
- {
--#ifndef Q_NO_MYSQL_EMBEDDED
--# if MYSQL_VERSION_ID > 40000
--#  if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
--    mysql_library_end();
--#  else
--    mysql_server_end();
-+#if !defined(MARIADB_BASE_VERSION)
-+# if !defined(Q_NO_MYSQL_EMBEDDED)
-+#  if MYSQL_VERSION_ID > 40000
-+#   if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
-+     mysql_library_end();
-+#   else
-+     mysql_server_end();
-+#   endif
- #  endif
- # endif
- #endif
--- 
-2.7.4
-
diff --git a/dev-qt/qtsql/qtsql-5.11.0_beta4.ebuild b/dev-qt/qtsql/qtsql-5.11.0_rc.ebuild
index db29e42db712..db29e42db712 100644
--- a/dev-qt/qtsql/qtsql-5.11.0_beta4.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.0_rc.ebuild
diff --git a/dev-qt/qtsql/qtsql-5.7.1-r1.ebuild b/dev-qt/qtsql/qtsql-5.7.1-r1.ebuild
deleted file mode 100644
index 71698562ab53..000000000000
--- a/dev-qt/qtsql/qtsql-5.7.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	freetds? ( dev-db/freetds )
-	mysql? ( virtual/libmysqlclient:= )
-	oci8? ( dev-db/oracle-instantclient-basic )
-	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.7.1-mariadb.patch" )
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin)
-		$(qt_use oci8     sql-oci    plugin)
-		$(qt_use odbc     sql-odbc   plugin)
-		$(qt_use postgres sql-psql   plugin)
-		$(qt_use sqlite   sql-sqlite plugin)
-		$(usex sqlite -system-sqlite '')
-	)
-
-	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
-	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 61d8213cbbfe..4fab5b59a297 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,11 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtsvg-everywhere-src-5.11.0-beta4.tar.xz 1812488 BLAKE2B 09498fdc94522efc18ade452efdb3ceff0fe916f44e97e995fd972acb2d2dac1e3bb0199aae073668397e203e82af6c9390b8ec820fdfa796dd7e9ffabaecfdc SHA512 210f8bae91aa4a28aa733af4746b6e43d1ff6141a8d00e9c1b2ecf0238c854fa2a65ce8bcdbc17c41df4bd6c8233d5e00e246e889e6e1facf4fb79cd4602915f
-DIST qtsvg-opensource-src-5.7.1.tar.xz 1751536 BLAKE2B c883dc94700b9dc442da403dfd5f9d690b98787a8710a24960a9ee65848327ed9741825e126a063c60aa1302879dfea8cd5fcd36860ce30e204eda79dc528849 SHA512 b4ba18a81ddf381f635c608f2ca6f339859b964aedf310fea9b4845d50154b5256759583abe14126e6bb86a9daad8a6e597910ce2036af26ae221b925817e260
+DIST qtsvg-everywhere-src-5.11.0-rc.tar.xz 1812688 BLAKE2B e145bb66e7ebbf48f18f4c2eaee2bc77f2123553eafd1c715d9faf009a0118616e001055c05084a137dd7ba8a55f8cb44aab61937205dd99a0904bd5103c1243 SHA512 c258eff37a71a55c05a7118121ed7dfd4fa1018d9353e3e7d11889ebb180f98fd873ae754d4f73dd65662636e797dc6607dffa2dd767ddfdc4294a306298ed33
 DIST qtsvg-opensource-src-5.9.4.tar.xz 1778072 BLAKE2B 077ca02c7a43cc5cc6170e0c24ee155e3d190033837494c58804934881361f738709f0aed9d876dada19c48b194624b90a759cf509c9e1fb9c566514a4f5c430 SHA512 242a471ba8b1b3fe45d53e0dbdd2bcba0ffe129f7658fa3608fb0f8ee72bf56244522861c12315eabc401f389031bea2027eb106eec67688f141ea8550b6b2b5
 DIST qtsvg-opensource-src-5.9.5.tar.xz 1778820 BLAKE2B 14d3250e0636e1be55cac97b0dfcc9e642cf4aec378e7544538b13b0e77ef3a240791099ee18391385266ef495353634c7a3e6423e54d85c93b7aa32317d6932 SHA512 e087f07d76833a8d215225cc7499e40ec56aac979bdaec2018918bccc89ee9eb2fcf3f41584694e29c73ab4ea531e33cf1652380e8b8f75e4b16547b17a9fd20
 EBUILD qtsvg-4.8.7.ebuild 1147 BLAKE2B 2c640fadf3d57b7c745be9dd822be6db9a070dd077026197df9eabb9c398ee66a22a9bd9e9223c1ab99e9da6985a33cfdf47cd68c5350abb3614711d48f04226 SHA512 68e74c1c97a630ad57c2e6aeaa7d5a73b90c13eb29e9bf513a7b19b26b990b234e16d77c04231b59f8aa53110551c7b9844aae1f60f0f0bc8b94322911a6f583
-EBUILD qtsvg-5.11.0_beta4.ebuild 471 BLAKE2B 7d28048cbec0b1d0ebc7a155681f7636e1e7cbe08f7a9f6f8b00f8310696b8cbb6d786b217734d157987ddec8f124e402cdcd5fe134b89b11b36548bbbf96142 SHA512 2a140ea11d851126ce2242dccbb4475bcd662ef334df117a52c57bb7dfe26b29b2ffa54e281f6fc9c52b8ce1826c3ff02ebdeba3c419e470f11ab854c87bc66f
-EBUILD qtsvg-5.7.1.ebuild 454 BLAKE2B 81377e33484f58c852798548593f274643c89570f061c50cbe9b76312cbad886436250d3dc703408f204a72cf0fd5ebc0ff2ead25f6596eec34fcbaff6dc33fc SHA512 164521f4c694bac7e803203f1e80c50cb937aabf56a6b2e36ec27f376173328daf621080ec0bb8577cb00720c41ef208ef7c4225193bc667329a3b1c06dfe8bf
+EBUILD qtsvg-5.11.0_rc.ebuild 471 BLAKE2B 7d28048cbec0b1d0ebc7a155681f7636e1e7cbe08f7a9f6f8b00f8310696b8cbb6d786b217734d157987ddec8f124e402cdcd5fe134b89b11b36548bbbf96142 SHA512 2a140ea11d851126ce2242dccbb4475bcd662ef334df117a52c57bb7dfe26b29b2ffa54e281f6fc9c52b8ce1826c3ff02ebdeba3c419e470f11ab854c87bc66f
 EBUILD qtsvg-5.9.4-r2.ebuild 491 BLAKE2B 1f78d69d00c5ff09b09581769de621315a993c709ed19c09064fde88008c924d0ec59779946d3b3f6385787586a406e63cf91b1db33dc531fb02574f296565b4 SHA512 0eee956fca2fcbf1b2ec2c934e0c76a289941ca7112f37cc66f41807290a3e640299972e5239bc8682d87ebb639ce30db27d6b0c34184d5f4c21ad01d9eabcb1
 EBUILD qtsvg-5.9.5.ebuild 471 BLAKE2B 7d28048cbec0b1d0ebc7a155681f7636e1e7cbe08f7a9f6f8b00f8310696b8cbb6d786b217734d157987ddec8f124e402cdcd5fe134b89b11b36548bbbf96142 SHA512 2a140ea11d851126ce2242dccbb4475bcd662ef334df117a52c57bb7dfe26b29b2ffa54e281f6fc9c52b8ce1826c3ff02ebdeba3c419e470f11ab854c87bc66f
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qtsvg/qtsvg-5.11.0_beta4.ebuild b/dev-qt/qtsvg/qtsvg-5.11.0_rc.ebuild
index 8afd46f07af4..8afd46f07af4 100644
--- a/dev-qt/qtsvg/qtsvg-5.11.0_beta4.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.11.0_rc.ebuild
diff --git a/dev-qt/qtsvg/qtsvg-5.7.1.ebuild b/dev-qt/qtsvg/qtsvg-5.7.1.ebuild
deleted file mode 100644
index 3ff247d0daf6..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.7.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
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	>=sys-libs/zlib-1.2.5
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtxml-${PV} )
-"
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 4093502e79e6..1d5255706eaf 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,11 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtbase-everywhere-src-5.11.0-beta4.tar.xz 46815720 BLAKE2B bf21828ed94d02140ebc5b9f366b935f944c40b8fe15094161a9c3d0adc16b2e8bfa7f4d514030569f5f463f39dd8083b6cacb536e71b1e81f743749c8742682 SHA512 c70b575729bdbd580d32350a233dfa1db3f450a3e0f4f41a5c8d153df396edc3f795099e4bf3447d3a0751f9acbc1978b4e499c6dbb6d9357c0288288b83d5ca
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
+DIST qtbase-everywhere-src-5.11.0-rc.tar.xz 46807012 BLAKE2B 76bcc9c71470f09ddb119e0098b58e5f505eb985e39a131100e4b7ddfaa8f5785e534296052631ae1407398e548a8fbf4ce23e05d6d1b5242d35c9ba7d1d08cc SHA512 3cd738f7f3179703275a8604709af70fba4148132ef6f2f8d13f8ea7c767c5f9ae3a11fd96cce49f090ecdf85fa04df0a8551d31d9d05c9efca50ab21ebcfd36
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
 EBUILD qttest-4.8.7.ebuild 933 BLAKE2B 234731d6bc636f8aafa311de9cfb8a89e3e6bdb5bab4b1fc2fd4b78bdead1eb3fa29df292e9bae5b73cad6b8c364984b6a16e76dff8b4e98621adf9e74333297 SHA512 7d2f377603287d0aff165aac7017622e0b8e4445103696911d6784c108cb4d9f1f04200c1baaf6aaaebb865c5038ce0d393240c91e6da06968c91171d93568e8
-EBUILD qttest-5.11.0_beta4.ebuild 549 BLAKE2B 42c5c9b7054d7838c2ec9db74c44b4e6421e3146398ad9568461ed8163a0ad49594c7d3827a6519d044139d3b03fc3d32132cb759a257755c22c850c0bf124f9 SHA512 df67411113389754057bf2157ed1a6ebdd5078ac9d2beeeee87e828ba9eb58c904ccb220aa1c12b9186d06b8d38263ec03d9babdc97d00891c11bd12d60fda88
-EBUILD qttest-5.7.1.ebuild 491 BLAKE2B 0eba13b68fe2eb637ec8516a2969c59c28959493dd57c62744f4e4d4e1596c75710cd0b4e06560df9232520ead8aa02c4d2fde0a3b362971a27476e3a4da3b4b SHA512 8709179f307e0c8a179fb13d947762807db80fdd81ad4fefd54fc88d95b98fa4efca98e41a6deaca734e99df4e581705e36bbb0d92a0a5c357e01e7efcc878d6
+EBUILD qttest-5.11.0_rc.ebuild 549 BLAKE2B 42c5c9b7054d7838c2ec9db74c44b4e6421e3146398ad9568461ed8163a0ad49594c7d3827a6519d044139d3b03fc3d32132cb759a257755c22c850c0bf124f9 SHA512 df67411113389754057bf2157ed1a6ebdd5078ac9d2beeeee87e828ba9eb58c904ccb220aa1c12b9186d06b8d38263ec03d9babdc97d00891c11bd12d60fda88
 EBUILD qttest-5.9.4.ebuild 545 BLAKE2B 85bbb66b553452f36b6afbd85eeb571008e7b9e0b243307a1cca65068f8ae7e0f50d2d9c65b65d4b70af4966495e57a093382d05afa69b112b0974c1aa14a224 SHA512 50a40c8669a267cfaaed421d9e5d48b22ac6cfeb502bc63b49abba6062f022b52c8141868c388a1a3c1f9fcf819070f29796fd0d229090b9a3eac39b8a4dcbb6
 EBUILD qttest-5.9.5.ebuild 549 BLAKE2B 42c5c9b7054d7838c2ec9db74c44b4e6421e3146398ad9568461ed8163a0ad49594c7d3827a6519d044139d3b03fc3d32132cb759a257755c22c850c0bf124f9 SHA512 df67411113389754057bf2157ed1a6ebdd5078ac9d2beeeee87e828ba9eb58c904ccb220aa1c12b9186d06b8d38263ec03d9babdc97d00891c11bd12d60fda88
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qttest/qttest-5.11.0_beta4.ebuild b/dev-qt/qttest/qttest-5.11.0_rc.ebuild
index a136469c91b4..a136469c91b4 100644
--- a/dev-qt/qttest/qttest-5.11.0_beta4.ebuild
+++ b/dev-qt/qttest/qttest-5.11.0_rc.ebuild
diff --git a/dev-qt/qttest/qttest-5.7.1.ebuild b/dev-qt/qttest/qttest-5.7.1.ebuild
deleted file mode 100644
index c62adf96024f..000000000000
--- a/dev-qt/qttest/qttest-5.7.1.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
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Unit testing library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtxml-${PV}
-	)
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/testlib
-)
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 45c3e7bbac3e..a77d0ca40dfe 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,11 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qttranslations-everywhere-src-5.11.0-beta4.tar.xz 1423960 BLAKE2B 2e87f67f445e25a76160beb07414beeb7bdd1bf3f6bcc37f2326494c884c1041c77d5a2c84186d8ac909f0136aec696f70bad11712ce81e5e8f9259e2083516c SHA512 5c344a5a5966667d808a1e45dde6601a51462ddc778c2ce5806948a59781c34814d21dee304c0d26832370bda3e36aa47f3b1e621784134c45e9c474af5cde82
-DIST qttranslations-opensource-src-5.7.1.tar.xz 1206116 BLAKE2B 071d703ed32eed88d34318617e00bae96ec0c1a3e75a4880d76a9f952fe5449c2cc9234433234d013e0971696c1f7ae677f14cf5c6a6ecb8df438ef2db1918ea SHA512 8d7705d1fb2569f90bb7fbb9bdfe7ffdbf7a8746ee4da634f66fb7f70c14b91f7257165b6ac041cbe4918b88e6ec344c8e554f1e7339257e7e1b9a06e78ba837
+DIST qttranslations-everywhere-src-5.11.0-rc.tar.xz 1423864 BLAKE2B 1a9a96c492a507872b529c66c33a3b67f8a69bf3b24d2827845cb42665a7b24978354eb1d199dd6cce92caa2271d8f813516e5261bb9b40a4ed72a06d0c0fbad SHA512 cdaa62d51187424e35031ac70e343630b0176f8f7c0f4457fc5a2859aab73cee12aa1dbc8348243232533b29e25257d5f0be5fc261fdc2472f6b7df9d2f2ca73
 DIST qttranslations-opensource-src-5.9.4.tar.xz 1451972 BLAKE2B f859c764d63673866bc8be88d4e5f9e2956b3bd08a883268a0c9cbca45a7132578a87b98eadf592944864da2d70cbbff0b46a75665faaa72c4f6a723f203cdb6 SHA512 74375ee78e40e8de2349e575306c729d90d80de089f44d4ff57506085c748d5eb5d0699a769d4379f7dd23c48ab88b7e5a8227044ce07d6ae12b0d3ac19450f0
 DIST qttranslations-opensource-src-5.9.5.tar.xz 1376184 BLAKE2B 3f3173d30fd1f7457abd7034e3e5abbe0495c6f13c9192577686cbea52378d895bea0d4b8f7331c96a019ae891930898c01f19ff132eded907114f0fa87647e8 SHA512 29aa5704d5ce30c013732ab51964ecd869c1765618343e6cf3c89d4f1cdf3ce1c06a4c15ad24a6e4f690d0770daaffea6a1f24214976de38087e7de3eb32c1ce
 EBUILD qttranslations-4.8.7.ebuild 773 BLAKE2B cd0ea1b0a67d8d9d8ee6fd5d5bf4c2bd37aa42ab5e7250ade8f4fe689bed011caccecf51dce162b2c445eef3b725ca183a37831e03d5e11d88687e5071c9d597 SHA512 1f833bde8f1dcdbd7838cee55c193738203bf74d0ef55865bfe511e3f5749675d216669af2476530e3b27e3b12ef481e092e7866e6fffafe9d8bfba75d3a52ab
-EBUILD qttranslations-5.11.0_beta4.ebuild 379 BLAKE2B 983cfd8e6e4342992f7d945371452484b3208909b390595036f98cac87d1199f82ff53f12c449eabdfad1dc4f4f88538b2a77490c20dbe1ea7f85b85eb28fc06 SHA512 66c2e18d13961fcaae9ca45a04772f13e18a08f1097ae543a4b2828ad9d8d91526259fb978d2476b67804068c8f3b48466ab2f1fd840debeabf43174111201b1
-EBUILD qttranslations-5.7.1.ebuild 362 BLAKE2B 8f10c534af773d6935f5d1918b866eaef3a8234e5d971239e69410c74372455144bf609a6a741b16b44339831272b6f897b562368b8e82e29af79e7d545c6cd6 SHA512 f5e75b59fc5457b491084946657acd1268f1fc64b723f5a91564b4a21606569ab45137913618ab3501a58fefea59793a298c241f0be462279a857ad836ae34e1
+EBUILD qttranslations-5.11.0_rc.ebuild 379 BLAKE2B 983cfd8e6e4342992f7d945371452484b3208909b390595036f98cac87d1199f82ff53f12c449eabdfad1dc4f4f88538b2a77490c20dbe1ea7f85b85eb28fc06 SHA512 66c2e18d13961fcaae9ca45a04772f13e18a08f1097ae543a4b2828ad9d8d91526259fb978d2476b67804068c8f3b48466ab2f1fd840debeabf43174111201b1
 EBUILD qttranslations-5.9.4.ebuild 375 BLAKE2B 1eb759e922cfdd8c16db5a2a275bd51b700369aaa0cc660cf80996506826f223dc1441c817bb5bc7ca2ab4d5eca57e71d2311821e257fd4371e254b3b30d6fba SHA512 6d72e2552b8fd5746029c4d76e43fa62162e520eed2a091d2ef605e9b6ffbede380dc9d6b6ac64774b309776346cbb6e71a889d1d647ef23d6700a28ae29e8b3
 EBUILD qttranslations-5.9.5.ebuild 379 BLAKE2B 983cfd8e6e4342992f7d945371452484b3208909b390595036f98cac87d1199f82ff53f12c449eabdfad1dc4f4f88538b2a77490c20dbe1ea7f85b85eb28fc06 SHA512 66c2e18d13961fcaae9ca45a04772f13e18a08f1097ae543a4b2828ad9d8d91526259fb978d2476b67804068c8f3b48466ab2f1fd840debeabf43174111201b1
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.11.0_beta4.ebuild b/dev-qt/qttranslations/qttranslations-5.11.0_rc.ebuild
index 0229115262ce..0229115262ce 100644
--- a/dev-qt/qttranslations/qttranslations-5.11.0_beta4.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.11.0_rc.ebuild
diff --git a/dev-qt/qttranslations/qttranslations-5.7.1.ebuild b/dev-qt/qttranslations/qttranslations-5.7.1.ebuild
deleted file mode 100644
index 304991c75ecd..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Translation files for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/linguist-tools-${PV}
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 31e22a1f17f8..86287693617c 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,9 +1,7 @@
-DIST qtvirtualkeyboard-everywhere-src-5.11.0-beta4.tar.xz 10167564 BLAKE2B 2911d0b49250d3f5f6d00bf29df6af98b7e43f1894fe25fe1d904a3796204ba99e24c84ad2a297203a89054a22ee94be5caaf30fe634b9571826df61d1a497a9 SHA512 e003cf91397140419781c90e0796f10a6a2e7be99180ed2bb085fd3e37dbd4e034440b9937bac79fe65486ed59bd50cb7ae5fe0e70cc2402180bb5db724afb59
-DIST qtvirtualkeyboard-opensource-src-5.7.1.tar.xz 10014088 BLAKE2B 02f460a58d1dd26bdfff788003857c2a0b9e37cab3001fcf18edf0c9f26a8bbedcd96391300f20a89f3ab5021f977bc7a4cdccb1851ba594e9b64950b4a090aa SHA512 31481a88b91ef936437e54c863d39a63917496bd5701670ed38f1695c7cc6d867b8cc0eede62a523d5fea3819bc2688845277c9737349a0982de711cc464f00f
+DIST qtvirtualkeyboard-everywhere-src-5.11.0-rc.tar.xz 10641192 BLAKE2B c043ccf821eb4c6a09b855e9ffac5eec2bee8a63e015925c4f911dfe8e8ad75c1d21cbe004d82991619d6a8ee0b3a2f1ffee8e13a864266e81015dc478044ba5 SHA512 c28441cdc70c4690ac9377fc7ab3b4fe13af5aff45d51506c44e785044c80c31862528861b345316d0e2d92dd7ea1a91a919f30c06647d1e95133629c5c9adf5
 DIST qtvirtualkeyboard-opensource-src-5.9.4.tar.xz 10026856 BLAKE2B 7097d8243d11bb7b3cbc9f85cb124ca587e6652a67877e3c771a5c5dcca9c20f952474ffe8ab434caa6d2620e66e381829dc23e3dec927c1776f31a76b599d30 SHA512 6c10d3432cdb61a800c0eba436e135908cc44b5d36d14c93230e7284aae6fd671e116ddb976e610b37c4251c0b6ce4325be4464fec73d042eb9e9f29ee4397e6
 DIST qtvirtualkeyboard-opensource-src-5.9.5.tar.xz 10044924 BLAKE2B 5a01b42cae8928575db1e71a4cba630ec4332606fb32e45ad64b401af20e450d3b5e53758022a060655b93ec7a6d48c61b5264fa40af03b74ffaae5894789a7c SHA512 ad3e01eefd6f7689818472724abccde0b5bf6680cf61bbe20c9cf1b3de85f26322cf3e68b58924a455e6563fd8873dbb69d718e7b86805ded2ede7d4f7c0bb1c
-EBUILD qtvirtualkeyboard-5.11.0_beta4.ebuild 1018 BLAKE2B 5d12341e9ad1471f01d690b428e0c197951744a3bc67ca4a5cc0403825b1eec9518eac44d531f511558f63889ae7bce2ae19c3281ee8eb195c3b419620efc109 SHA512 2b63dec804b4583f9bfe66f4babb537b2bc408bd8e09dd25c1f63a67c9d8d6a03e251f56bdcf05a3909a680d0a20c9280d7036de5edf1afc68f5bc8752296905
-EBUILD qtvirtualkeyboard-5.7.1.ebuild 997 BLAKE2B d961e5a79c9bbbe52c52a940a24e4d933cfc69a43cf7ddcf93cf46ba6e3e4bb3b64a2f998a90c37c81c445031628acbb4cb7fc60b9cb49ef937c116c30cc8633 SHA512 1bad77e24919a9d2b7d3aa4f4568ff491b9edddeaf2812f2f5cc93fe11dd0c24c747e82db263650f972821c3aa2e660a75ed40c21cb7dd8642dbe9b4f863d3ca
+EBUILD qtvirtualkeyboard-5.11.0_rc.ebuild 1018 BLAKE2B 5d12341e9ad1471f01d690b428e0c197951744a3bc67ca4a5cc0403825b1eec9518eac44d531f511558f63889ae7bce2ae19c3281ee8eb195c3b419620efc109 SHA512 2b63dec804b4583f9bfe66f4babb537b2bc408bd8e09dd25c1f63a67c9d8d6a03e251f56bdcf05a3909a680d0a20c9280d7036de5edf1afc68f5bc8752296905
 EBUILD qtvirtualkeyboard-5.9.4.ebuild 1016 BLAKE2B 5260dc083a9159dcb1b3948cdea26e7d0ad6ff17322830876a90352b9955b3514e62412403cd8592e13ec4131ec4ce304b5d19deefbdf1e761fd2deb34020243 SHA512 c546cdcb5d1ffa3bd637558aa16a7147979aeb7a06e3bb49bc34754dbf70c8138d7aed9c08ea2feca4120b495dac880b76c2cdb3b895e3e82750469e19fcffc2
 EBUILD qtvirtualkeyboard-5.9.5.ebuild 1018 BLAKE2B 5d12341e9ad1471f01d690b428e0c197951744a3bc67ca4a5cc0403825b1eec9518eac44d531f511558f63889ae7bce2ae19c3281ee8eb195c3b419620efc109 SHA512 2b63dec804b4583f9bfe66f4babb537b2bc408bd8e09dd25c1f63a67c9d8d6a03e251f56bdcf05a3909a680d0a20c9280d7036de5edf1afc68f5bc8752296905
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.0_beta4.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.0_rc.ebuild
index 21fd992d37cf..21fd992d37cf 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.0_beta4.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.0_rc.ebuild
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.7.1.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.7.1.ebuild
deleted file mode 100644
index f4fd12c22636..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Virtual keyboard plugin for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-# TODO: unbudle libraries for more layouts
-IUSE="handwriting +spell +xcb"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtsvg-${PV}
-	spell? ( app-text/hunspell:= )
-	xcb? ( x11-libs/libxcb:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex handwriting CONFIG+=lipi-toolkit "")
-		$(usex spell "" CONFIG+=disable-hunspell)
-		$(usex xcb "" CONFIG+=disable-desktop)
-		CONFIG+="lang-ar_AR lang-da_DK lang-de_DE lang-en_GB \
-                        lang-es_ES lang-fa_FA lang-fi_FI lang-fr_FR \
-                        lang-hi_IN lang-it_IT lang-nb_NO lang-pl_PL \
-                        lang-pt_PT lang-ro_RO lang-ru_RU lang-sv_SE"
-	)
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 643fa75e6801..16ca2d6521de 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,10 +1,8 @@
 AUX qtwayland-5.9.4-qquickwindow-crash.patch 3408 BLAKE2B c37b4bf3612509d08de1437181db18fe0c5abafbe447010ec092fe7657cf6b2536e2cb181a3741f52eb4dff30c39946602861ecf6916a9a4b6ad576aa7d24a72 SHA512 33f660550904e2811d8f2816c7e62020a342007f6ea444bd62a3560a74c1f5816a40c99df42b5923f4871b10828c8bff5155fa197db1f1cb7432ead02cd56477
-DIST qtwayland-everywhere-src-5.11.0-beta4.tar.xz 389040 BLAKE2B a6eb021783b1008cb7f6c8b34a92b9bbd7da518b2a794cac405a4f368dfc7b01fed99426f2713b646fbd8690b7079b27581e413d907e56b6cd02fd021e8b0215 SHA512 354528f5db85fc203898561be3755150193c8a3d7366b435cf82f6110dd0f3fde08f2430d8d51269cc39eef4381b8f3b1cc2383e2559c8eb9c95d08c4c9104d9
-DIST qtwayland-opensource-src-5.7.1.tar.xz 291776 BLAKE2B 06aba415e33ed971ef4de975e8677a52c4fcc81922f978cc1bde7e9a7ebdea32cd1c7dca59b67493bc96edfd997027f630c05c93ce31ae4ba87a55580495997a SHA512 41a6699b9048a859bb0cb1e37cd0a3977f52a5a223d4f6a4ce5e1402c5b829cc907593ce2b70f4ec24dfad147251bb2f20e889eae26072cf53e774b4585f2921
+DIST qtwayland-everywhere-src-5.11.0-rc.tar.xz 389828 BLAKE2B 31084cbcf2cc42fc2f7eba43f6c85341f915a63e3ca11e5de21e351f88e198556ec8f8b3c4ccc0e9baf1fc4da9b1cfa4faf006171e55bfcd80e3dec349ece4d8 SHA512 6b28d05e89e92794220777e1def8d5f71164c290cea929970a980f31735b02fe36b08094d9c46194c4b92bd89fd326c2f6397629f5733b900fdbf8c6b54f8326
 DIST qtwayland-opensource-src-5.9.4.tar.xz 314932 BLAKE2B de90fb47af0d07e0b6476b84de2f51900e4e09ecd57aee800534998d3a2e733501da877f912c4b0ce671d417f543eb44bc1607225af0a134ba5702d17efae431 SHA512 93d43bdcc39fd471cdd335c0699c5e5dd77cd0bc2d15f2a1170d8ccd103d84e2c7e657575a370ac6c678b52c2b617fb2c80ce4d226264cb6c857064452f7dc10
 DIST qtwayland-opensource-src-5.9.5.tar.xz 316056 BLAKE2B bd270a3c2a87874e533f8ec772b6435834f2eca1130d4efccd3543cd1170064950020e62910f6e80e6be1bcc20133a240ac9d89a9afe86db4e267c1718bccaf2 SHA512 31b8c8fb0c1e7172006053fc1added67a4312aec364b0d762bd9ff5fd451b298cdf34a47dc043af8e5212f856f79efd32014ac4c35e0ff7661d83e19c6fd1289
-EBUILD qtwayland-5.11.0_beta4.ebuild 907 BLAKE2B a7f254dc9571a1860f8caa6cfa15a13e8d6859116f0de5cf7cd66ad5cd6969a948445391f78dc3df927c90437235bf1cbb26bc4809a5f6faf66b6ae23f2fed41 SHA512 db097b4577f81f5354c9b07944c3a47120f93fb61cad54346114c515460390d375d7412464904b9a07a24c08edc150df9378b766ca348694182a1b6209069174
-EBUILD qtwayland-5.7.1.ebuild 623 BLAKE2B 2f60f19423ac6038c61ed09d8764cc2ec46e71edc18189eef873391cdc79aa68ad05f32716cc2deae59bf1db1228ef731e323f6df87060af67e078f14288020a SHA512 8768c4014b155e6a5918d93228c2281e4742354f706089bc94355d8eedc939d5d32471163652cc6ce640beb719516b71832100d9d5e255ee90b38a3f68edc022
+EBUILD qtwayland-5.11.0_rc.ebuild 907 BLAKE2B a7f254dc9571a1860f8caa6cfa15a13e8d6859116f0de5cf7cd66ad5cd6969a948445391f78dc3df927c90437235bf1cbb26bc4809a5f6faf66b6ae23f2fed41 SHA512 db097b4577f81f5354c9b07944c3a47120f93fb61cad54346114c515460390d375d7412464904b9a07a24c08edc150df9378b766ca348694182a1b6209069174
 EBUILD qtwayland-5.9.4-r1.ebuild 973 BLAKE2B 11a8749fecdbc4fc8035ad2001dd4614e17d2577f194d6ba10a02fc5929e31e65488e86857498ea822590b098295722938096c2901c391cad97e78ab0c477de8 SHA512 7288dd998a999c98eb2053f21c82f9d0518ce6d79a6992bea0b1a58c6bfedcc530cdea0e0b501751df0e07c8afdee4a21a6bcadc945cb8dcdd0a07cb6ef2e4a8
 EBUILD qtwayland-5.9.4.ebuild 907 BLAKE2B a7f254dc9571a1860f8caa6cfa15a13e8d6859116f0de5cf7cd66ad5cd6969a948445391f78dc3df927c90437235bf1cbb26bc4809a5f6faf66b6ae23f2fed41 SHA512 db097b4577f81f5354c9b07944c3a47120f93fb61cad54346114c515460390d375d7412464904b9a07a24c08edc150df9378b766ca348694182a1b6209069174
 EBUILD qtwayland-5.9.5.ebuild 907 BLAKE2B a7f254dc9571a1860f8caa6cfa15a13e8d6859116f0de5cf7cd66ad5cd6969a948445391f78dc3df927c90437235bf1cbb26bc4809a5f6faf66b6ae23f2fed41 SHA512 db097b4577f81f5354c9b07944c3a47120f93fb61cad54346114c515460390d375d7412464904b9a07a24c08edc150df9378b766ca348694182a1b6209069174
diff --git a/dev-qt/qtwayland/qtwayland-5.11.0_beta4.ebuild b/dev-qt/qtwayland/qtwayland-5.11.0_rc.ebuild
index 4c3553046dbc..4c3553046dbc 100644
--- a/dev-qt/qtwayland/qtwayland-5.11.0_beta4.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.11.0_rc.ebuild
diff --git a/dev-qt/qtwayland/qtwayland-5.7.1.ebuild b/dev-qt/qtwayland/qtwayland-5.7.1.ebuild
deleted file mode 100644
index b90f33e3e8ee..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="xcomposite"
-
-DEPEND="
-	>=dev-libs/wayland-1.4.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	xcomposite? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	qt_use_compile_test xcomposite
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 0c3130cabfaf..1cd5de9f128c 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,9 +1,7 @@
-DIST qtwebchannel-everywhere-src-5.11.0-beta4.tar.xz 173648 BLAKE2B a29e9e2ed40ff69b102cae2e60466fde3c683637b7518172be9e3c1233ab44f1af9e7f9c8ad7e32a3fdd137e1d51b7c16a8f71250a9fc53534f8238ec4ae4dfb SHA512 e2224fc9db772a1f6698a8431cab9200d9e2729d942262a4a853ec899137f4ca1d6cb4568096bd33a900c38da20451c8ed3be45f820d8ec50bf43b2a27471d83
-DIST qtwebchannel-opensource-src-5.7.1.tar.xz 122436 BLAKE2B 29bd6a5d09cb91d7ea7d5d2bc6ebef62851569a867b7949d2c79cdf1a52fc6abb8181814ade499d2ba31d305567a82556118bdad3fb59700b6895c9e7afcf5ae SHA512 643ca738e07c9a719d1d17ee23faf0d7bb3a62e6ee03e5b4f78e1cdf8d1b13ed71416b86bbb40c93d121a6569dc55d0373f1cb0961c8db07762c93592ca49af8
+DIST qtwebchannel-everywhere-src-5.11.0-rc.tar.xz 173728 BLAKE2B af68a062d1531641b170d7b4aa8d3946f35184519c6c5d80f8076b2c0c2509430ae540997bf120d2d20745881f776aaa55c91534bdf4363268c907f6bfb80202 SHA512 586c003116f70a62ef42a5c7ceb554485ad1ed421bc9c35017ba6cca32371fc4ee0fd4a5b7e067d10795e0eb8312384d28bfd46fcdcd4a1f8f80fd536d2cd029
 DIST qtwebchannel-opensource-src-5.9.4.tar.xz 147456 BLAKE2B 703bb44c12bb856f311561c772ebe8b716dcbae9f75ac47d7b702f459d47a621431a5eb2cd15c44f60c8f178d6fb6d8405f1c79c5e5501a28ac566298959b58a SHA512 932b56c9e9944e0f639163c4e484ed5260bdc7a186e81a2a6cfa113d14892414cd5b81f2767132695fb2f251c91e4d5ec9711cba10983215baa6e8014689dfbb
 DIST qtwebchannel-opensource-src-5.9.5.tar.xz 147564 BLAKE2B d66c190cae43875cf2845231c47ba5040db7b31724ea88333a8d818c111be9860c43fb7f0b3c16a3f139429361e6a1660ecfb1b2edb1a2e5a1c0f3e48797c4f6 SHA512 d5a3914c20fe541401a662e30f7277d9a57f9f4b9114832fa9b0425003542f646c295b63f31ae02c6cb69a45b88966f80f036f80b7df9a15fbc223a135d3944f
-EBUILD qtwebchannel-5.11.0_beta4.ebuild 567 BLAKE2B 0c2571b19cbdac1eadcc41c8989423580cc0744f6303834e321ac9ee8159dcfe23467bfc70909cced0657ad4e97005dee5ba42326c509cde3639b3e84db8b3cd SHA512 38902c94bf7b214c3d784dc0788fe4257cbfea895a6ad7dac73dfb52546f55bb16c6e84e20192c8e30c0bb57c2716ef8860d79ea0d71df33f3d3aab2a2542263
-EBUILD qtwebchannel-5.7.1.ebuild 563 BLAKE2B d0a9c4bd8cad8c0afe46da2a60c7989b0bbf2cab997bef478c7c97d0131fe9ba8701ee514aeb4abc22f4368bdac5ddc4e0748a3635e886089bf60e562e5a7105 SHA512 741eb20f2e08d421c4b254801edaf84319c0cb380c2e6debeac88ec633099b78839120d5cfca28500d825d0191db6518522b757d8ab7748709a0a69648dae5ac
+EBUILD qtwebchannel-5.11.0_rc.ebuild 567 BLAKE2B 0c2571b19cbdac1eadcc41c8989423580cc0744f6303834e321ac9ee8159dcfe23467bfc70909cced0657ad4e97005dee5ba42326c509cde3639b3e84db8b3cd SHA512 38902c94bf7b214c3d784dc0788fe4257cbfea895a6ad7dac73dfb52546f55bb16c6e84e20192c8e30c0bb57c2716ef8860d79ea0d71df33f3d3aab2a2542263
 EBUILD qtwebchannel-5.9.4.ebuild 564 BLAKE2B 841c1280a0faeb5fe4d2df74b87f359aab2152272e56286a7faf7af0206247a15a50f979a252c2b57a5acb9b5c72991ce3d9582fd4471c2132b465532c935afc SHA512 24facdba59179122b01c05f03d67ddeacbc6d2333057ab36101685128ca80037e63e11d74752236c4cd83a573d74c75f2d94e3a7165333cd7a295ca2fade415c
 EBUILD qtwebchannel-5.9.5.ebuild 567 BLAKE2B 0c2571b19cbdac1eadcc41c8989423580cc0744f6303834e321ac9ee8159dcfe23467bfc70909cced0657ad4e97005dee5ba42326c509cde3639b3e84db8b3cd SHA512 38902c94bf7b214c3d784dc0788fe4257cbfea895a6ad7dac73dfb52546f55bb16c6e84e20192c8e30c0bb57c2716ef8860d79ea0d71df33f3d3aab2a2542263
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.11.0_beta4.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.11.0_rc.ebuild
index 63c52e4c7747..63c52e4c7747 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.11.0_beta4.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.11.0_rc.ebuild
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.7.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.7.1.ebuild
deleted file mode 100644
index 3180f91e265b..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ppc64 x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-	qt_use_disable_mod qml qml src/webchannel/webchannel.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index adc3045afc62..594c6820cb71 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,20 +1,14 @@
+AUX qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch 1897 BLAKE2B b72be2793ccfe5738136cf6456e7929905ed975101625b859b4eb298f37f6b28125df54edbe61d66689b824acd9aefc05cfba32d49c3bcce12710a2632574650 SHA512 ee2a483751e576b5508a8ae9c5afffde6df63b5431371abf71bdb3635c9dddfea1c918f43516ef78222ab9ea7bdd1fc804ee81662fbd8bf83ce544bcf0248e1d
 AUX qtwebengine-5.11.0-update-shim-headers.patch 2030 BLAKE2B 53325012dc516ac1c6dc43bcb0e22e5e59e6f7c808f85b884183922053886816a9b7887211a4e607b39f52ab7f9fd97940e2fb009f72bd918790e76066f8c365 SHA512 88aca795e37ff45fbe35a0cdb4324573005dd4bfad1bfa82220d48e5b4adaff03ebe3897d7813a130b8d8786dd9ba9279c65ec25e0a66a6605e46b8a1834b683
-AUX qtwebengine-5.7.0-fix-system-ffmpeg.patch 953 BLAKE2B 39aa2013ec17b4f347db0224c8c441e6f4dafcd17e89a1718b18a5d17304a1136180d474a826efa30f4febcdb9de6181869bfa69403b093d85fc55f82d98d5bf SHA512 7fe43758f0f20ce1d4952d36773fede8def13c60dc4ac01186ef0d1b79055f02151a89e94c61b6dbe5e0a0560e53e3a27c2f40aaba181704b752b3618b3f3b9f
-AUX qtwebengine-5.7.0-icu58.patch 3126 BLAKE2B 263e6d3411b6dec2cd2f3151a43c062c85f8500771921e23716ae268e8aee66e27d11dc8fe62347accc151a9d7659caf118d7314bc637a49e3bd54d8677e99fc SHA512 573741564c85dfa8df1f8b89f075214067f4892d9cc4280d986709c4438823a82ab1eb752b39fdae4e0321a0ae30479fce2ecacb4d35f197bc3699ee24583d67
-AUX qtwebengine-5.7.0-undef-madv_free.patch 1132 BLAKE2B 26f441b8e06bd059476a640a79db73b789bb387d095f51d0b5a993204a6b76be5926fff45880559fba687c3b5baf8b6a564076d58a0ae720d383acf172fdad67 SHA512 1f581749438b07df03f8123957b31d2749a702c00dae06d5c4ab8bd9a4a3d9f14ee0457f5fa9221e7b1d0dc4eac8965990336140f09787df4e46757165b1e22e
-AUX qtwebengine-5.7.1-fix-audio-detection.patch 802 BLAKE2B 0567ca41667c62c794c9c782df07aac966849101b23a8979352d83a990636935aabe7d7d7e945b286714121e963e43509fd6b6115376a883ccf4ec8777747b14 SHA512 d461dc066eda63d9cc7131852d12f2a0ed0abdaf849f9d7ec0e1da20098e031877c07ae37ebd3ba47af1ef1d7cf4d909ef594bcb4682f9e4f69d7deeaeb01f2c
-AUX qtwebengine-5.7.1-gcc-7.patch 5612 BLAKE2B 2ee8a7411dcdd397e9dfd17af0b0081fd16b16da4598ba976e94b3b14d4e1a3fbfc7abed83204e472d5f9a8aea60bc402ca98c3d355f653117556a6047a1393f SHA512 a2824a8ea4b2499fb6f5b583349c3b3428a3a99e5f534d624e00c7820f7a70c824ffc90fc9abd0f981fd707e5361b1d466de1094f65d5c1c8d62db9dc118be0a
 AUX qtwebengine-5.9.3-icu-60.1.patch 664 BLAKE2B eb36ee21a907677d6599dfd7fa3960619492ca0616cace73e475ceba64b1f43631d6f81b303801d934dc6e4a71bf7dc4c4b43fc73d3d048ca51bd7ceea13bc68 SHA512 9652916b675ae2d94f761ebd1e13effbb7545d14bda130a61122d082ea7e826da1be1d22d9063f5e3a4a3b2bb3bc51edb7a98a51869ec8bb9db9089e4c31dd5b
 AUX qtwebengine-5.9.3-paxmark-mksnapshot.patch 997 BLAKE2B e6fd8d6830ee2ca7b4e9c5586e52ce0ce577ddf6839d1de33a125606bc94bd483e4bef3008196f60e6c622074d23166a01b560dacfc5cec86e82dd360376627d SHA512 4a93fa1bdc7c4bbf22c68af4eff9473c4c9e39bc9cdc725441d5bdaec0521fd54db2b25f6900d4dc5d41a8cbeb04d5b420a85f334e3c18348d2e9dd1d9700dc3
 AUX qtwebengine-5.9.4-jpeg-9-1.patch 2782 BLAKE2B eb52d5ab51ca47603f3cdf684e0d34bdb0e6441aed99603608866d41fbfaeb812129199d28f7d01763bd9a86cf0a4e9b46199ab1b227d5e0a3add1ad7bc43329 SHA512 85f305333741e88461c792e5ab1e65f3efaa762d60c52f6afd56c6344375e3467b3268c478d51de0340d99ad2ce3ea2aa5fad83364dfeed2d665244dc84c36ab
 AUX qtwebengine-5.9.4-jpeg-9-2.patch 1295 BLAKE2B 93fdcc0a69fa39c85583dcacd3052b87897e4b8df045b81090524e84a90e259d7824521e71639eec5ef8cfd86c5823302846bd1a05dff3fb39d5b988544bf46b SHA512 57551a4859791431d921fc0f514332d408f43c05ead7919468727069e01b9cf3cfe70f5ca014af57b8842f8ba745d1abe5838fa271d354b775a520ef296bd6a5
 AUX qtwebengine-paxmark-mksnapshot.patch 1478 BLAKE2B 99f99e8264c0bd534e5efe0dce1d2bd58662f83e35f3426cf3daba0ea49d28689723c59c14ed2d357102d8eefbc4c7afcce298efa516f82710bcabe930a6e566 SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019
-DIST qtwebengine-everywhere-src-5.11.0-beta4.tar.xz 233777616 BLAKE2B 7d96784f26e7b7d9423c10d9377b2466812140573cdc12a4c6839b4308fdf6f9a525833f94d26aabfbe124e7bdd474705bcfa5d4f4db7f3cd9408a82ba151182 SHA512 f91406ac4a9eccd84a01abd1aa07a12ad61a73f2a8acdbe925687df75016f9c1bdf038e65fa5c962f1f681ba13bf2f1833574611a03cfdca9b6b292511c77294
-DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 BLAKE2B 624df9c61b887ed393d8021db4e7bd058544abab3a13341fd0bb76fa3c00cf2692c4e08c2058e1576dfe5c62f9e9bc9ac8a1b5a4a640a204e74ba88516fb4ffd SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a
+DIST qtwebengine-everywhere-src-5.11.0-rc.tar.xz 233695496 BLAKE2B e9dc4449cd56a7079091f5f78fdbbd19197c3f770b98d98828f99b45dd65bb3a2198e8f4f16a693408c6aac40b494c884bd0b3116678d76e9cf7e54741ea6507 SHA512 2ec16851e45540aab65f891be0ac33518f7d9a017ff7bf3c49a012b29e08c8f17c2c90683ceaacb7359259f08fbf073d8edd53563f8604293ab71fce61adf76f
 DIST qtwebengine-opensource-src-5.9.4.tar.xz 217337248 BLAKE2B 8a8c55dc08b06b07822fd53c780c1b7898516c8a7d021711f4ad5409630a131a90b1916c21d4e83e43dac773c4c73b4a1045baf96ed3c1d39f2d3d4c35c4a8c0 SHA512 c576e81cd9d202a4614c3eedd008bc41bd6212cd4d06e639469b843726be427f9e7a9551b3e604cbfee90f8dde22afb5bcd4905818ca65234e198078971d6ac9
 DIST qtwebengine-opensource-src-5.9.5.tar.xz 216767300 BLAKE2B 9c05c808d18ed27833b48deaab1c0a6d12a7fa17288a522a8aa04c9b06746e9d69ba06467297369353979844e94efad354a124e28dae94d3128e853a8218e6d7 SHA512 74aa2a36ba5a56d0870f5269f93b54c036fccabf60d906b5b0f0db38afb8582d8794be4025ecea28e4c5b8c4c9beda345e3c2b2155e77bbedfe688308009de2a
-EBUILD qtwebengine-5.11.0_beta4.ebuild 3250 BLAKE2B b1fca651f4057173c4a5ce1123abef72b3a1b72cb3d34f1c6ce2b8d6814b08e6652b79b3df9924efa8081e020c7402fc0e712b2af0171fe52d9d97044ca4010a SHA512 5d64e83fba39557cdd2b437e297314a175469c9095e358c435eb710beb876271ca5fb9007239846eeda39e294febac37dc683371091c46cae04b934fa193dad3
-EBUILD qtwebengine-5.7.1-r2.ebuild 3109 BLAKE2B 5ecfaf15205fb4d3ea2a2a688c1fedf312efcfb44140de281738ae45f16ec38f4a81bf37fd963c6847c94d64b7b013580056feea224d40cfe56dc1a10ca3cf0c SHA512 618c00c7d5edc4d9fcae5b25e61f957ada6555afe53a2e52164eb7cf22c05a6a015041b2ead744624fd8eeb9c35edbd951786337cb2d3ebd4a1747af339bd730
+EBUILD qtwebengine-5.11.0_rc.ebuild 3322 BLAKE2B 966f7dfc43a58160e3f42fc3f612006b143fb8809e94a23367a38d7fb2e73b47cbf9f2625b9fd26aa4fb39be09ab57677a841d08ff635db12378a09e31b06a0d SHA512 40cbdb054465624a2a033a426926c56bffd8574e51b34b479ff39e3c8c153bc9deb8443ab5afd8628d73b8f7daed4283f1ad3174c16624a807553636843e6a3e
 EBUILD qtwebengine-5.9.4.ebuild 3223 BLAKE2B ef411c3f0e15c72b2592cd04ef8f04b57cedd089c4b83005b575ef4db264dfadccf711f8598309fbabed6c2a141dcd983eca53f3e8506ea7517eb62301b9caec SHA512 8002221d79b292097d23cae4f6423d28ede730564ba09b164f9494ca08b84f46d9cade2247622739f41dfea37939891795ec1b12421a02d53f349de0c9851faf
 EBUILD qtwebengine-5.9.5.ebuild 3195 BLAKE2B 8165a853d4a02ea34babf6ce46f897cec10b7597fcadf1df9c2b0089d8ecde55ba1d482b7d4622870c55cc630148181805e30959bd9c9d6772b955cbd3b7f45c SHA512 ec0540064675ca249271a812b1f632b9f0cc1d0879f8099cf3949bb7413d812d52a18d7a90bf915c8b0f1d0dfe2f11bd41df9f8c44675dda823735deda0e46ab
 MISC metadata.xml 948 BLAKE2B c3f99b9a59aeb8ad3754b0caafdd7132ee60142f41d992b0fecdb3ed0f396ec7903fb68bc2e734e127f4f722c4f0c6c8398f94685925296037684912ace05764 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch
new file mode 100644
index 000000000000..2c5012ee34b4
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch
@@ -0,0 +1,56 @@
+From 383ee1aa19b7b72c686d70f34bc9c377a51aaf5e Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Wed, 9 May 2018 13:23:17 +0200
+Subject: [PATCH] Fix build without qtlocation
+
+Change-Id: I81ac6fcf14563a6d093c51d93754d438992ee52a
+---
+ src/core/content_browser_client_qt.cpp | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
+index 30ec43ca0..3878bd1bf 100644
+--- a/src/core/content_browser_client_qt.cpp
++++ b/src/core/content_browser_client_qt.cpp
+@@ -68,6 +68,7 @@
+ #include "content/public/common/main_function_params.h"
+ #include "content/public/common/service_names.mojom.h"
+ #include "content/public/common/url_constants.h"
++#include "device/geolocation/public/cpp/location_provider.h"
+ #include "mojo/public/cpp/bindings/binding.h"
+ #include "mojo/public/cpp/bindings/binding_set.h"
+ #include "printing/features/features.h"
+@@ -93,7 +94,6 @@
+ #include "certificate_error_controller_p.h"
+ #include "desktop_screen_qt.h"
+ #include "devtools_manager_delegate_qt.h"
+-#include "location_provider_qt.h"
+ #include "media_capture_devices_dispatcher.h"
+ #include "net/network_delegate_qt.h"
+ #include "net/qrc_protocol_handler_qt.h"
+@@ -123,6 +123,10 @@
+ #include "renderer_host/pepper/pepper_host_factory_qt.h"
+ #endif
+ 
++#if defined(QT_USE_POSITIONING)
++#include "location_provider_qt.h"
++#endif
++
+ #include <QGuiApplication>
+ #include <QLocale>
+ #ifndef QT_NO_OPENGL
+@@ -737,7 +741,11 @@ bool ContentBrowserClientQt::CanCreateWindow(
+ 
+ std::unique_ptr<device::LocationProvider> ContentBrowserClientQt::OverrideSystemLocationProvider()
+ {
++#if defined(QT_USE_POSITIONING)
+     return base::WrapUnique(new LocationProviderQt());
++#else
++    return nullptr;
++#endif
+ }
+ 
+ scoped_refptr<net::URLRequestContextGetter> GetSystemRequestContextOnUIThread()
+-- 
+2.16.3
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch
deleted file mode 100644
index 71881e0f77c2..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h	2016-11-23 13:01:20.929772871 -0800
-+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h	2016-11-23 13:02:18.879462854 -0800
-@@ -24,7 +24,9 @@
- // Disable deprecated features which result in spammy compile warnings.  This
- // list of defines must mirror those in the 'defines' section of BUILD.gn file &
- // ffmpeg.gyp file or the headers below will generate different structures!
-+#if !defined(USE_SYSTEM_FFMPEG)
- #define FF_API_CONVERGENCE_DURATION 0
-+#endif
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch
deleted file mode 100644
index ced5367c4826..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp	2016-11-15 17:07:38.680665385 -0800
-+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp	2016-11-15 17:12:17.564001354 -0800
-@@ -26,6 +26,9 @@
- #include "wtf/StdLibExtras.h"
- #include "wtf/text/CharacterNames.h"
- 
-+#include <unicode/uchar.h>
-+#include <unicode/uvernum.h>
-+
- namespace blink {
- 
- unsigned numGraphemeClusters(const String& string)
-@@ -122,13 +125,18 @@
-     { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL
- };
- 
-+#if U_ICU_VERSION_MAJOR_NUM >= 58
-+#define BA_LB_COUNT (U_LB_COUNT - 3)
-+#else
-+#define BA_LB_COUNT U_LB_COUNT
-+#endif
- // Line breaking table for CSS word-break: break-all. This table differs from
- // asciiLineBreakTable in:
- // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking
- //   Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties
- // - 1 indicates additional break opportunities. 0 indicates to fallback to
- //   normal line break, not "prohibit break."
--static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = {
-+static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = {
-     // XX AI AL B2 BA BB BK CB    CL CM CR EX GL HY ID IN    IS LF NS NU OP PO PR QU    SA SG SP SY ZW NL WJ H2    H3 JL JT JV CP CJ HL RI
-     { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX
-     { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI
-@@ -178,7 +186,7 @@
- #undef AL
- 
- static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent");
--static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
-+static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
- 
- static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh)
- {
-@@ -209,7 +217,7 @@
- 
- static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak)
- {
--    if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) {
-+    if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < BA_LB_COUNT) {
-         const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak];
-         return tableRow[lineBreak / 8] & (1 << (lineBreak % 8));
-     }
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch
deleted file mode 100644
index 193e71362065..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fa8cdb3a32c377b6290d0a92d2522186bcd48293 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-Date: Tue, 9 Aug 2016 16:21:29 +0200
-Subject: Do not depend on Linux 4.5
-
-Avoid using MADV_FREE that was only recently added to Linux. It will fail when
-run on older Linux kernels.
-
-Change-Id: I9b0369fb31402f088b2327c12f70dd39f5e4c8c0
-Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
----
- chromium/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
-index 12c9a7b..1639013 100644
---- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
-@@ -39,6 +39,11 @@
-
- #include <sys/mman.h>
- 
-+#if OS(LINUX) && defined(MADV_FREE)
-+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime
-+#undef MADV_FREE
-+#endif
-+
- #ifndef MADV_FREE
- #define MADV_FREE MADV_DONTNEED
- #endif
--- 
-cgit v1.0-4-g1e03
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch
deleted file mode 100644
index 597554e685cd..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# dev-qt/qtwebengine: Fix detecting audio backends.
-
-# The upstream change doesn't really work for us, so we'll make
-# it work with us.
-# Gentoo-Bug: https://bugs.gentoo.org/603498
-
---- /src/core/config/linux.pri	2016-12-23 00:05:41.057955774 +0200
-+++ /src/core/config/linux.pri	2016-12-23 00:09:39.000573909 +0200
-@@ -35,12 +35,12 @@
- contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
- contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
- contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1
--contains(QT_CONFIG, pulseaudio) {
-+use?(pulseaudio) {
-     GYP_CONFIG += use_pulseaudio=1
- } else {
-     GYP_CONFIG += use_pulseaudio=0
- }
--contains(QT_CONFIG, alsa) {
-+use?(alsa) {
-     GYP_CONFIG += use_alsa=1
- } else {
-     GYP_CONFIG += use_alsa=0
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch
deleted file mode 100644
index a5c3072a4777..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 64fdd317d4127142ad9e967197a2df6ac81ef55f Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Wed, 29 Mar 2017 17:42:18 +0200
-Subject: [PATCH] Fix build with GCC 7.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Fixes some ambiguities and outright wrong code GCC 7 doesn't accept but
-earlier compilers did.
-
-Task-number:QTBUG-59776
-Change-Id: I012f121842ac6cde49db0d571efc62aabe2115e3
-Reviewed-by: Michael BrÃ¼ning <michael.bruning@qt.io>
----
- .../mojo/public/cpp/bindings/interface_ptr_info.h     |  2 +-
- .../third_party/WebKit/Source/wtf/LinkedHashSet.h     |  2 ++
- chromium/v8/src/objects-body-descriptors.h            |  2 +-
- chromium/v8/src/objects-inl.h                         | 19 +++++++++++++++++++
- chromium/v8/src/objects.h                             | 16 ++--------------
- 5 files changed, 25 insertions(+), 16 deletions(-)
-
-diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
-index 5bd29d5..c94a5ac 100644
---- a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
-+++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
-@@ -34,7 +34,7 @@ class InterfacePtrInfo {
- 
-   InterfacePtrInfo& operator=(InterfacePtrInfo&& other) {
-     if (this != &other) {
--      handle_ = other.handle_.Pass();
-+      handle_ = std::move(other.handle_);
-       version_ = other.version_;
-       other.version_ = 0u;
-     }
--- 
-2.7.4
-From 493441248c82d9f39d0947e3bbf4571736e1cf85 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Wed, 29 Mar 2017 15:53:00 +0200
-Subject: [PATCH 1/1] Fix build with GCC 7.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Fixes a few problems with using undeclared functions and ambigious
-code.
-
-Task-number: QTBUG-59776
-Change-Id: I59813919b4867d5dd3499a45baed004a1a1c1a3c
-Reviewed-by: Michael BrÃ¼ning <michael.bruning@qt.io>
----
- chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h |  2 ++
- .../third_party/pdfium/fpdfsdk/javascript/global.cpp   |  8 ++++----
- chromium/v8/src/objects-body-descriptors.h             |  2 +-
- chromium/v8/src/objects-inl.h                          | 18 ++++++++++++++++++
- chromium/v8/src/objects.h                              | 16 ++--------------
- 5 files changed, 27 insertions(+), 19 deletions(-)
-
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
-index e85c72f..6f94cd6 100644
---- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
-@@ -542,6 +542,8 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=(LinkedHas
-     return *this;
- }
- 
-+inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b);
-+
- template<typename T, typename U, typename V, typename W>
- inline void LinkedHashSet<T, U, V, W>::swap(LinkedHashSet& other)
- {
-diff --git a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
-index 91cb888..a1c3634 100644
---- a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
-+++ b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
-@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase {
- 
-   template <typename StaticVisitor>
-   static inline void IterateBody(HeapObject* obj, int object_size) {
--    IterateBody(obj);
-+    IterateBody<StaticVisitor>(obj);
-   }
- };
- 
-diff --git a/src/3rdparty/chromium/v8/src/objects-inl.h b/src/3rdparty/chromium/v8/src/objects-inl.h
-index 58441d3..4c486ea 100644
---- a/src/3rdparty/chromium/v8/src/objects-inl.h
-+++ b/src/3rdparty/chromium/v8/src/objects-inl.h
-@@ -7588,6 +7588,24 @@ bool GlobalDictionaryShape::IsDeleted(Dictionary* dict, int entry) {
- }
- 
- 
-+template <typename Derived, typename Shape, typename Key>
-+inline uint32_t HashTable<Derived,Shape,Key>::Hash(Key key) {
-+  if (Shape::UsesSeed) {
-+    return Shape::SeededHash(key, GetHeap()->HashSeed());
-+  } else {
-+    return Shape::Hash(key);
-+  }
-+}
-+
-+template <typename Derived, typename Shape, typename Key>
-+inline uint32_t HashTable<Derived,Shape,Key>::HashForObject(Key key, Object* object) {
-+  if (Shape::UsesSeed) {
-+    return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
-+  } else {
-+    return Shape::HashForObject(key, object);
-+  }
-+}
-+
- bool ObjectHashTableShape::IsMatch(Handle<Object> key, Object* other) {
-   return key->SameValue(other);
- }
-diff --git a/src/3rdparty/chromium/v8/src/objects.h b/src/3rdparty/chromium/v8/src/objects.h
-index 7d774be..42da5fa 100644
---- a/src/3rdparty/chromium/v8/src/objects.h
-+++ b/src/3rdparty/chromium/v8/src/objects.h
-@@ -3194,21 +3194,9 @@ class HashTable : public HashTableBase {
-   typedef Shape ShapeT;
- 
-   // Wrapper methods
--  inline uint32_t Hash(Key key) {
--    if (Shape::UsesSeed) {
--      return Shape::SeededHash(key, GetHeap()->HashSeed());
--    } else {
--      return Shape::Hash(key);
--    }
--  }
-+  inline uint32_t Hash(Key key);
- 
--  inline uint32_t HashForObject(Key key, Object* object) {
--    if (Shape::UsesSeed) {
--      return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
--    } else {
--      return Shape::HashForObject(key, object);
--    }
--  }
-+  inline uint32_t HashForObject(Key key, Object* object);
- 
-   // Returns a new HashTable object.
-   MUST_USE_RESULT static Handle<Derived> New(
--- 
-2.7.4
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_beta4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_beta4.ebuild
deleted file mode 100644
index 32064b192b08..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0_beta4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwebchannel-${PV}[qml]
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/protobuf:=
-	dev-libs/re2:=
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/libjpeg-turbo:=
-	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/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( dev-libs/icu:= )
-	widgets? (
-		~dev-qt/qtdeclarative-${PV}[widgets]
-		~dev-qt/qtwidgets-${PV}
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	sys-devel/bison
-	pax_kernel? ( sys-apps/elfix )
-"
-
-src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
-	use system-icu && has_version ">=dev-libs/icu-59" && \
-		PATCHES+=( "${FILESDIR}/${PN}-5.11.0-update-shim-headers.patch" )
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
-
-	qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
-
-	qt_use_disable_mod geolocation positioning \
-		mkspecs/features/configure.prf \
-		src/core/core_chromium.pri \
-		src/core/core_common.pri
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		--
-		-opus
-		-printing-and-pdf
-		-webp
-		$(usex alsa '-alsa' '')
-		$(usex bindist '' '-proprietary-codecs')
-		$(usex pulseaudio '-pulseaudio' '')
-		$(usex system-ffmpeg '-ffmpeg' '')
-		$(usex system-icu '-webengine-icu' '')
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-
-	pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild
new file mode 100644
index 000000000000..735be56a730c
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit multiprocessing pax-utils python-any-r1 qt5-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtwebchannel-${PV}[qml]
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/protobuf:=
+	dev-libs/re2:=
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz:=
+	media-libs/libjpeg-turbo:=
+	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/libudev
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	alsa? ( media-libs/alsa-lib )
+	geolocation? ( ~dev-qt/qtpositioning-${PV} )
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( media-video/ffmpeg:0= )
+	system-icu? ( dev-libs/icu:= )
+	widgets? (
+		~dev-qt/qtdeclarative-${PV}[widgets]
+		~dev-qt/qtwidgets-${PV}
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	dev-util/gperf
+	dev-util/ninja
+	dev-util/re2c
+	sys-devel/bison
+	pax_kernel? ( sys-apps/elfix )
+"
+
+PATCHES+=( "${FILESDIR}/${PN}-5.11.0-fix-build-w-o-qtlocation.patch" )
+
+src_prepare() {
+	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+	use system-icu && has_version ">=dev-libs/icu-59" && \
+		PATCHES+=( "${FILESDIR}/${PN}-5.11.0-update-shim-headers.patch" )
+
+	# bug 620444 - ensure local headers are used
+	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+
+	qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
+	qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
+
+	qt_use_disable_mod geolocation positioning \
+		mkspecs/features/configure.prf \
+		src/core/core_chromium.pri \
+		src/core/core_common.pri
+
+	qt_use_disable_mod widgets widgets src/src.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	export NINJA_PATH=/usr/bin/ninja
+	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+	local myqmakeargs=(
+		--
+		-opus
+		-printing-and-pdf
+		-webp
+		$(usex alsa '-alsa' '')
+		$(usex bindist '' '-proprietary-codecs')
+		$(usex pulseaudio '-pulseaudio' '')
+		$(usex system-ffmpeg '-ffmpeg' '')
+		$(usex system-icu '-webengine-icu' '')
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	# bug 601472
+	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+	fi
+
+	pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
+}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
deleted file mode 100644
index 78b9daea2884..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg system-icu widgets"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtwebchannel-${PV}[qml]
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/protobuf:=
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc]
-	media-libs/libwebp:=
-	media-libs/mesa
-	media-libs/opus
-	net-libs/libsrtp:0=
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/libcap
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( <dev-libs/icu-59:= )
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	sys-devel/bison
-	pax_kernel? ( sys-apps/elfix )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.7.1-fix-audio-detection.patch"
-	"${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch"
-	"${FILESDIR}/${PN}-5.7.0-icu58.patch"
-	"${FILESDIR}/${PN}-5.7.0-undef-madv_free.patch"
-	"${FILESDIR}/${PN}-5.7.1-gcc-7.patch"
-)
-
-src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
-
-	if use system-icu; then
-		# ensure build against system headers - bug #601264
-		rm -r src/3rdparty/chromium/third_party/icu/source || die
-	fi
-
-	qt_use_disable_mod geolocation positioning \
-		src/core/core_common.pri \
-		src/core/core_gyp_generator.pro
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		$(usex alsa 'WEBENGINE_CONFIG+=use_alsa' '')
-		$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
-		$(usex pulseaudio 'WEBENGINE_CONFIG+=use_pulseaudio' '')
-		$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
-		$(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-
-	pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 46819af6f7dd..bdb2371179a3 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -4,8 +4,6 @@ AUX qtwebkit-5.4.2-system-leveldb.patch 711 BLAKE2B 26eb498e422836585b2fb2c12126
 AUX qtwebkit-5.5.1-disable-jit.patch 460 BLAKE2B a5ec0644d7f4341993cfbec916bc3c9d69ab992d29df3a62630bf077e211d6c1d3848a93ab25bb6bae2971e44518dafe2841c8b78d3556f1d8f1380d85269fb2 SHA512 d9af937475bed746a0e47698b432370488b644a5aeeb008eaa201f4d264fe9f52525345b47757eec08b2adc8dc46d15a044e6ff5e49420f897f1bb416ca06749
 AUX qtwebkit-5.6.2-icu-59.patch 4683 BLAKE2B d9766f31a079e4dee591c5bf21a8a2f1263718bc97e1ad9ac1010a90ea4d28848c896663e7278b4e3a912d0db6ccc8d893db75e3eb3535901705002a4d6e07ba SHA512 189b523c8ee6ae8b62b93e8a46319a2a656280a6aca476fc2bc04d8066f497a9fd3f18029659558bedf985ba7c500eb2d541c4140158e2410cc01db29612f356
 AUX qtwebkit-5.8.0-disable-gstreamer.patch 714 BLAKE2B 3bb7ec6976934e20d016fc6fa0421cab5d6ce51731a0c5a12b92b6e1611a75396f9db751074f7d9ffdb1c000b1964689d69606ba16e29f3ee5329d141dd3c90a SHA512 7b47d5e549f8bc0113bdff596a191fff3f8c6deafd6ebc456e224c1657a07e0208c478fdd49b9790ef618371cb969ae8aaaf08f9c5f9eb10b5841817f0f8736d
-DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 BLAKE2B 74819c28ab00b09d090a77f10d5338e04381432130e0420cf006b8dba75da2426b047cf449a708343eae76e06a9230d962e724dc5d34f8c799947de2e5079581 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a
 DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5
-EBUILD qtwebkit-5.7.1.ebuild 3544 BLAKE2B 281010db9a93a0e5f70c1865ae36e30184ba4dcbefd4e14cffa8ee3034fc6b34652ba133f466e392779cfed8612913242e9f8ad0e48ca39f3a9ddcae7ac9d043 SHA512 e4159313513e9c8f628eae43fe1f5a4412c84de66ce52cb20b3a7dd8e5d18195f50c25408995987c3d5e9635e937a27a13d9642722677f1a1f4a3190991aaac5
 EBUILD qtwebkit-5.9.1.ebuild 3496 BLAKE2B a4b03d514768ca6ffc45aef9b5a46f68734f38f192a4a94f78ef33b6d340a3d62f6651ce7a1d2ee9296ee99f3d9fe12d78d69731e1d57a9930aa90d6b0833fe9 SHA512 bf246728b9b06a5feaf60880d285f022d27d3c8e6ccd3f94c4c0ff0f6e198352aa6dc06198922ce8c989884245d8814d56aaa0c6c78de499ec820cbd140f2676
-MISC metadata.xml 1407 BLAKE2B 6a5f6d35bc4e64e2c2dab7e537923cd23845b3d297d82f8285b2a59465545a0559dcf6a5e33742bfcbce17ae1255f316e0e5a16dc65f0b64c1031c809deae357 SHA512 8edd656626ced7fb74fd5e96e8e7c3e0367a345ebd14c516b86348bcac2266628af251028dae223ff66f75c9984ce51f6f61d46e5aa9c5d510ac0d3a500d0109
+MISC metadata.xml 1287 BLAKE2B c73fa9c1384ee77a1086a77e3f163e6be0460ede09f84ad4ded3d476ec67dc9c3b677619a06e136d9bca19c1dd884fb1f5397e2f16c1c7a4db70acba2b21adcb SHA512 2ef43378ea8190cac99ff2a400198aa9747b1e451a94cdafc6dc06487aa77afc9322e70e984c48b483dc2c8a3c9e73c5f538f707fbe7837eb4a3f0bff6c4070d
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 87f1ed33ba36..645be81df281 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>
-		<flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 0.10</flag>
 		<flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag>
 		<flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild
deleted file mode 100644
index 4407ad91b68c..000000000000
--- a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ppc64 x86"
-fi
-
-# TODO: qttestlib
-
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/icu:=
-	>=dev-libs/leveldb-1.18-r1
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	~dev-qt/qtcore-${PV}[icu]
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtsql-${PV}
-	~dev-qt/qtwidgets-${PV}
-	media-libs/fontconfig:1.0
-	media-libs/libpng:0=
-	>=sys-libs/zlib-1.2.5
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXrender
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gstreamer010? (
-		dev-libs/glib:2
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-	)
-	multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
-	opengl? ( ~dev-qt/qtopengl-${PV} )
-	orientation? ( ~dev-qt/qtsensors-${PV} )
-	printsupport? ( ~dev-qt/qtprintsupport-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-	webchannel? ( ~dev-qt/qtwebchannel-${PV} )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/ruby
-	dev-util/gperf
-	sys-devel/bison
-	sys-devel/flex
-	virtual/rubygems
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
-	"${FILESDIR}/${PN}-5.6.2-icu-59.patch" # bug 618644
-)
-
-src_prepare() {
-	# ensure bundled library cannot be used
-	rm -r Source/ThirdParty/leveldb || die
-
-	# bug 466216
-	sed -i -e '/CONFIG +=/s/rpath//' \
-		Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
-		Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
-		|| die
-
-	qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod webchannel webchannel \
-		Source/WebKit2/Target.pri \
-		Source/WebKit2/WebKit2.pri
-
-	if use gstreamer010; then
-		PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
-	elif ! use gstreamer; then
-		PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
-	fi
-
-	# bug 562396
-	use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
-
-	use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
-	use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
-
-	# bug 458222
-	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 572056
-	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebKit.so ]]; then
-		eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
-		die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
-	fi
-}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index cd8bf0e5a064..ee01afe9600b 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,9 +1,7 @@
-DIST qtwebsockets-everywhere-src-5.11.0-beta4.tar.xz 226376 BLAKE2B 91bd33ec7d5062025f5483011a8d30c32a322203ec0691e1f13c5eee6a0b4c97f799bd3a9df10a0febb40089ad7e48414c6c620eecc19bbaf0dc57884514bd43 SHA512 76301fb1d602ad080189af20e3a433d2563e60050abdd742d8a494a5efe723c08f320f9b3acc7b7b59a8291dbaf7363c6f686e196907f96af4c9497662c9bfaf
-DIST qtwebsockets-opensource-src-5.7.1.tar.xz 193204 BLAKE2B 8ab0cc108ec57dbeaaf55a23e44efef319ff861bf70e043d5507ee371e116b108afe27ba2ee98e8bb1036c6a8125ffcbc54c3e26297713e5d90ba05c9bc10849 SHA512 3cca317d71513a0b11d5b46d6caee44d77a7f65eff09dbd6c180ad682a0271924e05efc28e6d31c9e982b6ab0b3fe1370606eea372e2fefd4525237496d2c7c9
+DIST qtwebsockets-everywhere-src-5.11.0-rc.tar.xz 226360 BLAKE2B 9603d449105effaee0a07e0f6cd9e7fceef57f000654ee40a2d001bbf0c45805c3e4283196fea0617cb77604bb7b0ebdb6fc72f313a35de4e861f1c7cfbe8e13 SHA512 212be6245b41269ae629c1d9efd1362f4a744fd00b67fd30ccdb997ffd9b57d4f3ee00925a17543a84ee90a7dc8dc516a59c495c79883d74847f1a8e940b251c
 DIST qtwebsockets-opensource-src-5.9.4.tar.xz 199492 BLAKE2B c8e7b32a3ae5f74294006ea0c47e10d34753cf3221484c398bb64b246ac7139a5adbde73b001c9d4e18d1cafb636f57d0b12c30620e777c0472f93dc4ef98b4f SHA512 ecf4dbbaf7da1c69cd649e599118231cca47e7c63a83d40cef15133a0ecc6c4d32e15faac8e545f5672c9e1be15b38c1458a5a5541e680ee1ebb2fc1281260f9
 DIST qtwebsockets-opensource-src-5.9.5.tar.xz 199632 BLAKE2B ac174f9b005ed2fe31395dae844ea5e331603b7320e31d0efb186381f41aa9a3a465eb1f339e1969c8914ae27e6ad494a1197676a6b54881a75af58d2278d75f SHA512 20a1a259fa41b0a743673d1af046b7aa655c375d2ef6dc34b9ea9958650f5288594519291188228b8531631809f21dbb599d333d2edc2c3a516fc0d85cfaaecd
-EBUILD qtwebsockets-5.11.0_beta4.ebuild 534 BLAKE2B c76a76e0afa33140ec7d9cb11ef00b831ed39793ec1f406cbfac2f504b4e65ab916ca367c8ebc31bcc1a0dbc45bc87365d66bf9d87ccb8cbec84ef7959550886 SHA512 7bb5be749d4308840922d502b55ef8fa7e1ebd55ebcedcd25096171227535d732cde405cce6e3dede58c92cfbb059f3c5c79f9bd8b5ebdb2ba365e9e20337e39
-EBUILD qtwebsockets-5.7.1.ebuild 530 BLAKE2B 02db8a061894415b65629e71e9df69e4f1a1f73c6bbd18865fd5519076ae7b629e27d5dfab73bddd7b8a7ac145eb6cf33165ab886b6d5c5ac86d1ff9875e8b57 SHA512 47d050f3ef32e91e9bf87330d2bb7b752d39579d4a586a56ed66f51bd648e11c74d015e75159dc027dda1f4792d9db6800b44bc02e1bbc7bfcfdc4141d6fdf2d
+EBUILD qtwebsockets-5.11.0_rc.ebuild 534 BLAKE2B c76a76e0afa33140ec7d9cb11ef00b831ed39793ec1f406cbfac2f504b4e65ab916ca367c8ebc31bcc1a0dbc45bc87365d66bf9d87ccb8cbec84ef7959550886 SHA512 7bb5be749d4308840922d502b55ef8fa7e1ebd55ebcedcd25096171227535d732cde405cce6e3dede58c92cfbb059f3c5c79f9bd8b5ebdb2ba365e9e20337e39
 EBUILD qtwebsockets-5.9.4.ebuild 531 BLAKE2B effc25681c849666974ce5c934d2407c70d0f8854ac9af3f80105ff0dafda5c59d11b6c37e9daeb34c7dbab4ea07253ec4de6111fefe92b8f30d4d04a5fcd5d3 SHA512 f116ba3147571fa035701be18ef0fb25747df8e135bda4c2cb75fce0acff9062ee73fff3c814d0c05bc37b8a98a670c39154cf97e26a1e4b3c740c16987d15ee
 EBUILD qtwebsockets-5.9.5.ebuild 534 BLAKE2B c76a76e0afa33140ec7d9cb11ef00b831ed39793ec1f406cbfac2f504b4e65ab916ca367c8ebc31bcc1a0dbc45bc87365d66bf9d87ccb8cbec84ef7959550886 SHA512 7bb5be749d4308840922d502b55ef8fa7e1ebd55ebcedcd25096171227535d732cde405cce6e3dede58c92cfbb059f3c5c79f9bd8b5ebdb2ba365e9e20337e39
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.11.0_beta4.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.11.0_rc.ebuild
index a0d178ca76b6..a0d178ca76b6 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.11.0_beta4.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.11.0_rc.ebuild
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.7.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.7.1.ebuild
deleted file mode 100644
index eeb4dca9e31f..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.7.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc64 x86"
-fi
-
-IUSE="qml +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}[ssl=]
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 7a2f17fd3675..913e84793525 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,9 +1,7 @@
-DIST qtwebview-everywhere-src-5.11.0-beta4.tar.xz 131216 BLAKE2B 74930e13751f723cb27bb1f4a903e11514fb84a151d86cdda408aa4eb180d8a7c3586d283c144ab0b29d2deea4fefebb08d8103c03bad81467989847833aeaa6 SHA512 252a6e3a18a2c3d4b7db080485f791b4dda933504509448519dbbbfcfcc53a99dc2037ac9682c5348c1f6fcc5cf8dee645c873f1e9d2674d5f42520fc379faac
-DIST qtwebview-opensource-src-5.7.1.tar.xz 107388 BLAKE2B 8b5016da53ede661a0f1cc0892f3f3c4b5ddf59d04b88dfaa8cf4ea092e12f1df2abd885e08e059ab8ed6c23df5bcfead5bf27dde7f7e29f97a1c886e073685e SHA512 a0ed2c203e3638b3fa1e8fc051bc8dec51ca32b16da684fbf73c6f342e579c11a382c799797c593abb35df438699124fa169d1463affa1a2d0b55af57f05a011
+DIST qtwebview-everywhere-src-5.11.0-rc.tar.xz 131440 BLAKE2B d9125e3c1fb9d1565c2c4045e40e869bbb81bf41b503a76a02807bfce531bc1b436c684f1227d8806a9ed68a9ff3faedf1237e9dbaae1ef9cfc2f6f236afd76e SHA512 00473761239a0a3b907a640896c517fc5107121b5d3fe109d4ef80ed7bc372d2d4aaa4b4104a668840ba1aae010501c2f04b21abaa33c5e1b118d79cd84f8873
 DIST qtwebview-opensource-src-5.9.4.tar.xz 108684 BLAKE2B cb660595d88da5a8c9f9e951e4a13ebb265271f0dfe081c5cb19658674f0bc206b2852b83da8a21855ba176f70d93ab20013e373393169aa4a03b478e1ced39c SHA512 e59e8bc50672ea54631b3ac510291b57a6d4d66250819fbae61b7cb814e7653301d55a42c8225a46d106f92736035e039ac7d2e97f3ef13f50bc5874c7e8602f
 DIST qtwebview-opensource-src-5.9.5.tar.xz 108708 BLAKE2B ad576547792acab1e1bc138a0e3951d6f8f483cf1a69b7680f9219a3fcd848aaab04cf9c16873613ee35fbeb7ca919391acd5d837b5013332253fbce5962e1ae SHA512 97da593c49982063b1b80a4eb73ab6b5bf6c17639f01dcba5a3277651b8864f4905dbdcfa69e8be1284073534b58a79c7ecbced1477e0273f5eb1645ca0eaf7d
-EBUILD qtwebview-5.11.0_beta4.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
-EBUILD qtwebview-5.7.1.ebuild 435 BLAKE2B d8147187c383d8fb4e1083dff2a755ca99e736f75641e24f21d68a1a1c451edd07ef46a14d16ab1b582a88a44640ecd52eda755f5953bc43032e1e7581586429 SHA512 b617e25fc5e34d3a2e78db3c81ab89e303392b54dd2d7604a35a8ecbb37ebafc8d1ad15ba51292fcf3ebda8b2f038d657c0e579012529569dc5bc33317f963a3
+EBUILD qtwebview-5.11.0_rc.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
 EBUILD qtwebview-5.9.4.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
 EBUILD qtwebview-5.9.5.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwebview/qtwebview-5.11.0_beta4.ebuild b/dev-qt/qtwebview/qtwebview-5.11.0_rc.ebuild
index 43288fc107ef..43288fc107ef 100644
--- a/dev-qt/qtwebview/qtwebview-5.11.0_beta4.ebuild
+++ b/dev-qt/qtwebview/qtwebview-5.11.0_rc.ebuild
diff --git a/dev-qt/qtwebview/qtwebview-5.7.1.ebuild b/dev-qt/qtwebview/qtwebview-5.7.1.ebuild
deleted file mode 100644
index 234ec083fbb1..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.7.1.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
-inherit qt5-build
-
-DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwebengine-${PV}
-
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index db178f9e007c..a7fcef54c2a1 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,9 +1,7 @@
-DIST qtbase-everywhere-src-5.11.0-beta4.tar.xz 46815720 BLAKE2B bf21828ed94d02140ebc5b9f366b935f944c40b8fe15094161a9c3d0adc16b2e8bfa7f4d514030569f5f463f39dd8083b6cacb536e71b1e81f743749c8742682 SHA512 c70b575729bdbd580d32350a233dfa1db3f450a3e0f4f41a5c8d153df396edc3f795099e4bf3447d3a0751f9acbc1978b4e499c6dbb6d9357c0288288b83d5ca
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
+DIST qtbase-everywhere-src-5.11.0-rc.tar.xz 46807012 BLAKE2B 76bcc9c71470f09ddb119e0098b58e5f505eb985e39a131100e4b7ddfaa8f5785e534296052631ae1407398e548a8fbf4ce23e05d6d1b5242d35c9ba7d1d08cc SHA512 3cd738f7f3179703275a8604709af70fba4148132ef6f2f8d13f8ea7c767c5f9ae3a11fd96cce49f090ecdf85fa04df0a8551d31d9d05c9efca50ab21ebcfd36
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
-EBUILD qtwidgets-5.11.0_beta4.ebuild 1063 BLAKE2B 3696169762f8da8af00565006c2b92a2e6e7f76cf14b19fb9a27ba5a5d4e12e23d2a23629a675415ada07211e3f664edab6c101b600147685f1f27e219e01196 SHA512 fc6b637e11f426423aa999e2b7e3817332135bf10ed757d2366973ce6f2b0ecd5b96552abe89da747c3e8544d8b5ddbd9fbb88ef9de80c5e1256eaefa4d10476
-EBUILD qtwidgets-5.7.1.ebuild 834 BLAKE2B 4647cabd5daa38c160a9872977a31e84b4761304faf8c68d29c26aa9e76143ffffb6fcaf03e7c348bf75fff60250315b3cf9d100ce3671a896f6d2dd3b244f0c SHA512 29890730308f8bf264098bfb70fabd6d4212290b9090ffede33bd6a4baa3eb9f3a71178850f1355ff6c12a90c7b41793aca224b7b95671fec3142c81e4667832
+EBUILD qtwidgets-5.11.0_rc.ebuild 1063 BLAKE2B 3696169762f8da8af00565006c2b92a2e6e7f76cf14b19fb9a27ba5a5d4e12e23d2a23629a675415ada07211e3f664edab6c101b600147685f1f27e219e01196 SHA512 fc6b637e11f426423aa999e2b7e3817332135bf10ed757d2366973ce6f2b0ecd5b96552abe89da747c3e8544d8b5ddbd9fbb88ef9de80c5e1256eaefa4d10476
 EBUILD qtwidgets-5.9.4-r1.ebuild 1059 BLAKE2B c1c09e2e1aa5d3634ec45185b4280a86b2b2cf2cb68f949fb7389220c0f1a112f168667b52da4e2f0f9477fd58d0da98e0acada386655ba1299824fcefccd978 SHA512 8fbef18c9dd5ec033eb53f599d1078336dc357c59e8b95e4833266f579bc4242f74755f04c4d30db0c3cf5dff94a9b1343c6aeeba6d754f25c458f3395e4cb2e
 EBUILD qtwidgets-5.9.5.ebuild 1063 BLAKE2B 3696169762f8da8af00565006c2b92a2e6e7f76cf14b19fb9a27ba5a5d4e12e23d2a23629a675415ada07211e3f664edab6c101b600147685f1f27e219e01196 SHA512 fc6b637e11f426423aa999e2b7e3817332135bf10ed757d2366973ce6f2b0ecd5b96552abe89da747c3e8544d8b5ddbd9fbb88ef9de80c5e1256eaefa4d10476
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.0_beta4.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.0_rc.ebuild
index caf1f79a84de..caf1f79a84de 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.11.0_beta4.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.11.0_rc.ebuild
diff --git a/dev-qt/qtwidgets/qtwidgets-5.7.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.7.1.ebuild
deleted file mode 100644
index 2a47ae557e57..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.7.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
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2 +png +xcb"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-)
-
-QT5_GENTOO_CONFIG=(
-	!:no-widgets:
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use xcb xcb system)
-		$(qt_use xcb xkbcommon system)
-		$(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 650637c73442..f2bac1dcfdf5 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,9 +1,7 @@
-DIST qtx11extras-everywhere-src-5.11.0-beta4.tar.xz 108900 BLAKE2B bed33a10f86386de7179123acb6d068c1f7795f1dba6d19743b0626b4d7348412f42756866a572444845f4727cc7848de986ea831939fb6b918d3e7da8324773 SHA512 a6f9f400ba352eeaac59558e9c69866e88fcaf73e714f10f2365e33f173230dc74fcef63c6a0df5c0aeae36c36a75c819acd452ebf716651a2aa468e9fd3c45b
-DIST qtx11extras-opensource-src-5.7.1.tar.xz 59656 BLAKE2B 641f66238450ed30a9923fb87aa56d4d4bf41ab634e8e3bf335da844041069af58d709019bd3b1161eff4a35b41aa582c53143bd02e3a20210a279ea497c4f3d SHA512 04359d85fad3dd51d6364c5218d5f76a384ec0d2082cefc7c67c5a8899cb19df3c9ce750b6707acfecf0a5ea57fb8cb737e5a8d2af3c63345f167f24712aaaee
+DIST qtx11extras-everywhere-src-5.11.0-rc.tar.xz 108868 BLAKE2B b7934db4202c8da31f554e912704cb3152e375d31dd271d5928d60a21c77355163a9634ff7d3041233a39177fc5edbc2955cd8ce0a107059a2ac434fc3103660 SHA512 15a5eebc1acef15b7f798247c68d3ebf45354ada7a7194846bb2cf41dacc234bd2a4f5b69bf0ff32b0ca7b6121022fbc63b1625921207d4309b9ab3af8cb2877
 DIST qtx11extras-opensource-src-5.9.4.tar.xz 76604 BLAKE2B cffb9870ec726edebbfbb2ed39206c8f1522e6f11d3429dbb0861501fed0d8dd3552f23ba363f3704ff1b6e9af89a91e68e90f2f7ccf80b150598778d26dfea3 SHA512 f05a273db98f95f998c681eab9f8d4a5d132342282bf63d1104ad718c424602fdc8dc71e14940999692449d3fea1442a5932c08cab3d6c0a9acbbf0403fee23c
 DIST qtx11extras-opensource-src-5.9.5.tar.xz 76864 BLAKE2B 138db8967adf1aa7b2b6a24e2c569d9fcfcf16c46e31b78e6e927e5d363879b053f182c0ee04df14da9dbe37b414fd350f9eb95eeb0d561143c29c08b98ec577 SHA512 633f34f1ddbbcfc5cb01ab703a29fcabe5699f36c4d565020cfcb4bcdd9ae88588598d2431e93394645d929ab7511fee612ca432a52e75741b5e84f654df4d57
-EBUILD qtx11extras-5.11.0_beta4.ebuild 445 BLAKE2B d929e4694614ec0bd3a33bab12d94e2e9d805b255eb3ff1a33a88b574fea3513de7a944f7638308e0b0808d08eea7ed5a6965473cd299374cbb228d3d12d8c31 SHA512 71c8168225337152bf3e8e8d63aeee3d1d90aa56ede5307f6b04f385779b99eb184aa4a9f091853c4fbd0fecc046fc27b945794a13072d34b19ccba60807e334
-EBUILD qtx11extras-5.7.1.ebuild 428 BLAKE2B a3792a688222ae4fd97d73ab9ce8e561e509c103ba84130ab35b4be820cc7c978f8206d3a63b2bc314aa72eebdcf04ee1f6e10604a3f571d410e42347aa9e2f6 SHA512 9ed63fdb17f983617259c75e0812fc4d3dda36d8a9a78b4c24a0cd436835f741903a77ecba71fc9a5ec33260505bf0f7d111577cde41a80862394741815fa83c
+EBUILD qtx11extras-5.11.0_rc.ebuild 445 BLAKE2B d929e4694614ec0bd3a33bab12d94e2e9d805b255eb3ff1a33a88b574fea3513de7a944f7638308e0b0808d08eea7ed5a6965473cd299374cbb228d3d12d8c31 SHA512 71c8168225337152bf3e8e8d63aeee3d1d90aa56ede5307f6b04f385779b99eb184aa4a9f091853c4fbd0fecc046fc27b945794a13072d34b19ccba60807e334
 EBUILD qtx11extras-5.9.4.ebuild 441 BLAKE2B c560a683ef4337df6299dc36b466cf9e8280d67440643a88baa33a4e7e5a3aed765e96ece849fa24c9f7096e118877f0a90ae395656d6c3219280c7db57b1841 SHA512 393fe8df2f9b16076119762e282e12d4be9dc07b1d1b889e2db357aa26000525be99a08280578e708909b2f9b96457fa3095788e46b16b2fd106a3df1424afa8
 EBUILD qtx11extras-5.9.5.ebuild 445 BLAKE2B d929e4694614ec0bd3a33bab12d94e2e9d805b255eb3ff1a33a88b574fea3513de7a944f7638308e0b0808d08eea7ed5a6965473cd299374cbb228d3d12d8c31 SHA512 71c8168225337152bf3e8e8d63aeee3d1d90aa56ede5307f6b04f385779b99eb184aa4a9f091853c4fbd0fecc046fc27b945794a13072d34b19ccba60807e334
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.11.0_beta4.ebuild b/dev-qt/qtx11extras/qtx11extras-5.11.0_rc.ebuild
index b029cc4254d8..b029cc4254d8 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.11.0_beta4.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.11.0_rc.ebuild
diff --git a/dev-qt/qtx11extras/qtx11extras-5.7.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.7.1.ebuild
deleted file mode 100644
index 8dbdf683cf22..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[xcb]
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtwidgets-${PV} )
-"
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 26895ed057a1..b93939ae63ae 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,9 +1,7 @@
-DIST qtbase-everywhere-src-5.11.0-beta4.tar.xz 46815720 BLAKE2B bf21828ed94d02140ebc5b9f366b935f944c40b8fe15094161a9c3d0adc16b2e8bfa7f4d514030569f5f463f39dd8083b6cacb536e71b1e81f743749c8742682 SHA512 c70b575729bdbd580d32350a233dfa1db3f450a3e0f4f41a5c8d153df396edc3f795099e4bf3447d3a0751f9acbc1978b4e499c6dbb6d9357c0288288b83d5ca
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
+DIST qtbase-everywhere-src-5.11.0-rc.tar.xz 46807012 BLAKE2B 76bcc9c71470f09ddb119e0098b58e5f505eb985e39a131100e4b7ddfaa8f5785e534296052631ae1407398e548a8fbf4ce23e05d6d1b5242d35c9ba7d1d08cc SHA512 3cd738f7f3179703275a8604709af70fba4148132ef6f2f8d13f8ea7c767c5f9ae3a11fd96cce49f090ecdf85fa04df0a8551d31d9d05c9efca50ab21ebcfd36
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
-EBUILD qtxml-5.11.0_beta4.ebuild 504 BLAKE2B 800d9acd20b8d497c4fca13df757f5227fbf06823fb4e1a496a0dd4c33fffb01ad1a1c11dbc10f6e3e50a0517809055a6839958d024cd2eaa31c876d5af9580f SHA512 7ffb83cbed0d8a708f6ae2c7a7ba435f4e4bf09c84c26e31c86188b82c421ae3005b6d220e51cbf4a473bac7dd3d4cb5b8f8b70f1b36c4d025feeb70335526a1
-EBUILD qtxml-5.7.1.ebuild 450 BLAKE2B 1b3d962fefa2cbfc881dc7a7de8f5fb4c4566b4c61ec2469ac8359e55ee900a0538f54cb4c531ee2fee964aa9fde3fb06bfd84a3eb70b753384fc6dfc587500a SHA512 a670d6c8cc7b93b36458ddb4aa0238f0bf6b4ebb5ba929bf1c46f1b95dc525e1d9820167b0604e9e7d948f3cfd192d88b656f4b448924262d8c3220d7607ba9c
+EBUILD qtxml-5.11.0_rc.ebuild 504 BLAKE2B 800d9acd20b8d497c4fca13df757f5227fbf06823fb4e1a496a0dd4c33fffb01ad1a1c11dbc10f6e3e50a0517809055a6839958d024cd2eaa31c876d5af9580f SHA512 7ffb83cbed0d8a708f6ae2c7a7ba435f4e4bf09c84c26e31c86188b82c421ae3005b6d220e51cbf4a473bac7dd3d4cb5b8f8b70f1b36c4d025feeb70335526a1
 EBUILD qtxml-5.9.4.ebuild 500 BLAKE2B a8c227d6065e6c8a16d9ab9cb4ff3684fc9016a9e9dc8903431a34a2cafef7cb9d3a7d36c7ad8a4b311c7fa35fe3431a5221a214e3fdd315482fad478b863dc3 SHA512 a1d121e4f44472f93b4d37bbf30e73f55e03546cb4fe441d0915c51afc728265cc8fb816bf3306908139d39e0513ff9e532585d801c29632defe662e9e73c8b4
 EBUILD qtxml-5.9.5.ebuild 504 BLAKE2B 800d9acd20b8d497c4fca13df757f5227fbf06823fb4e1a496a0dd4c33fffb01ad1a1c11dbc10f6e3e50a0517809055a6839958d024cd2eaa31c876d5af9580f SHA512 7ffb83cbed0d8a708f6ae2c7a7ba435f4e4bf09c84c26e31c86188b82c421ae3005b6d220e51cbf4a473bac7dd3d4cb5b8f8b70f1b36c4d025feeb70335526a1
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.11.0_beta4.ebuild b/dev-qt/qtxml/qtxml-5.11.0_rc.ebuild
index b8568f5ed9a2..b8568f5ed9a2 100644
--- a/dev-qt/qtxml/qtxml-5.11.0_beta4.ebuild
+++ b/dev-qt/qtxml/qtxml-5.11.0_rc.ebuild
diff --git a/dev-qt/qtxml/qtxml-5.7.1.ebuild b/dev-qt/qtxml/qtxml-5.7.1.ebuild
deleted file mode 100644
index 20cc263df256..000000000000
--- a/dev-qt/qtxml/qtxml-5.7.1.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
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/xml
-)
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index fb8dc1e493ae..6dfcac6555f8 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,11 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtxmlpatterns-everywhere-src-5.11.0-beta4.tar.xz 1370076 BLAKE2B 5c9ea2010eaf650b6f1da56f09944cd45f2cd90f38a179bf0497d089397a82ad82ba393322ae2fd02446883022c96ec92da5c25e46e01334869e32e971d552ef SHA512 e2f1b8c0fb3423a073a30ae508946a45fbceb441dec813f1601dca995ea8364d63e2e1efe80f67f8d880b8c9a1bfce5fb68db5871f9e5c7ff16f50d06072c128
-DIST qtxmlpatterns-opensource-src-5.7.1.tar.xz 1352472 BLAKE2B 3b65a4b8a76631ca31d48ab176b38818246e21fc247064821a221affa5f6fa1b6763e0784b9b37789aa50f3f4f4606a2ed976d7449d7e3f7f5c072a4765f401a SHA512 2acdee1e49a154dd111be6afcb7f765d98fc17c49f79cf08c5fc03cda7e0cab7537e2dd57d976ee13b72c46a577bad2ac8466444ec46b3f14130f71756ac63a2
+DIST qtxmlpatterns-everywhere-src-5.11.0-rc.tar.xz 1369312 BLAKE2B aaeee61c148e9add2fa898eb0351f8f88f258787845bbc18e3a14325e98e538de390cc6c2415ef779a91f394dbb4f5f156079162d1fa5ef1ddce02b4c4073cc5 SHA512 241e9bf9f743d1a9f9ac8279c20b0ce965a736b4746d9b4d9911c1b1bc0971fdf0f1ae4d44076838966275650398ff7786fb8cd4df37dc860a01e274565479b3
 DIST qtxmlpatterns-opensource-src-5.9.4.tar.xz 1361036 BLAKE2B 74fae07ff780bb44eaffc56822585c5dd2dc36c13237ae23666f8286488a837cafccf01c14d9efe4d151435235965b923bad1889ed604ebb2781237d8674db26 SHA512 c2789e7ca32f29f025b72704be49d9cfd3c02bfa61bf3df4145ea03b5df4fc60b2498bcf7e45090b36141aace91c645b0648b99c54e1b3fe6aec486e7fbe0dad
 DIST qtxmlpatterns-opensource-src-5.9.5.tar.xz 1344548 BLAKE2B edd65de866be0aec6dd8da672bb6713b5384d09ab0ad074efc731ab7aca843882db19d678de75bc9f9662802a7164148f66f3b5e3d0d67c313049b84481e948a SHA512 ed4e335b474e76d05ea811b86b2bcaece9ccb6c9e358704ab974024593d40a80465dba48074ffbaaacf9850c0bc9844c0715c114e677c980ab3b39c65e79fd2f
 EBUILD qtxmlpatterns-4.8.7.ebuild 679 BLAKE2B e26f0d2bb630e377f932c37e8e9399c40c722c2f4e7dcb68d42c3ee8c08bba1ef9263e6b704e33dc6ec402356e8829d004e007c20e91a49b93001c743f8182a5 SHA512 dde6d5ada8f3c9546bfed8a0b4f6c3f118794fa4fa382219a3f6b8ee75b8c5e8fc5913a2a0421a8904ba52dadbc707a3fd17c2ddbe4a1ec758b00d8fb0c2aecf
-EBUILD qtxmlpatterns-5.11.0_beta4.ebuild 427 BLAKE2B 9d56740f6f80e90e321b3af95d6dd3a2d4b9911714ff0d5ebc9dc5b164122f584c51a8e58a4c858ad58fa96a5d467b87af27c5fda6c8287e7f0bec35b011b7b4 SHA512 9d919140204f45dc74f792dbe00f49f057735a893bc691f4e21a32d3d0af9065014e543833a596f0e739264b589c0f7b1d4a32e4c1dcdcf5367344747ec57e53
-EBUILD qtxmlpatterns-5.7.1.ebuild 410 BLAKE2B d2fade547a1a9577632ee0230d2e6be902f362f1418ae54206f9188c760abc28d9fcf5985f7fff7f78005d2521455dfacb63b0507e50b68f9e51b388e2bf4c73 SHA512 fe95936636e83b41c90212726ab666433bf8ee0a7de2388292f400c1019e9ed074da0a5dd4a2ffb49ceb6ba48681c6bf5f59a3dd5a7417e3bc7f5cdb1c54f4a9
+EBUILD qtxmlpatterns-5.11.0_rc.ebuild 427 BLAKE2B 9d56740f6f80e90e321b3af95d6dd3a2d4b9911714ff0d5ebc9dc5b164122f584c51a8e58a4c858ad58fa96a5d467b87af27c5fda6c8287e7f0bec35b011b7b4 SHA512 9d919140204f45dc74f792dbe00f49f057735a893bc691f4e21a32d3d0af9065014e543833a596f0e739264b589c0f7b1d4a32e4c1dcdcf5367344747ec57e53
 EBUILD qtxmlpatterns-5.9.4.ebuild 423 BLAKE2B 29a95538e2450fd50671dd1dd93e8605ad958de12901c20469aa4a8ab632a80d7f3cdc5beb08c63fe2ff57ce1e6ed8b8958edf401b6401faf57ab17542c90722 SHA512 eb6cf00eca1dbbbb50542e9c5ac7a872bb9aa74f93104b9abc892f44378cbcf4130474da14d69b613e1eaad6b72e12f11ed9e01a4c7f12ca24119795f8abf17a
 EBUILD qtxmlpatterns-5.9.5.ebuild 427 BLAKE2B 9d56740f6f80e90e321b3af95d6dd3a2d4b9911714ff0d5ebc9dc5b164122f584c51a8e58a4c858ad58fa96a5d467b87af27c5fda6c8287e7f0bec35b011b7b4 SHA512 9d919140204f45dc74f792dbe00f49f057735a893bc691f4e21a32d3d0af9065014e543833a596f0e739264b589c0f7b1d4a32e4c1dcdcf5367344747ec57e53
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.0_beta4.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.0_rc.ebuild
index 8e0054f70379..8e0054f70379 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.0_beta4.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.0_rc.ebuild
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.7.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.7.1.ebuild
deleted file mode 100644
index 9979f4c6c572..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index a960506a27d5..11f0329195c9 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/audio_capture/Manifest b/dev-ros/audio_capture/Manifest
index 3bb905a1a47a..c35f3f6ca122 100644
--- a/dev-ros/audio_capture/Manifest
+++ b/dev-ros/audio_capture/Manifest
@@ -1,4 +1,6 @@
 DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
+DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
 EBUILD audio_capture-0.3.1.ebuild 631 BLAKE2B dae17522efbd9720eafcdd88995639cb6f16dbde9153952982b8d5c84fcedade72c0298798c5e62aac07866b8b33cba0e92d4aa89608c152a4867984bcf663c9 SHA512 c6e306409c32142860c2159e41bc79d9102ae3d47e66e27fefb1b1f77c9c14a700206b6c5dbc45ab18e0aeecfc1260ccd4478e3487fbe5a9c2ab4095008f5a99
+EBUILD audio_capture-0.3.2.ebuild 631 BLAKE2B 2fe8f579ba0bfa753812e437a3b03ad3a83db53514b78325876375021bf13912269fb5993b255a8720eda4ea33c2aca9d708a25ba9672f84eff5e4545176e83d SHA512 adfff3b15e61af59ec0b76b096bc40cdb2d948f7ba5d0e3fd0169295ce114cae74ce22a45a41d2a6fca3a0e41507d3a9175bbe91fd1d5f0a536290316decbbac
 EBUILD audio_capture-9999.ebuild 631 BLAKE2B dae17522efbd9720eafcdd88995639cb6f16dbde9153952982b8d5c84fcedade72c0298798c5e62aac07866b8b33cba0e92d4aa89608c152a4867984bcf663c9 SHA512 c6e306409c32142860c2159e41bc79d9102ae3d47e66e27fefb1b1f77c9c14a700206b6c5dbc45ab18e0aeecfc1260ccd4478e3487fbe5a9c2ab4095008f5a99
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/audio_capture/audio_capture-0.3.2.ebuild b/dev-ros/audio_capture/audio_capture-0.3.2.ebuild
new file mode 100644
index 000000000000..d38f48f10b16
--- /dev/null
+++ b/dev-ros/audio_capture/audio_capture-0.3.2.ebuild
@@ -0,0 +1,28 @@
+# 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-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transports audio from a source to a destination"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	media-libs/gstreamer:1.0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	media-plugins/gst-plugins-lame:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gst-plugins-base:1.0
+"
diff --git a/dev-ros/audio_common_msgs/Manifest b/dev-ros/audio_common_msgs/Manifest
index 99f8d18f8d3a..cc046d55862d 100644
--- a/dev-ros/audio_common_msgs/Manifest
+++ b/dev-ros/audio_common_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
+DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
 EBUILD audio_common_msgs-0.3.1.ebuild 427 BLAKE2B 71a04c5bf47be904148a7fe3ee5548d386749c0712c5234f3eb279ca4415c1c339cfae4bb6284da5c53de3c90c3149625726c6b0c4931fcb0f85513c4659188b SHA512 8a70dd7cdf201e4402e373b5f86ae941feb4e5ff33d86e88777c2f702a25f817167256cd7a6ff7225ef92ae709063a57f976643d593ed18a761b6e16e18f9d62
+EBUILD audio_common_msgs-0.3.2.ebuild 427 BLAKE2B a4b77cc613bbb7412fd4640e3acc840204185c5fbaf9ee0dea9fa34ace3f49c6ec48186cbae023ce61960870cf5bb7a178c8d325e5a56aea14d8e9f1ee05ce66 SHA512 fc85d3fccf9b9a0c272e63d6bf6cc34769fe1ae476e6a62a7650446357ffe40e94d84f0f3c8354561569728bca45a087ee7e110d3d14cd586dc972d5f3437ab5
 EBUILD audio_common_msgs-9999.ebuild 427 BLAKE2B 71a04c5bf47be904148a7fe3ee5548d386749c0712c5234f3eb279ca4415c1c339cfae4bb6284da5c53de3c90c3149625726c6b0c4931fcb0f85513c4659188b SHA512 8a70dd7cdf201e4402e373b5f86ae941feb4e5ff33d86e88777c2f702a25f817167256cd7a6ff7225ef92ae709063a57f976643d593ed18a761b6e16e18f9d62
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.2.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.2.ebuild
new file mode 100644
index 000000000000..eca67a70921c
--- /dev/null
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.2.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-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for transmitting audio via ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/audio_play/Manifest b/dev-ros/audio_play/Manifest
index 3275bbe23dc9..e3c262f01963 100644
--- a/dev-ros/audio_play/Manifest
+++ b/dev-ros/audio_play/Manifest
@@ -1,4 +1,6 @@
 DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
+DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
 EBUILD audio_play-0.3.1.ebuild 593 BLAKE2B 7724b7d05d38e78e412ea54e6c964975c48516060319007608686fad022b693d6cd4cb154b688ac77a7164d785871d493059e21e7cc5f82b73bbf46185360bba SHA512 a48ecc62f22dfb8c187e4f62666038f13bfa4804db30e1e72a3bf04912ab2af77bd3edb0ad3a441c9985f48b18c4c33e9b7b385b6b89d9e9166df157287c36e6
+EBUILD audio_play-0.3.2.ebuild 593 BLAKE2B 2a130ff1c86ca05a643b5ae082bdbb2e0c091fc66295b08431dd67e3a78c3976278b52549c126b4a2f2693f02997df42a2a7476d6c30942c8ac8274c4d766830 SHA512 cb93e0860f3bd966d7d78daebee5e9a1c27bd4c7611cb54f6b6bf5905e4f977be414dd611e5e3731be59af3ed89a286da6ea98a2a81904b94a709f3fe52c8193
 EBUILD audio_play-9999.ebuild 593 BLAKE2B 7724b7d05d38e78e412ea54e6c964975c48516060319007608686fad022b693d6cd4cb154b688ac77a7164d785871d493059e21e7cc5f82b73bbf46185360bba SHA512 a48ecc62f22dfb8c187e4f62666038f13bfa4804db30e1e72a3bf04912ab2af77bd3edb0ad3a441c9985f48b18c4c33e9b7b385b6b89d9e9166df157287c36e6
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/audio_play/audio_play-0.3.2.ebuild b/dev-ros/audio_play/audio_play-0.3.2.ebuild
new file mode 100644
index 000000000000..8f6095935773
--- /dev/null
+++ b/dev-ros/audio_play/audio_play-0.3.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Outputs audio to a speaker from a source node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	media-libs/gstreamer:1.0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	media-libs/gst-plugins-good:1.0
+	media-libs/gst-plugins-base:1.0
+"
diff --git a/dev-ros/cpp_common/Manifest b/dev-ros/cpp_common/Manifest
index e911c9549de4..93111b0a0c31 100644
--- a/dev-ros/cpp_common/Manifest
+++ b/dev-ros/cpp_common/Manifest
@@ -1,6 +1,8 @@
+DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
 DIST roscpp_core-0.6.7.tar.gz 34845 BLAKE2B cdb2385069a74d670061bc2245421e31216e1c9ace5c96f83d1875ddcf460f2ad425b10db3330253e2a49f3bc415cf3c72ab885cb121c9477ae54a385893a7b8 SHA512 d93afb6e0e88bb01b13af0334a7977411fac8f89dd06fc69a32b95bab4ead05d6cb564b089ee846fe542be180f6418664f8328a6a9e753a55b34e5a0a1d61bf4
 DIST roscpp_core-0.6.8.tar.gz 35003 BLAKE2B 7b4c02652693f76326df83d17164d3268f8b0eda0ddfe8f73d286ae09d7fbb3f8f433ab92527167fb918b55c53aeaa4e26d6876dac51d9d35e0b18b185d89867 SHA512 5fa9f8714059fbc864583662cd411d64470565cc2c372a09a63708a8cc06140d2ce8b84a7025837a49f2c09c7fee5092ec42d5625de4bfd2d9410baf7821b5df
 DIST roscpp_core-0.6.9.tar.gz 35069 BLAKE2B 5718611730419de3fd5dbd7c26792857c75306f4155916fe9570e494a0b1f0b9ca167a06654e1d5b1e1d20aa8cbd17c306bc91e7d0e803c8691d78c6c456fcec SHA512 87360695e71a020e869633c19187851242b84686b87842b388273f9874ff72e4e587eaf55dc10d099e55bc8db17c2ae7efdd5a9ff553a006b7f7c4ea5e1c84d9
+EBUILD cpp_common-0.6.10.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
 EBUILD cpp_common-0.6.7-r1.ebuild 420 BLAKE2B b21ab6c6e875b3295217c3c735601d424d86bfca9479e7fc569c5b1c6e3d8b1c1646cb3ca8d41246a6298dc57436ede4efc03f47490367d203d041795e3bf67a SHA512 4f3e377d1cd041b0d7802a182a4182f461d23fcd989c1c89e111702c0679e64a47c48b398b4bf4605052048dae569627091bdf08c4754d95556810bc3ec9158a
 EBUILD cpp_common-0.6.8.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
 EBUILD cpp_common-0.6.9.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
diff --git a/dev-ros/cpp_common/cpp_common-0.6.10.ebuild b/dev-ros/cpp_common/cpp_common-0.6.10.ebuild
new file mode 100644
index 000000000000..4b61973c2c53
--- /dev/null
+++ b/dev-ros/cpp_common/cpp_common-0.6.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ code for doing things that are not necessarily ROS related"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge:=
+	dev-libs/boost:=[threads]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/diagnostic_aggregator/Manifest b/dev-ros/diagnostic_aggregator/Manifest
index 3be920b493b4..95dcbd7e82a4 100644
--- a/dev-ros/diagnostic_aggregator/Manifest
+++ b/dev-ros/diagnostic_aggregator/Manifest
@@ -1,4 +1,6 @@
 DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
+DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
 EBUILD diagnostic_aggregator-1.9.2-r1.ebuild 583 BLAKE2B bd9ec81e5f2d2fe41ee77bab6072bd87e7e4fd749471ac5d9672fd866df215fda5eaf6fe8f775717dc94144eccfd4e4b74a2aecd0edca252d385d45c64467c7d SHA512 77b3f633a06959a282f69aa0d73951fc5b83ceb85f2bfcce8b9f0a31f8130b7fa2e8fc4d4a546c1b009be21d3e39d165dafc537f386a25afb4e8a6b8df525845
+EBUILD diagnostic_aggregator-1.9.3.ebuild 583 BLAKE2B ab074a4b081d313ebdfd1744d030050e90c16aab4c9b37ed3efc9b6d9ad46eed3f5a4a5ca2b9fc244e5d86ee0ff6ae2f0fa7610b661855bc019d4a474adea7fb SHA512 e5953c56c3c8d1d786c5adcd07c19646ac21f66250196cf35cc76b38a8d15b417c1e374d0a8e65ad371e74c9946a9463d519f94f7b909e0be3260a1765a97c77
 EBUILD diagnostic_aggregator-9999.ebuild 583 BLAKE2B bd9ec81e5f2d2fe41ee77bab6072bd87e7e4fd749471ac5d9672fd866df215fda5eaf6fe8f775717dc94144eccfd4e4b74a2aecd0edca252d385d45c64467c7d SHA512 77b3f633a06959a282f69aa0d73951fc5b83ceb85f2bfcce8b9f0a31f8130b7fa2e8fc4d4a546c1b009be21d3e39d165dafc537f386a25afb4e8a6b8df525845
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.3.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.3.ebuild
new file mode 100644
index 000000000000..650ad537d33a
--- /dev/null
+++ b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.3.ebuild
@@ -0,0 +1,29 @@
+# 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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Aggregates ROS diagnostics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/rostest
+	dev-ros/xmlrpcpp
+	dev-ros/bondcpp
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest )"
diff --git a/dev-ros/diagnostic_analysis/Manifest b/dev-ros/diagnostic_analysis/Manifest
index 0ed9a78f7663..2a27aa0f821c 100644
--- a/dev-ros/diagnostic_analysis/Manifest
+++ b/dev-ros/diagnostic_analysis/Manifest
@@ -3,10 +3,12 @@ DIST diagnostics-1.8.8.tar.gz 508404 BLAKE2B 9bf90d268ac23d0007133ddc5f2ac0d6ba4
 DIST diagnostics-1.8.9.tar.gz 525881 BLAKE2B 6de75f5fa961da199daab1a6ae1c2b34b0edbd70c09e58f7384c76f9dd0c3a51cc8b0f20688dbdcafe164ade3a0e3bdc894064cc269f6b8fb0e31faa6f4d9654 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80
 DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
 DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
+DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
 EBUILD diagnostic_analysis-1.8.10.ebuild 592 BLAKE2B 90fe81e38d40b8034946430666ba449e391fa9bee6b794774db68c87962bb913e004f6d67add27b01b973155c6af35a05de71f1e5cce0b9e7c0c01f9202bdf8c SHA512 6d1d6a956973c20eed5f491c68c71dc45d4e0260c70165b8fde6a6b1a9349a60dcd00cf618e7dff457b0a00b42d062dea0ec67fcd3c7149981e43c8c4afb3453
 EBUILD diagnostic_analysis-1.8.8.ebuild 592 BLAKE2B 14c3b84ef2fa6763085a75a06ae72ba6e33a87dc9b9a41aeec2063f6d23d58a8ef5ad07da489c0565e8d815041f4de00a82f25789cf9eb5ecca2a0a749fcd2c8 SHA512 ce590b7a3a4c834e7bbd68043e42342214e5337c74de458306c03c4a5c655f7cb9d466e1c4a5b9c1a2cc39f8b56990511ef141abd162300645a0ac52e8933677
 EBUILD diagnostic_analysis-1.8.9.ebuild 592 BLAKE2B 14c3b84ef2fa6763085a75a06ae72ba6e33a87dc9b9a41aeec2063f6d23d58a8ef5ad07da489c0565e8d815041f4de00a82f25789cf9eb5ecca2a0a749fcd2c8 SHA512 ce590b7a3a4c834e7bbd68043e42342214e5337c74de458306c03c4a5c655f7cb9d466e1c4a5b9c1a2cc39f8b56990511ef141abd162300645a0ac52e8933677
 EBUILD diagnostic_analysis-1.9.0.ebuild 592 BLAKE2B 91fb793da96827276f7219f1396ca4e3b174e853a5e18fdbea5e54a1ca06782470d4b45424ff81a5811e01d74d1987d009bc42325b6753043bb1285b911b4900 SHA512 097d5dcb4564e0e33bf8813e385a802d943d873528468064d6ae1adc1578b8f6b684e34906d2dbd6be801a9bacbe83baf1ddb3069f27c3a9bb219f501bdaa720
 EBUILD diagnostic_analysis-1.9.2.ebuild 592 BLAKE2B 91fb793da96827276f7219f1396ca4e3b174e853a5e18fdbea5e54a1ca06782470d4b45424ff81a5811e01d74d1987d009bc42325b6753043bb1285b911b4900 SHA512 097d5dcb4564e0e33bf8813e385a802d943d873528468064d6ae1adc1578b8f6b684e34906d2dbd6be801a9bacbe83baf1ddb3069f27c3a9bb219f501bdaa720
+EBUILD diagnostic_analysis-1.9.3.ebuild 592 BLAKE2B ec4aa558c8281f2641f62093d568569f66addaf50b1dd2378a9e1f634da6e85c9ef5699ab6f58113497bcc1ac11cd75839c4546a49080b9438dd885468933780 SHA512 c1ff79ca45ca2c7db39aa55147b4c19bab2f0c085f79710e81704c0bc18c455a425ff60454314009e31d87c89bad897e7ed0246b75be3f530cb0c8a8555c18f9
 EBUILD diagnostic_analysis-9999.ebuild 592 BLAKE2B 14c3b84ef2fa6763085a75a06ae72ba6e33a87dc9b9a41aeec2063f6d23d58a8ef5ad07da489c0565e8d815041f4de00a82f25789cf9eb5ecca2a0a749fcd2c8 SHA512 ce590b7a3a4c834e7bbd68043e42342214e5337c74de458306c03c4a5c655f7cb9d466e1c4a5b9c1a2cc39f8b56990511ef141abd162300645a0ac52e8933677
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.3.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.3.ebuild
new file mode 100644
index 000000000000..7e9226fd5c37
--- /dev/null
+++ b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.3.ebuild
@@ -0,0 +1,24 @@
+# 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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Converts diagnostics data into a series of CSV files"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rostest[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_common_diagnostics/Manifest b/dev-ros/diagnostic_common_diagnostics/Manifest
index 6f20ebea34aa..e29b32c0b3a8 100644
--- a/dev-ros/diagnostic_common_diagnostics/Manifest
+++ b/dev-ros/diagnostic_common_diagnostics/Manifest
@@ -3,10 +3,12 @@ DIST diagnostics-1.8.8.tar.gz 508404 BLAKE2B 9bf90d268ac23d0007133ddc5f2ac0d6ba4
 DIST diagnostics-1.8.9.tar.gz 525881 BLAKE2B 6de75f5fa961da199daab1a6ae1c2b34b0edbd70c09e58f7384c76f9dd0c3a51cc8b0f20688dbdcafe164ade3a0e3bdc894064cc269f6b8fb0e31faa6f4d9654 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80
 DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
 DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
+DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
 EBUILD diagnostic_common_diagnostics-1.8.10.ebuild 535 BLAKE2B 50ff4a1d1d47927f267fd691e07c7806a8533b4ebcdf28ce2e014120b2bb0f5a7fe48a01526931e3d737c6a303a3844432def31405e6c51bc816cf887141875c SHA512 a32446e9b4c89170a6d8fe302d7bce35f43c69a6db3044a5c45800335275598cccd6361a11aa5db1eef40bddf43be24bd7cfc5dc88e22079abf923e2b2dffded
 EBUILD diagnostic_common_diagnostics-1.8.8.ebuild 535 BLAKE2B 29329eb9e0e7a8d8535177bc8cb80df513bb659e3615cf82b7d093c2b3cbb46a45ccb524ce1ff0adf7daab505ed5e8b429f3b624b4027d3fa75a8f119b55f513 SHA512 be114573e99cb90e9f3002747250ae6658ed00676e95290756950d5be712ef3e6514909c26e78683f875ccba102b58618bc3d2c868f7cf1108c7723c6d85f7c8
 EBUILD diagnostic_common_diagnostics-1.8.9.ebuild 535 BLAKE2B 29329eb9e0e7a8d8535177bc8cb80df513bb659e3615cf82b7d093c2b3cbb46a45ccb524ce1ff0adf7daab505ed5e8b429f3b624b4027d3fa75a8f119b55f513 SHA512 be114573e99cb90e9f3002747250ae6658ed00676e95290756950d5be712ef3e6514909c26e78683f875ccba102b58618bc3d2c868f7cf1108c7723c6d85f7c8
 EBUILD diagnostic_common_diagnostics-1.9.0.ebuild 535 BLAKE2B 2da998bc10c2334c000f658abdc86e2491cb224bc2e0fde1f6a05cd213be8636d99b5c80c391acb378eeefd35e70fc8c4d5ef9bc5fcbdd9f8126063ccb044234 SHA512 0b4ff0ce595287096da6d23d6f20d12f6a1fa01b978512d92aff859753497c2732fcd741d495dda3555375e409cc95284e7be25342fcf33671a20a45b030472b
 EBUILD diagnostic_common_diagnostics-1.9.2.ebuild 535 BLAKE2B 2da998bc10c2334c000f658abdc86e2491cb224bc2e0fde1f6a05cd213be8636d99b5c80c391acb378eeefd35e70fc8c4d5ef9bc5fcbdd9f8126063ccb044234 SHA512 0b4ff0ce595287096da6d23d6f20d12f6a1fa01b978512d92aff859753497c2732fcd741d495dda3555375e409cc95284e7be25342fcf33671a20a45b030472b
+EBUILD diagnostic_common_diagnostics-1.9.3.ebuild 535 BLAKE2B 4e308b6d8baf51618a63dadb3c06b889d8394d6245848df535ad177f03f838cca8f4ffb3a55072ee113d2910e98b78fd8f53056eb3884e9fc80a0382914738dd SHA512 87eafa4ab1038fe053db4855de5d90bc7e5c6a6e955d20ce4d1cc90ce88e0ac151599f96f8bd6f6796adfa749833ea25e3a2f5830160b76605db2d3ee97f35ed
 EBUILD diagnostic_common_diagnostics-9999.ebuild 535 BLAKE2B 29329eb9e0e7a8d8535177bc8cb80df513bb659e3615cf82b7d093c2b3cbb46a45ccb524ce1ff0adf7daab505ed5e8b429f3b624b4027d3fa75a8f119b55f513 SHA512 be114573e99cb90e9f3002747250ae6658ed00676e95290756950d5be712ef3e6514909c26e78683f875ccba102b58618bc3d2c868f7cf1108c7723c6d85f7c8
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.3.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.3.ebuild
new file mode 100644
index 000000000000..f34ad33f0501
--- /dev/null
+++ b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.3.ebuild
@@ -0,0 +1,24 @@
+# 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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Generic nodes for monitoring a linux host"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_updater/Manifest b/dev-ros/diagnostic_updater/Manifest
index 4cf5f3d501b9..047086620e6a 100644
--- a/dev-ros/diagnostic_updater/Manifest
+++ b/dev-ros/diagnostic_updater/Manifest
@@ -3,10 +3,12 @@ DIST diagnostics-1.8.8.tar.gz 508404 BLAKE2B 9bf90d268ac23d0007133ddc5f2ac0d6ba4
 DIST diagnostics-1.8.9.tar.gz 525881 BLAKE2B 6de75f5fa961da199daab1a6ae1c2b34b0edbd70c09e58f7384c76f9dd0c3a51cc8b0f20688dbdcafe164ade3a0e3bdc894064cc269f6b8fb0e31faa6f4d9654 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80
 DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
 DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
+DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
 EBUILD diagnostic_updater-1.8.10.ebuild 680 BLAKE2B e6874d6ee6169653d3f115e82a4191056a4113f767de94bff254ed7ccd96b70452fd4e91da5e20101f0a342dc99bd1485ee92a8c05a3ce3d1780377a2e4b40e2 SHA512 1232f52186e5ba463f6b92399881a92c0f70affbe532901719a6d361dd5024afc3b7c46d3d8236490bfe5bace2e7ddb292f0a1f9b9af5f32bf4da4671c8dc7aa
 EBUILD diagnostic_updater-1.8.8.ebuild 680 BLAKE2B 9e144541f453c8f1947234290709bd3d49d9b6a055b07b843fd86b1c7df8d4d772371ab888c4216048ab399ac032ba979ad4d825f3f133e572ede6e760160164 SHA512 14dc098b31508d430e63d429d88e6289de31c7d230e18614715c084d1ec787da3149290bf19c30d705da2c3bbe505c4c10092fae84319ea4feacec8920b371f7
 EBUILD diagnostic_updater-1.8.9.ebuild 680 BLAKE2B 9e144541f453c8f1947234290709bd3d49d9b6a055b07b843fd86b1c7df8d4d772371ab888c4216048ab399ac032ba979ad4d825f3f133e572ede6e760160164 SHA512 14dc098b31508d430e63d429d88e6289de31c7d230e18614715c084d1ec787da3149290bf19c30d705da2c3bbe505c4c10092fae84319ea4feacec8920b371f7
 EBUILD diagnostic_updater-1.9.0.ebuild 680 BLAKE2B dcdecb3b088fe7dd17cb5242d32158dfbffea204f0aa2148ec88cb0e7a6a5c5655ff67bfabdceabb82e570450154821c860dae2b22ba8db7ab59c78be9566aa6 SHA512 3d09548ad40f64f6aeedec3174cd8a114e12854e57c281a1e60cdff7ca8afdaa45f0a31c361e1bcb1e16108bf715ec2155ef2f13abd8125d8bd9ef73798d553e
 EBUILD diagnostic_updater-1.9.2.ebuild 680 BLAKE2B dcdecb3b088fe7dd17cb5242d32158dfbffea204f0aa2148ec88cb0e7a6a5c5655ff67bfabdceabb82e570450154821c860dae2b22ba8db7ab59c78be9566aa6 SHA512 3d09548ad40f64f6aeedec3174cd8a114e12854e57c281a1e60cdff7ca8afdaa45f0a31c361e1bcb1e16108bf715ec2155ef2f13abd8125d8bd9ef73798d553e
+EBUILD diagnostic_updater-1.9.3.ebuild 680 BLAKE2B f9d773983076c3887feb9102b5816299a0f245a8f992bbeaf8c5453cbcc34a9a10d0690dbd049e2898975d748e4326d7b48421b2a9b293c1945e4a0028908ce5 SHA512 410dc6493a54450821ec083d98e55c8e9587b3df0298c5f3391a6ad86e66f1ecd7a64c59e0d34efd97d30ad3298f6e45b1e9260327b308cf01d47df3893ec0cc
 EBUILD diagnostic_updater-9999.ebuild 680 BLAKE2B 9e144541f453c8f1947234290709bd3d49d9b6a055b07b843fd86b1c7df8d4d772371ab888c4216048ab399ac032ba979ad4d825f3f133e572ede6e760160164 SHA512 14dc098b31508d430e63d429d88e6289de31c7d230e18614715c084d1ec787da3149290bf19c30d705da2c3bbe505c4c10092fae84319ea4feacec8920b371f7
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.3.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.3.ebuild
new file mode 100644
index 000000000000..961c2bf53258
--- /dev/null
+++ b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.3.ebuild
@@ -0,0 +1,25 @@
+# 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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for updating diagnostics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/genmsg/Manifest b/dev-ros/genmsg/Manifest
index c66b44979b93..87f3e7e79b55 100644
--- a/dev-ros/genmsg/Manifest
+++ b/dev-ros/genmsg/Manifest
@@ -1,6 +1,8 @@
 DIST genmsg-0.5.10.tar.gz 59468 BLAKE2B 2cb70a60dc9281c8999fd88615845bec840ba0d46b00e170fb56e152234c5762058a5a1b2f87fea67d596eadb330627bcfeb8554124894bfb1155654dadb7357 SHA512 8effbada30bc3c48526ef162ef11d0d14c8bba5688d26089cb934a0e9a069233a724608862188caa86d1a4dc8e773d4e93fce5d88239acf0af525f6821d01268
+DIST genmsg-0.5.11.tar.gz 59507 BLAKE2B 080661242a9b6e71d2a098236bce380230c54b5017b2e3b4753fe79a0269fac8ecbd4a36f83710a7d499638bf7289203bea63e0f1215d008a2813a619e70935b SHA512 81ec559e1682aef3ca58c18fa33ce4b6a8d6d835be9831bc1b0401ed440b68f7e021a5a6ebfc17a9cb3b95a3c8434542724f5222f3730793c08a87762ff0c45b
 DIST genmsg-0.5.9.tar.gz 59409 BLAKE2B e3d4ac69bbc665aa62ef9fb7b35cc9b47280690eb743f50e5fe5acaf96a0fda363d594878b1f3584f5d96952dbe9c64428e5e4aeb1f0432c591d03d9ce16cd89 SHA512 ac62c8d08da449890c6eb53264153e01237cd50b97d4d4123e334c59a9a1ef73ce70c4d3d7c95f91ea872ea06b30fa72bf8a3a177309493b33984b8d21e36939
 EBUILD genmsg-0.5.10.ebuild 470 BLAKE2B 488207849ff40c952ea177dc818313c91a8cf535f5ce1fa75ad43c324a99c6fa6aacc27179bfb35746c07350f03c781c6e7475b165ec309ced2ee008d683b733 SHA512 6827248d5dcb07a5a032a137beab04cc28b57a824c7c24dbb3bf3832478b5579229cb424c82e430d77f85a7ee5eaa92b6750c243977fda0749cb41c4e0119239
+EBUILD genmsg-0.5.11.ebuild 470 BLAKE2B 488207849ff40c952ea177dc818313c91a8cf535f5ce1fa75ad43c324a99c6fa6aacc27179bfb35746c07350f03c781c6e7475b165ec309ced2ee008d683b733 SHA512 6827248d5dcb07a5a032a137beab04cc28b57a824c7c24dbb3bf3832478b5579229cb424c82e430d77f85a7ee5eaa92b6750c243977fda0749cb41c4e0119239
 EBUILD genmsg-0.5.9.ebuild 470 BLAKE2B 61bfbd0c196380a71a0d1bdc476f4b103595f41e51d7e47cefb4c79ba872b0ad160f9cf7fe1690fa55329b25fe1fb1e19d513ca45136c5d431653b87956d864e SHA512 2ce83ace0d29fae10543fb03ea2e6a47cafb6feb5af6fff76b6c25788600a1e3837c218a57c5078676e323ce58542aeaa87e1ce095a3487f21206f03c83d4f5e
 EBUILD genmsg-9999.ebuild 470 BLAKE2B 61bfbd0c196380a71a0d1bdc476f4b103595f41e51d7e47cefb4c79ba872b0ad160f9cf7fe1690fa55329b25fe1fb1e19d513ca45136c5d431653b87956d864e SHA512 2ce83ace0d29fae10543fb03ea2e6a47cafb6feb5af6fff76b6c25788600a1e3837c218a57c5078676e323ce58542aeaa87e1ce095a3487f21206f03c83d4f5e
 MISC metadata.xml 324 BLAKE2B 4e885cafaf86dab897c52a6e27092584252b7daff9d9597c0bfd45b148b91ec763c3e46abbeb3db64fb5d17fc2d1ff83cf252201c165a3b52bc5e4d4033abcc6 SHA512 be0ee3a5595270480a29bf98888215b692009bdfaf06591c3cd56196b1c437e847abac787d4304f0166e76525b5ca7d82d81f660f1309a5139081bd205d95939
diff --git a/dev-ros/genmsg/genmsg-0.5.11.ebuild b/dev-ros/genmsg/genmsg-0.5.11.ebuild
new file mode 100644
index 000000000000..1eda6e3256c5
--- /dev/null
+++ b/dev-ros/genmsg/genmsg-0.5.11.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/genmsg"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="Python library for generating ROS message and service data structures for various languages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/mk/Manifest b/dev-ros/mk/Manifest
index b362201e25dc..64886aff6c1e 100644
--- a/dev-ros/mk/Manifest
+++ b/dev-ros/mk/Manifest
@@ -9,6 +9,7 @@ DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee554725450
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
 DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
+DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
 EBUILD mk-1.12.3.ebuild 375 BLAKE2B 90af150f66eaf495a195d9496b85c5d7032e63dea49a8e3a4a50093ec28dc0b9ee34d325b1271767c00ec2ab0f009c3d55435dc455b804381552d5720b77695c SHA512 646ad27a20843606d390e1050bb2e374ffdd9ff74c3881564580cc09774743e8041ef4864b0b80366315ff7c84ea30f100e47b14bca35ed328590ff4fe498812
 EBUILD mk-1.12.5.ebuild 375 BLAKE2B 90af150f66eaf495a195d9496b85c5d7032e63dea49a8e3a4a50093ec28dc0b9ee34d325b1271767c00ec2ab0f009c3d55435dc455b804381552d5720b77695c SHA512 646ad27a20843606d390e1050bb2e374ffdd9ff74c3881564580cc09774743e8041ef4864b0b80366315ff7c84ea30f100e47b14bca35ed328590ff4fe498812
 EBUILD mk-1.13.1.ebuild 375 BLAKE2B 90af150f66eaf495a195d9496b85c5d7032e63dea49a8e3a4a50093ec28dc0b9ee34d325b1271767c00ec2ab0f009c3d55435dc455b804381552d5720b77695c SHA512 646ad27a20843606d390e1050bb2e374ffdd9ff74c3881564580cc09774743e8041ef4864b0b80366315ff7c84ea30f100e47b14bca35ed328590ff4fe498812
@@ -20,5 +21,6 @@ EBUILD mk-1.14.0.ebuild 375 BLAKE2B d8b4bb6bc10990275b7f4b55d61942666605be22da31
 EBUILD mk-1.14.1.ebuild 375 BLAKE2B d8b4bb6bc10990275b7f4b55d61942666605be22da31662bc4180af8ac3754686edfff45c5cc1a4c9da766a40589d5da1044dc900af3e59afe2c6cd698b7e72a SHA512 60fb53a958d5fb9816b68ac15255469f0a5c57ad7d0e13a0c8e49effa66718ec399e125b74b147b9122cc645399e512b5bd09020b74469b8e0cb2da35203fe5e
 EBUILD mk-1.14.2.ebuild 375 BLAKE2B d8b4bb6bc10990275b7f4b55d61942666605be22da31662bc4180af8ac3754686edfff45c5cc1a4c9da766a40589d5da1044dc900af3e59afe2c6cd698b7e72a SHA512 60fb53a958d5fb9816b68ac15255469f0a5c57ad7d0e13a0c8e49effa66718ec399e125b74b147b9122cc645399e512b5bd09020b74469b8e0cb2da35203fe5e
 EBUILD mk-1.14.3.ebuild 375 BLAKE2B dc9107f8b68fd4c40998b1e25d4d2efb3645a8263dea46f047b2cfb970d811cd5289212a61dbb3d00112f750644b6d6bea7179666807b7a9d2477fc8af9dfc6c SHA512 699f235d01cdc1168d163bf885feba22845f1db03d34a194ea58ff4cb3f3dd414ce3b4111fd672a00d8dc3f0e4fd74ff8e2c572085dbcccddee2e24a344dc539
+EBUILD mk-1.14.4.ebuild 375 BLAKE2B dc9107f8b68fd4c40998b1e25d4d2efb3645a8263dea46f047b2cfb970d811cd5289212a61dbb3d00112f750644b6d6bea7179666807b7a9d2477fc8af9dfc6c SHA512 699f235d01cdc1168d163bf885feba22845f1db03d34a194ea58ff4cb3f3dd414ce3b4111fd672a00d8dc3f0e4fd74ff8e2c572085dbcccddee2e24a344dc539
 EBUILD mk-9999.ebuild 375 BLAKE2B 90af150f66eaf495a195d9496b85c5d7032e63dea49a8e3a4a50093ec28dc0b9ee34d325b1271767c00ec2ab0f009c3d55435dc455b804381552d5720b77695c SHA512 646ad27a20843606d390e1050bb2e374ffdd9ff74c3881564580cc09774743e8041ef4864b0b80366315ff7c84ea30f100e47b14bca35ed328590ff4fe498812
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/mk/mk-1.14.4.ebuild b/dev-ros/mk/mk-1.14.4.ebuild
new file mode 100644
index 000000000000..158d271ee738
--- /dev/null
+++ b/dev-ros/mk/mk-1.14.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A collection of .mk include files for building ROS architectural elements"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pcl_conversions/Manifest b/dev-ros/pcl_conversions/Manifest
index 47fe9042b22c..3693d4cfc585 100644
--- a/dev-ros/pcl_conversions/Manifest
+++ b/dev-ros/pcl_conversions/Manifest
@@ -1,4 +1,6 @@
 DIST pcl_conversions-0.2.1.tar.gz 8450 BLAKE2B a77cf70f751c7d80bcdee1214554aecaf1cd3518266fed75f730c865f3ccff9ba2cb502861084c9792df4850fe411e6606c94afb2bdc490cad396be0b319763e SHA512 a9d8a2b45463d67d858ee9b62f0e895f808c79b3bac3d2833c6ba02bd36bdeec0d4697897446c9e2968559667e1d9c5f93df6b583f13fd3b26220d3cd0a71632
+DIST perception_pcl-1.6.1.tar.gz 82552 BLAKE2B a442c9df193e38b6aca9e45ec3a469d6603bc2c909fc8c33ad612b2b6448956863555608cb0a0102593e2e71aa7f54ae88b677c2bfbde7df23b114ff4ca83c8f SHA512 c0b63833dd12f3eee5f5ec1e5d8f8bd9c001f1f1787572717a0845fa9a18862bb49a134638f9f0bde5587ac26ab8fd9e6534fcd5ed6b69842780a6fd3762fb5c
 EBUILD pcl_conversions-0.2.1-r1.ebuild 589 BLAKE2B 06ad0c702cadce3d0bcffcfd896fee9ca843ec12eea2cfd9337e54e7dfdae021de3f19fec58ecf05d3c9b9a1240454f2998c457507be6509998e44e165930c8f SHA512 4a0a6a9e6a4d6fdfe2770476ef76ca9909a664db35d7cac1d3aa7bbddb27d1a2e03c33ae92ad1fe47ba23844469bef88e755048ce1913fcbc67f2dcfbab5da99
-EBUILD pcl_conversions-9999.ebuild 589 BLAKE2B 06ad0c702cadce3d0bcffcfd896fee9ca843ec12eea2cfd9337e54e7dfdae021de3f19fec58ecf05d3c9b9a1240454f2998c457507be6509998e44e165930c8f SHA512 4a0a6a9e6a4d6fdfe2770476ef76ca9909a664db35d7cac1d3aa7bbddb27d1a2e03c33ae92ad1fe47ba23844469bef88e755048ce1913fcbc67f2dcfbab5da99
-MISC metadata.xml 344 BLAKE2B 17c762b64cf4e84bb2d7197f1d30aab79ff8a14a5e0544e2739515f8476740fc884028abbbf40252126ec3fb47f6bff584d0d88266bba28539a1032d6a7156a3 SHA512 9d9aef6a0d53184989c479014ff645c3641e3b37993e03cb7dc4e2b8ab114373e81d1dbe103b06af1b4ce761909bba64427cc7179dbb0564bc072911f97ad242
+EBUILD pcl_conversions-1.6.1.ebuild 605 BLAKE2B 874aa3d03575a1d1496cf8d2ae4b66e23c9ce5c419cac0fe73e1514e39adc460bf81d331331f290d5b3a9caaae31fd505b080b5be4d94814b4057fc5797c129c SHA512 57f71a5744712cbeecb98dc3b55cec7731d5f516c9db9596b48757948d28c37bd43db769921e7217f48453c61df5ebd60c0479e7f49bf1fc2fb714daff9ecd70
+EBUILD pcl_conversions-9999.ebuild 605 BLAKE2B 874aa3d03575a1d1496cf8d2ae4b66e23c9ce5c419cac0fe73e1514e39adc460bf81d331331f290d5b3a9caaae31fd505b080b5be4d94814b4057fc5797c129c SHA512 57f71a5744712cbeecb98dc3b55cec7731d5f516c9db9596b48757948d28c37bd43db769921e7217f48453c61df5ebd60c0479e7f49bf1fc2fb714daff9ecd70
+MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_conversions/metadata.xml b/dev-ros/pcl_conversions/metadata.xml
index 26d50905169a..ac11a600be35 100644
--- a/dev-ros/pcl_conversions/metadata.xml
+++ b/dev-ros/pcl_conversions/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros-perception/pcl_conversions</remote-id>
+		<remote-id type="github">ros-perception/perception_pcl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.6.1.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.6.1.ebuild
new file mode 100644
index 000000000000..79f1ab5d1922
--- /dev/null
+++ b/dev-ros/pcl_conversions/pcl_conversions-1.6.1.ebuild
@@ -0,0 +1,25 @@
+# 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-perception/perception_pcl"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Provides conversions from PCL data types and ROS message types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	sci-libs/pcl:=
+	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild b/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
index 5a66b310e0f5..79f1ab5d1922 100644
--- a/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
+++ b/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/pcl_conversions"
+ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
+ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
 
 inherit ros-catkin
diff --git a/dev-ros/pcl_ros/Manifest b/dev-ros/pcl_ros/Manifest
index 981f5f778cd7..f00c8a805919 100644
--- a/dev-ros/pcl_ros/Manifest
+++ b/dev-ros/pcl_ros/Manifest
@@ -1,6 +1,6 @@
-DIST perception_pcl-1.5.3.tar.gz 67101 BLAKE2B 963d65d348068e574fd0d7431597409d607e779f017b3a645b1add5599baeed559898e5a9873d6b3ead6ea812cfda80b96f9ccfea482801b3c76d17bf234c26b SHA512 e34089f48cfe40f0209a7d4a3a0fb2402c1d1fc35bdf7a57970374bcec50185efcbb1e56b08ee64810a43e83fdf7e45ecddd09ff9660b47399b9f751be80df8b
 DIST perception_pcl-1.5.4.tar.gz 73829 BLAKE2B cfc6e964691da42717d134e0b639ef4af4491074de171a84d081bf66c061a51b7c2da750ff539dd784a7a4c34cfdfe18d7d2e38c4e6d0370fbc441f9b3a6196d SHA512 e9da9b2f9b602b67bceec9b0adf515b500d77c9e5c2dbdc1f63bf5a91419bbf7f9f41d602646b8197dffcf7a077b63eb402a507dbc6bb96405a8f4d64576e36e
-EBUILD pcl_ros-1.5.3-r1.ebuild 921 BLAKE2B a238df0cf240f8d76b61730f8212caee5388e1a66f75a725955db47a7a516a93762ed7a93d15ad90e1f3b8245c460c66de57766b2f542d9dbe371086f21521ea SHA512 0edd4bee0a0f7dceb5daf4e90e644b0dee09d0d902a62f863b04607e06fd02dbe03e5299cdae4352e7335409c5377706daebc63e101cfd80e3b0f7d0cb17d163
+DIST perception_pcl-1.6.1.tar.gz 82552 BLAKE2B a442c9df193e38b6aca9e45ec3a469d6603bc2c909fc8c33ad612b2b6448956863555608cb0a0102593e2e71aa7f54ae88b677c2bfbde7df23b114ff4ca83c8f SHA512 c0b63833dd12f3eee5f5ec1e5d8f8bd9c001f1f1787572717a0845fa9a18862bb49a134638f9f0bde5587ac26ab8fd9e6534fcd5ed6b69842780a6fd3762fb5c
 EBUILD pcl_ros-1.5.4.ebuild 921 BLAKE2B 7dcd0c3e58fe62dfecac6163907a1034a8a1e3e61660012be8b68ce12ab2177d198f8f737cd73a6b28caf8f6d7c6e0818b8b70d0e0c407e64165358b5027efcf SHA512 ba2210fc75a197d53ac011edae3a5e76e103111bfa1e096498112361797e5d0f3d493fefa9c41fc56c2c317eba3b2896f095212c72d7fa92e5b76f27869b3fe1
-EBUILD pcl_ros-9999.ebuild 921 BLAKE2B a238df0cf240f8d76b61730f8212caee5388e1a66f75a725955db47a7a516a93762ed7a93d15ad90e1f3b8245c460c66de57766b2f542d9dbe371086f21521ea SHA512 0edd4bee0a0f7dceb5daf4e90e644b0dee09d0d902a62f863b04607e06fd02dbe03e5299cdae4352e7335409c5377706daebc63e101cfd80e3b0f7d0cb17d163
+EBUILD pcl_ros-1.6.1.ebuild 946 BLAKE2B eda6616fbb42b4ec8684500b87d22ec2476a44d4ef515739a2e42cc9eb14495e6ff445d29fbab51e37dde7538a465fca37c99fa3ecbb7bc7aa240bae8a94c230 SHA512 94f287f1ffa36e7c44801eb48469501649b864eef1960a8d0548d0a8e219e488ced3077a3a13ab730488601c35a926702c77433a1d6c3b52ed9e0f8fe036d3a6
+EBUILD pcl_ros-9999.ebuild 946 BLAKE2B eda6616fbb42b4ec8684500b87d22ec2476a44d4ef515739a2e42cc9eb14495e6ff445d29fbab51e37dde7538a465fca37c99fa3ecbb7bc7aa240bae8a94c230 SHA512 94f287f1ffa36e7c44801eb48469501649b864eef1960a8d0548d0a8e219e488ced3077a3a13ab730488601c35a926702c77433a1d6c3b52ed9e0f8fe036d3a6
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_ros/pcl_ros-1.5.3-r1.ebuild b/dev-ros/pcl_ros/pcl_ros-1.5.3-r1.ebuild
deleted file mode 100644
index 2fe67cbeecba..000000000000
--- a/dev-ros/pcl_ros/pcl_ros-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosbag
-	dev-ros/rosconsole
-	dev-ros/roslib
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	>=dev-cpp/eigen-3.2.5:3
-	dev-ros/pluginlib
-	dev-libs/console_bridge:=
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/tf2_eigen
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	sci-libs/pcl:=[qhull]
-	>=dev-ros/pcl_conversions-0.2.1-r1
-	dev-libs/boost:=[threads]
-	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pcl_ros/pcl_ros-1.6.1.ebuild b/dev-ros/pcl_ros/pcl_ros-1.6.1.ebuild
new file mode 100644
index 000000000000..8a6af2083788
--- /dev/null
+++ b/dev-ros/pcl_ros/pcl_ros-1.6.1.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/ros-perception/perception_pcl"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rosbag
+	dev-ros/rosconsole
+	dev-ros/roslib
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/message_filters
+	>=dev-cpp/eigen-3.2.5:3
+	dev-ros/pluginlib
+	dev-libs/console_bridge:=
+	dev-ros/tf
+	dev-ros/tf2
+	dev-ros/tf2_ros
+	dev-ros/tf2_eigen
+	dev-ros/nodelet
+	dev-ros/nodelet_topic_tools
+	sci-libs/pcl:=[qhull]
+	>=dev-ros/pcl_conversions-0.2.1-r1
+	dev-libs/boost:=[threads]
+	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pcl_ros/pcl_ros-9999.ebuild b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
index 2fe67cbeecba..8a6af2083788 100644
--- a/dev-ros/pcl_ros/pcl_ros-9999.ebuild
+++ b/dev-ros/pcl_ros/pcl_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
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-ros/rosconsole
 	dev-ros/roslib
 	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/message_filters
 	>=dev-cpp/eigen-3.2.5:3
 	dev-ros/pluginlib
 	dev-libs/console_bridge:=
diff --git a/dev-ros/rosbash/Manifest b/dev-ros/rosbash/Manifest
index 47c4ce0750d6..461261c6c7db 100644
--- a/dev-ros/rosbash/Manifest
+++ b/dev-ros/rosbash/Manifest
@@ -3,9 +3,11 @@ DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee554725450
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
 DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
+DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
 EBUILD rosbash-1.14.0.ebuild 397 BLAKE2B 697a26c052654752492451f3dcf43ab749ce7465a780abec59a9ca6b3a292ac3ac5b63a823872438051d1e735df30457b978420138f6343927f081cee4e14328 SHA512 88620b4194b8f9f28abd459d601c7af6538b532143a04b8f5ba4d455800f79426138316c3b110527e71c369d24dfa6c5781290e3359f2a581ff9022376bf8c0d
 EBUILD rosbash-1.14.1.ebuild 397 BLAKE2B 697a26c052654752492451f3dcf43ab749ce7465a780abec59a9ca6b3a292ac3ac5b63a823872438051d1e735df30457b978420138f6343927f081cee4e14328 SHA512 88620b4194b8f9f28abd459d601c7af6538b532143a04b8f5ba4d455800f79426138316c3b110527e71c369d24dfa6c5781290e3359f2a581ff9022376bf8c0d
 EBUILD rosbash-1.14.2.ebuild 397 BLAKE2B 697a26c052654752492451f3dcf43ab749ce7465a780abec59a9ca6b3a292ac3ac5b63a823872438051d1e735df30457b978420138f6343927f081cee4e14328 SHA512 88620b4194b8f9f28abd459d601c7af6538b532143a04b8f5ba4d455800f79426138316c3b110527e71c369d24dfa6c5781290e3359f2a581ff9022376bf8c0d
 EBUILD rosbash-1.14.3.ebuild 397 BLAKE2B af829f04684903bcd7f53ad019615f0a8357c63e6fca7949322cf945f4bd27352f631488539239a9c7625e6d9fda2df49e17d51c02ef31ea2309851b75d22b4b SHA512 b075932a3f05df7fb8bd3995eb826d4be5ffed44070b321fcd8749ff4433cd3813b563c7bce9e92611cf2c2a2b76caa1bde98d90f26fc0b6450fe072cd20c51d
+EBUILD rosbash-1.14.4.ebuild 397 BLAKE2B af829f04684903bcd7f53ad019615f0a8357c63e6fca7949322cf945f4bd27352f631488539239a9c7625e6d9fda2df49e17d51c02ef31ea2309851b75d22b4b SHA512 b075932a3f05df7fb8bd3995eb826d4be5ffed44070b321fcd8749ff4433cd3813b563c7bce9e92611cf2c2a2b76caa1bde98d90f26fc0b6450fe072cd20c51d
 EBUILD rosbash-9999.ebuild 397 BLAKE2B efc58a8a7f774d0c4c149f7d742532a12d1c20d919657c18c15e5113b9c78cfff54ff1ef248ac18136fe17c4ac867ab017a57c112e984cbded05e79131f580f4 SHA512 2cd1be7424bd28eea9ab74a9af96036be9c401e45d2ed33c9fad290694ceafc5ecb4245de700eacf0c5799324d92df08f7da2978c38e1409b0e7e01fccb01879
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbash/rosbash-1.14.4.ebuild b/dev-ros/rosbash/rosbash-1.14.4.ebuild
new file mode 100644
index 000000000000..bef22c0c8f54
--- /dev/null
+++ b/dev-ros/rosbash/rosbash-1.14.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Assorted shell commands for using ros with bash"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/rosboost_cfg/Manifest b/dev-ros/rosboost_cfg/Manifest
index 613e1c7ee168..592de50f0d60 100644
--- a/dev-ros/rosboost_cfg/Manifest
+++ b/dev-ros/rosboost_cfg/Manifest
@@ -2,9 +2,11 @@ DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee554725450
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
 DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
+DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
 EBUILD rosboost_cfg-1.14.0.ebuild 404 BLAKE2B 48203ef89441ae30f36386de138e4dd270570723c7859db065728b93323adb44270488e6471f29f99f7a62bcb3ce93c152149c10a75c0d2fad45d455f36f5eff SHA512 ada58b94da4ab79e27617f452697b2bf237c993eea09ac79ab6f16b59abfe1e0fb2656d8c3a65638f1d01e494900e1e4a5b9f178745655ed4ee75739f0c6fcee
 EBUILD rosboost_cfg-1.14.1.ebuild 404 BLAKE2B 48203ef89441ae30f36386de138e4dd270570723c7859db065728b93323adb44270488e6471f29f99f7a62bcb3ce93c152149c10a75c0d2fad45d455f36f5eff SHA512 ada58b94da4ab79e27617f452697b2bf237c993eea09ac79ab6f16b59abfe1e0fb2656d8c3a65638f1d01e494900e1e4a5b9f178745655ed4ee75739f0c6fcee
 EBUILD rosboost_cfg-1.14.2.ebuild 404 BLAKE2B 48203ef89441ae30f36386de138e4dd270570723c7859db065728b93323adb44270488e6471f29f99f7a62bcb3ce93c152149c10a75c0d2fad45d455f36f5eff SHA512 ada58b94da4ab79e27617f452697b2bf237c993eea09ac79ab6f16b59abfe1e0fb2656d8c3a65638f1d01e494900e1e4a5b9f178745655ed4ee75739f0c6fcee
 EBUILD rosboost_cfg-1.14.3.ebuild 404 BLAKE2B 54c18c5b9e3cdfebc7c5a97a4f792098c45b41ca466987214918527a211a9b054fc1dfb41a09eb1b74dad3451c89b4233fff5f50567d22229b8c55d2b6d6d23c SHA512 d9cb5768cce8e96a5117dae239c4c983eb954737be4123d01edb874b052686c0027c1306727e3f646ded4179b04be88b81933e78c11bb68b6758826628dd5257
+EBUILD rosboost_cfg-1.14.4.ebuild 404 BLAKE2B 54c18c5b9e3cdfebc7c5a97a4f792098c45b41ca466987214918527a211a9b054fc1dfb41a09eb1b74dad3451c89b4233fff5f50567d22229b8c55d2b6d6d23c SHA512 d9cb5768cce8e96a5117dae239c4c983eb954737be4123d01edb874b052686c0027c1306727e3f646ded4179b04be88b81933e78c11bb68b6758826628dd5257
 EBUILD rosboost_cfg-9999.ebuild 404 BLAKE2B 48203ef89441ae30f36386de138e4dd270570723c7859db065728b93323adb44270488e6471f29f99f7a62bcb3ce93c152149c10a75c0d2fad45d455f36f5eff SHA512 ada58b94da4ab79e27617f452697b2bf237c993eea09ac79ab6f16b59abfe1e0fb2656d8c3a65638f1d01e494900e1e4a5b9f178745655ed4ee75739f0c6fcee
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.14.4.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.4.ebuild
new file mode 100644
index 000000000000..642c0a9d2fd8
--- /dev/null
+++ b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbuild/Manifest b/dev-ros/rosbuild/Manifest
index 657c67c354bc..e8ff18f81c04 100644
--- a/dev-ros/rosbuild/Manifest
+++ b/dev-ros/rosbuild/Manifest
@@ -1,6 +1,8 @@
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
 DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
+DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
 EBUILD rosbuild-1.14.2.ebuild 359 BLAKE2B 5480063e327e04bf680869425ce3f41aca4d046a85b6da58e95af25ce09f6a4d20728bfb8306168036e9f6029e0d5bfbbbb631726fece9356ccb11ef5315d7a4 SHA512 c32f230cb997b196c479113619ef447f2dca26eeccc3f3aad5819641f29adddb3c2a7e6b694fd3f1d91987d401bbfe4b736612dfa767251c7cbd3d117c32c1d7
 EBUILD rosbuild-1.14.3.ebuild 359 BLAKE2B 4f06a27d7541789e90b44bdb141bdce321cfa175907435f495b468a131b6bf9fbb12760023c06f2f205a740a26c2f7508e1010c340db44849c342f6575bb5963 SHA512 a81fcf9c6ff5c4255eff7bc0d0a666e479282663477cfc43d6c74bdd8e61108ca05e5fec77511bb70e83c75841ec74b1aa16c850023f81637bcd7528ddcff5c9
+EBUILD rosbuild-1.14.4.ebuild 359 BLAKE2B 4f06a27d7541789e90b44bdb141bdce321cfa175907435f495b468a131b6bf9fbb12760023c06f2f205a740a26c2f7508e1010c340db44849c342f6575bb5963 SHA512 a81fcf9c6ff5c4255eff7bc0d0a666e479282663477cfc43d6c74bdd8e61108ca05e5fec77511bb70e83c75841ec74b1aa16c850023f81637bcd7528ddcff5c9
 EBUILD rosbuild-9999.ebuild 359 BLAKE2B ad9f9b2884bab7f030013e68e212acf2c4f01a3e7029a9b3970888c7217a286b3801e51b0e07da0a941c67b1faebc754d0740d398f44364b4edced5baa36dcd8 SHA512 9141477396ef5d7dc006c1b6eba58c127a936623c52d4e2ef0da9b47751c56cb2b8eee7f72c255662b98fcec73f32f0c55a0eb8621cee8ef8b22a0d779835611
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbuild/rosbuild-1.14.4.ebuild b/dev-ros/rosbuild/rosbuild-1.14.4.ebuild
new file mode 100644
index 000000000000..a445e3892ca0
--- /dev/null
+++ b/dev-ros/rosbuild/rosbuild-1.14.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Scripts for managing the CMake-based build system for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosclean/Manifest b/dev-ros/rosclean/Manifest
index a53822d4b319..f45ae40df0c1 100644
--- a/dev-ros/rosclean/Manifest
+++ b/dev-ros/rosclean/Manifest
@@ -3,9 +3,11 @@ DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee554725450
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
 DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
+DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
 EBUILD rosclean-1.14.0.ebuild 515 BLAKE2B ab604ad9028bbce5661c52a5dba7c94344a260f874f64ed0829817a8a1e7d64155192741830d454fce4881576f0ded267c26135b8f08b02d9dc8ad546ca2a854 SHA512 ad634d8296e5bd2c7e561d8d348b88bdc6f0feff15a194165b543f32bc27aaebfe31a861f45dc7455c5ca2f83d324548fe728b8bbc3590988384835911e3e6d2
 EBUILD rosclean-1.14.1.ebuild 515 BLAKE2B ab604ad9028bbce5661c52a5dba7c94344a260f874f64ed0829817a8a1e7d64155192741830d454fce4881576f0ded267c26135b8f08b02d9dc8ad546ca2a854 SHA512 ad634d8296e5bd2c7e561d8d348b88bdc6f0feff15a194165b543f32bc27aaebfe31a861f45dc7455c5ca2f83d324548fe728b8bbc3590988384835911e3e6d2
 EBUILD rosclean-1.14.2.ebuild 515 BLAKE2B ab604ad9028bbce5661c52a5dba7c94344a260f874f64ed0829817a8a1e7d64155192741830d454fce4881576f0ded267c26135b8f08b02d9dc8ad546ca2a854 SHA512 ad634d8296e5bd2c7e561d8d348b88bdc6f0feff15a194165b543f32bc27aaebfe31a861f45dc7455c5ca2f83d324548fe728b8bbc3590988384835911e3e6d2
 EBUILD rosclean-1.14.3.ebuild 515 BLAKE2B fa83467fd09d0332cc684e7bee60e331dbb2ff4baafbe7e10d4f629485dbde5a5ebea9c23151568a339920e45253c44eb3f33b25bfeb724615074b70b4d5a675 SHA512 6b82d82b58bac9d1f7f575410f6ab3026297c13f55f36f0037d96ab07a39ccdfdd19f9b1803a356f2422c06bda5e6575028ed06d8e2ba295c7ded8c261148223
+EBUILD rosclean-1.14.4.ebuild 515 BLAKE2B fa83467fd09d0332cc684e7bee60e331dbb2ff4baafbe7e10d4f629485dbde5a5ebea9c23151568a339920e45253c44eb3f33b25bfeb724615074b70b4d5a675 SHA512 6b82d82b58bac9d1f7f575410f6ab3026297c13f55f36f0037d96ab07a39ccdfdd19f9b1803a356f2422c06bda5e6575028ed06d8e2ba295c7ded8c261148223
 EBUILD rosclean-9999.ebuild 515 BLAKE2B ab604ad9028bbce5661c52a5dba7c94344a260f874f64ed0829817a8a1e7d64155192741830d454fce4881576f0ded267c26135b8f08b02d9dc8ad546ca2a854 SHA512 ad634d8296e5bd2c7e561d8d348b88bdc6f0feff15a194165b543f32bc27aaebfe31a861f45dc7455c5ca2f83d324548fe728b8bbc3590988384835911e3e6d2
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosclean/rosclean-1.14.4.ebuild b/dev-ros/rosclean/rosclean-1.14.4.ebuild
new file mode 100644
index 000000000000..21f38f6fae9a
--- /dev/null
+++ b/dev-ros/rosclean/rosclean-1.14.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=( "${FILESDIR}/bb.patch" )
diff --git a/dev-ros/roscpp_serialization/Manifest b/dev-ros/roscpp_serialization/Manifest
index 85cfc620876e..2b7fe3fb0f62 100644
--- a/dev-ros/roscpp_serialization/Manifest
+++ b/dev-ros/roscpp_serialization/Manifest
@@ -2,6 +2,7 @@ DIST roscpp_core-0.5.6.tar.gz 31734 BLAKE2B b72e8f7ed04cac701e867cdc9c88ec4435cd
 DIST roscpp_core-0.5.7.tar.gz 32006 BLAKE2B d63c6bcf314de4237ed8c08b5af7a1a097b9d5af76b0644124419bb516f08f8c9030e509b9a4dfbd80fd2f1fff35b58e0452293339b0081c4d1cef590e5c05f3 SHA512 a3a40b2e05e1ad9d442050fd5a5b8a2106a27aef5222eaa9ac1b0c8aff13d1a40da252e81f0544b72380db35594c1d49de06cd3e94b9ba5ed087d71362f3babe
 DIST roscpp_core-0.6.0.tar.gz 32255 BLAKE2B d184d3d3c05a041c1c027877a314f5bd98515ee02d607cf3575ca939e7ec7d87807bf2ee96717cc5b23971ce297d3bdeb6f78c5883dbb6350ae01ba23ae8246e SHA512 3adee84e3fc8f3b66ac3093f0bac82a6fec92e1096c4f2c0c5dd001b0e599d895c71fe62aa19a53d7b097e2eebfceb111262991d46ac9013fff9d2d92ebeec75
 DIST roscpp_core-0.6.1.tar.gz 32611 BLAKE2B 387e17dfdc87af8880ee7b17c99e43558023a0241422e463dd8fc12f697604e655f01dfe5ea0142b819aa638903fb94adaec985a0c7c2feb79db886a2b97db18 SHA512 167d3b7bfa048a2c3f7b4239402c9077e1871aa2cc5f60ebab3e5ad3cb5acd94667b4e7de9eb2af2f8dfba74e0d82510f6bb591f7096d99e465f987643b2681a
+DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
 DIST roscpp_core-0.6.2.tar.gz 32730 BLAKE2B db7bbdf9252a821fe65e20cc81f01b5b55aff5bc2729664a150a6213636190201d059a0dfd25a0d523bb1fd1d6655d69b6cf7deb88845edafcd176c593d10fa2 SHA512 34e5442648fed7cebf694480d40825d4e5b1791409741b0a13aad7daa0d7f5190d6509d73780ba4e02620f789f9b0c7474b97772abba1dbea3bee98fe8d1ae59
 DIST roscpp_core-0.6.3.tar.gz 33419 BLAKE2B b2b44b6f696f200aab52f267ba4defb5ae54db7af61eed7c69046da2fdf6d68c5713f2b0ca9e4e4e36634597ecb2e501b29d7b96d825713be9533401940d9862 SHA512 2e512d26c29ffc3d7d4431f6153d273ddf26334390c972c9a95bca97536102e1a03ae82369d4804de31854df7ad471eb60c5a97c47465611c76562c083ce7c7d
 DIST roscpp_core-0.6.4.tar.gz 33661 BLAKE2B 5f38662f221f8a02c90cf8c739b5f9ecf5d83c82c9991d583fcaa7e49d3679c2f9eaa6efb1a8b1b5b44718ac80bde66a7931fb6e616394e0e33c5674ac710de4 SHA512 134d3bc1a928416e6fa6afdbcedb83fa546a47d2ead407d5c6e82275d4b3a21a228813d84bb17a23b071d6cd88dc4f53f670e9f1971e28049b97b56167c93217
@@ -13,6 +14,7 @@ EBUILD roscpp_serialization-0.5.6.ebuild 387 BLAKE2B f317b3ea7afe3d1fae0ce968ee9
 EBUILD roscpp_serialization-0.5.7.ebuild 387 BLAKE2B f317b3ea7afe3d1fae0ce968ee9dd5096827a7cffb2ad977b6f27a07c14d9fb8f87bdf8f763cd726df89b9260398598ff26b0dc0ed680cc319337111465374f3 SHA512 df6d50183e072652d2c3c513bbc3d031289cbcc6391d30ea2ff348c419b507d7b4691cee60ffe5198ece313bc8eaae6351d164288740149c9260c8d51be1f5f9
 EBUILD roscpp_serialization-0.6.0.ebuild 387 BLAKE2B f317b3ea7afe3d1fae0ce968ee9dd5096827a7cffb2ad977b6f27a07c14d9fb8f87bdf8f763cd726df89b9260398598ff26b0dc0ed680cc319337111465374f3 SHA512 df6d50183e072652d2c3c513bbc3d031289cbcc6391d30ea2ff348c419b507d7b4691cee60ffe5198ece313bc8eaae6351d164288740149c9260c8d51be1f5f9
 EBUILD roscpp_serialization-0.6.1.ebuild 387 BLAKE2B fc484443ee236c2ab64633cb079387d72ee2f2d4f10a7b6cbfbdcb22b2934f8d3858e45090b393a2081b5c710a43b65026f62f6e11043ae98e8d4acd49ddaa29 SHA512 60b7fd5834da14aa8ee575fc134753d3feda9c91599634474b7e233b7dfd8fa5f5cf4c26de93dbc3d873e2413dfaf1f5135f8291a6c496658c3a79427a584fc3
+EBUILD roscpp_serialization-0.6.10.ebuild 387 BLAKE2B 8c6cce04919a8a1ff197d4518b83da92e5a4e8b72fec4288bae1a0e5a79a26200d5baef7d2f7b33585f453e1082b338c37881601d497134a881139ca4bc3ed5b SHA512 6c11b64d7abcde3b95ae30401a44f183775cedddf083bc50a78dbc2f41e14738315a9b7190fa1f7873f2208eb8227a3a7603235f9c093576cfdd1cc3c2a84b5e
 EBUILD roscpp_serialization-0.6.2.ebuild 387 BLAKE2B fb36a18f1f6481c5a1793e7bd0d3f149794a497169f12a02ccb2fe7816c5fd9b03c780a719214b56822e90c34fe3ae46f9cb875d37cc124eadb536f9c4374e04 SHA512 09647fe204192af1a48512bf57b5cc2d2b02c03d15badf41a7595bcbd8fed32e3d22b227dcd2b4a748cc54e664f3139666fed0c8130d1a4aaf09f53c9cc0502f
 EBUILD roscpp_serialization-0.6.3.ebuild 387 BLAKE2B fb36a18f1f6481c5a1793e7bd0d3f149794a497169f12a02ccb2fe7816c5fd9b03c780a719214b56822e90c34fe3ae46f9cb875d37cc124eadb536f9c4374e04 SHA512 09647fe204192af1a48512bf57b5cc2d2b02c03d15badf41a7595bcbd8fed32e3d22b227dcd2b4a748cc54e664f3139666fed0c8130d1a4aaf09f53c9cc0502f
 EBUILD roscpp_serialization-0.6.4.ebuild 387 BLAKE2B fb36a18f1f6481c5a1793e7bd0d3f149794a497169f12a02ccb2fe7816c5fd9b03c780a719214b56822e90c34fe3ae46f9cb875d37cc124eadb536f9c4374e04 SHA512 09647fe204192af1a48512bf57b5cc2d2b02c03d15badf41a7595bcbd8fed32e3d22b227dcd2b4a748cc54e664f3139666fed0c8130d1a4aaf09f53c9cc0502f
diff --git a/dev-ros/roscpp_serialization/roscpp_serialization-0.6.10.ebuild b/dev-ros/roscpp_serialization/roscpp_serialization-0.6.10.ebuild
new file mode 100644
index 000000000000..85ab25009f61
--- /dev/null
+++ b/dev-ros/roscpp_serialization/roscpp_serialization-0.6.10.ebuild
@@ -0,0 +1,21 @@
+# 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/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Code for serialization"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+	dev-ros/roscpp_traits
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_traits/Manifest b/dev-ros/roscpp_traits/Manifest
index fc39b9c7645a..45889e34011e 100644
--- a/dev-ros/roscpp_traits/Manifest
+++ b/dev-ros/roscpp_traits/Manifest
@@ -2,6 +2,7 @@ DIST roscpp_core-0.5.6.tar.gz 31734 BLAKE2B b72e8f7ed04cac701e867cdc9c88ec4435cd
 DIST roscpp_core-0.5.7.tar.gz 32006 BLAKE2B d63c6bcf314de4237ed8c08b5af7a1a097b9d5af76b0644124419bb516f08f8c9030e509b9a4dfbd80fd2f1fff35b58e0452293339b0081c4d1cef590e5c05f3 SHA512 a3a40b2e05e1ad9d442050fd5a5b8a2106a27aef5222eaa9ac1b0c8aff13d1a40da252e81f0544b72380db35594c1d49de06cd3e94b9ba5ed087d71362f3babe
 DIST roscpp_core-0.6.0.tar.gz 32255 BLAKE2B d184d3d3c05a041c1c027877a314f5bd98515ee02d607cf3575ca939e7ec7d87807bf2ee96717cc5b23971ce297d3bdeb6f78c5883dbb6350ae01ba23ae8246e SHA512 3adee84e3fc8f3b66ac3093f0bac82a6fec92e1096c4f2c0c5dd001b0e599d895c71fe62aa19a53d7b097e2eebfceb111262991d46ac9013fff9d2d92ebeec75
 DIST roscpp_core-0.6.1.tar.gz 32611 BLAKE2B 387e17dfdc87af8880ee7b17c99e43558023a0241422e463dd8fc12f697604e655f01dfe5ea0142b819aa638903fb94adaec985a0c7c2feb79db886a2b97db18 SHA512 167d3b7bfa048a2c3f7b4239402c9077e1871aa2cc5f60ebab3e5ad3cb5acd94667b4e7de9eb2af2f8dfba74e0d82510f6bb591f7096d99e465f987643b2681a
+DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
 DIST roscpp_core-0.6.2.tar.gz 32730 BLAKE2B db7bbdf9252a821fe65e20cc81f01b5b55aff5bc2729664a150a6213636190201d059a0dfd25a0d523bb1fd1d6655d69b6cf7deb88845edafcd176c593d10fa2 SHA512 34e5442648fed7cebf694480d40825d4e5b1791409741b0a13aad7daa0d7f5190d6509d73780ba4e02620f789f9b0c7474b97772abba1dbea3bee98fe8d1ae59
 DIST roscpp_core-0.6.3.tar.gz 33419 BLAKE2B b2b44b6f696f200aab52f267ba4defb5ae54db7af61eed7c69046da2fdf6d68c5713f2b0ca9e4e4e36634597ecb2e501b29d7b96d825713be9533401940d9862 SHA512 2e512d26c29ffc3d7d4431f6153d273ddf26334390c972c9a95bca97536102e1a03ae82369d4804de31854df7ad471eb60c5a97c47465611c76562c083ce7c7d
 DIST roscpp_core-0.6.4.tar.gz 33661 BLAKE2B 5f38662f221f8a02c90cf8c739b5f9ecf5d83c82c9991d583fcaa7e49d3679c2f9eaa6efb1a8b1b5b44718ac80bde66a7931fb6e616394e0e33c5674ac710de4 SHA512 134d3bc1a928416e6fa6afdbcedb83fa546a47d2ead407d5c6e82275d4b3a21a228813d84bb17a23b071d6cd88dc4f53f670e9f1971e28049b97b56167c93217
@@ -13,6 +14,7 @@ EBUILD roscpp_traits-0.5.6.ebuild 361 BLAKE2B c79a9a0a824011375ee8d54208efed3e7a
 EBUILD roscpp_traits-0.5.7.ebuild 361 BLAKE2B c79a9a0a824011375ee8d54208efed3e7a9dbce0f1b174d54b0ec54a315c86b471f50f66e05ce57da989b097941a2fa75b20df1559f7843e33e7eb9f46cf076c SHA512 632de556bd758612be30a4bc95f359ce047a9efc04b3f6d582920f3823292ecdc7c419416e354331c605e160ee39378753475169f588544088f3724508b52e85
 EBUILD roscpp_traits-0.6.0.ebuild 361 BLAKE2B c79a9a0a824011375ee8d54208efed3e7a9dbce0f1b174d54b0ec54a315c86b471f50f66e05ce57da989b097941a2fa75b20df1559f7843e33e7eb9f46cf076c SHA512 632de556bd758612be30a4bc95f359ce047a9efc04b3f6d582920f3823292ecdc7c419416e354331c605e160ee39378753475169f588544088f3724508b52e85
 EBUILD roscpp_traits-0.6.1.ebuild 361 BLAKE2B b76fc1310778e384f2bd719b9319a97e24594c84d6c309ab86946024b3484394a1a2170dfd44ab6e113b54b7e36562045196665f1bd9a5e3106a903e739a9595 SHA512 fc9ed293ada85a69388adfefe444e9abda9d6f038922b81f033b86de891fffa34d9ab30ca50426bb3e68014e3791ce082df7254577db2479524c0e2c6c8fcddb
+EBUILD roscpp_traits-0.6.10.ebuild 361 BLAKE2B ce58e77baba6cee4e273a6c75ab9fadfeea8db41f7e34bcc9fa70592a37717b7e47bc22d35e0eebc75b454ae09e1af5444cb576538870c50ec6936187f21b725 SHA512 178cbe085ec3b665826ff0493518d8854a067b8d46663751db0746076ee3244ef74856d68da78736c2048df709281c952a130654aa5782a8652c77aad2f5b2f8
 EBUILD roscpp_traits-0.6.2.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
 EBUILD roscpp_traits-0.6.3.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
 EBUILD roscpp_traits-0.6.4.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
diff --git a/dev-ros/roscpp_traits/roscpp_traits-0.6.10.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.10.ebuild
new file mode 100644
index 000000000000..48ba1af0d0b9
--- /dev/null
+++ b/dev-ros/roscpp_traits/roscpp_traits-0.6.10.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/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Message traits code"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscreate/Manifest b/dev-ros/roscreate/Manifest
index 2a9cfc108e5f..b41e20e5420d 100644
--- a/dev-ros/roscreate/Manifest
+++ b/dev-ros/roscreate/Manifest
@@ -2,9 +2,11 @@ DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee554725450
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
 DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
+DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
 EBUILD roscreate-1.14.0.ebuild 519 BLAKE2B 3169feb3272913a9ae785fc5cabd1a851ca09b41aaf0b41342fe058d447ee0c0c51a52afded1bf13985e00724f70bb5b795ae1aaeca95c2d3419b6b1f9e291dd SHA512 69cf9bcdae88e96a1b81a3ebfd7e9946b9b850d408d473fb92d076d4c3c9e56495c003d43e1bb535aba1c0b54e4c016719ad06a0862e5435e971e9013c5dc80f
 EBUILD roscreate-1.14.1.ebuild 519 BLAKE2B 3169feb3272913a9ae785fc5cabd1a851ca09b41aaf0b41342fe058d447ee0c0c51a52afded1bf13985e00724f70bb5b795ae1aaeca95c2d3419b6b1f9e291dd SHA512 69cf9bcdae88e96a1b81a3ebfd7e9946b9b850d408d473fb92d076d4c3c9e56495c003d43e1bb535aba1c0b54e4c016719ad06a0862e5435e971e9013c5dc80f
 EBUILD roscreate-1.14.2.ebuild 519 BLAKE2B 3169feb3272913a9ae785fc5cabd1a851ca09b41aaf0b41342fe058d447ee0c0c51a52afded1bf13985e00724f70bb5b795ae1aaeca95c2d3419b6b1f9e291dd SHA512 69cf9bcdae88e96a1b81a3ebfd7e9946b9b850d408d473fb92d076d4c3c9e56495c003d43e1bb535aba1c0b54e4c016719ad06a0862e5435e971e9013c5dc80f
 EBUILD roscreate-1.14.3.ebuild 519 BLAKE2B f2b348ca21158c199e059a8aefd9dee671d137f5625d5c1245bd2e99ccb88b21634710aafff9e8b876200684203d4022e62dc25375a8fed2ca16059fdc9eacec SHA512 e85f6b7b10e2ec396f7291e7ef4b6b7dc3dde0b1dcc62b6374f36ed65895d57887116c74dfcf52288cee9115fc1cc1196deaa0925df102d8c4254f8b8b383435
+EBUILD roscreate-1.14.4.ebuild 519 BLAKE2B f2b348ca21158c199e059a8aefd9dee671d137f5625d5c1245bd2e99ccb88b21634710aafff9e8b876200684203d4022e62dc25375a8fed2ca16059fdc9eacec SHA512 e85f6b7b10e2ec396f7291e7ef4b6b7dc3dde0b1dcc62b6374f36ed65895d57887116c74dfcf52288cee9115fc1cc1196deaa0925df102d8c4254f8b8b383435
 EBUILD roscreate-9999.ebuild 519 BLAKE2B 3169feb3272913a9ae785fc5cabd1a851ca09b41aaf0b41342fe058d447ee0c0c51a52afded1bf13985e00724f70bb5b795ae1aaeca95c2d3419b6b1f9e291dd SHA512 69cf9bcdae88e96a1b81a3ebfd7e9946b9b850d408d473fb92d076d4c3c9e56495c003d43e1bb535aba1c0b54e4c016719ad06a0862e5435e971e9013c5dc80f
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roscreate/roscreate-1.14.4.ebuild b/dev-ros/roscreate/roscreate-1.14.4.ebuild
new file mode 100644
index 000000000000..d7d38bfca154
--- /dev/null
+++ b/dev-ros/roscreate/roscreate-1.14.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/rosdiagnostic/Manifest b/dev-ros/rosdiagnostic/Manifest
index 6fa8a67b5372..1285dd20a566 100644
--- a/dev-ros/rosdiagnostic/Manifest
+++ b/dev-ros/rosdiagnostic/Manifest
@@ -1,6 +1,8 @@
 DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
 DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
+DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
 EBUILD rosdiagnostic-1.9.0.ebuild 514 BLAKE2B b0b35dd21ca7d99d93ef25cfbab23305122969ff1f837be40c8fca352c9aec12010a9a6871c33c330565b8e3a7088f4fa260d59f711cef905ba9a4d6a593473c SHA512 222617bde6e33bb94f74747e5d2232e8dd6b50bff401d9d5a6d5b0f0a52b0b07311ee342320de6f8e109cbae143812b1dec11d85472f3a1601bc818db4bd4daf
 EBUILD rosdiagnostic-1.9.2.ebuild 514 BLAKE2B b0b35dd21ca7d99d93ef25cfbab23305122969ff1f837be40c8fca352c9aec12010a9a6871c33c330565b8e3a7088f4fa260d59f711cef905ba9a4d6a593473c SHA512 222617bde6e33bb94f74747e5d2232e8dd6b50bff401d9d5a6d5b0f0a52b0b07311ee342320de6f8e109cbae143812b1dec11d85472f3a1601bc818db4bd4daf
+EBUILD rosdiagnostic-1.9.3.ebuild 514 BLAKE2B e92f7bea28f6c1a038ce420f4d348cef6ce6e7aa58fea71986c0b3a91a4d33e06ae837da47df812c58f08954b667bec5bf3e08e4499e97222b5198441b234f9f SHA512 c39c84f9a59075295e781ee4827d761be3b25b1cfa506bde67b9f3d788ecb79fefdb18f04de4282b1f3d8ec222df76af9f4f5186b416b17eb2709cb6d34c73fc
 EBUILD rosdiagnostic-9999.ebuild 514 BLAKE2B b0b35dd21ca7d99d93ef25cfbab23305122969ff1f837be40c8fca352c9aec12010a9a6871c33c330565b8e3a7088f4fa260d59f711cef905ba9a4d6a593473c SHA512 222617bde6e33bb94f74747e5d2232e8dd6b50bff401d9d5a6d5b0f0a52b0b07311ee342320de6f8e109cbae143812b1dec11d85472f3a1601bc818db4bd4daf
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.3.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.3.ebuild
new file mode 100644
index 000000000000..f7437b193856
--- /dev/null
+++ b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.3.ebuild
@@ -0,0 +1,21 @@
+# 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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ros/roslang/Manifest b/dev-ros/roslang/Manifest
index 6c78e38d6e7e..9c1bfc0419f6 100644
--- a/dev-ros/roslang/Manifest
+++ b/dev-ros/roslang/Manifest
@@ -9,6 +9,7 @@ DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee554725450
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
 DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
+DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
 EBUILD roslang-1.12.3.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
 EBUILD roslang-1.12.5.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
 EBUILD roslang-1.13.1.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
@@ -20,5 +21,6 @@ EBUILD roslang-1.14.0.ebuild 345 BLAKE2B 63a12ae1cc4a7323b3518c105abbfca250c1eb0
 EBUILD roslang-1.14.1.ebuild 345 BLAKE2B 63a12ae1cc4a7323b3518c105abbfca250c1eb0d7b8b94d5424bbf7fa02c7b65941f936fa543f78860bb2a8ff657e66beb9e243edbd6ac32b937f34eb0fe6e12 SHA512 210db54ca3268a2a860dab6590bdbfb847289d1174683b96b3f94e3fb8957623fe19719c7106326f987173fbcb51a501740ee57e0f86db10e6112e4969aa5cc0
 EBUILD roslang-1.14.2.ebuild 345 BLAKE2B 63a12ae1cc4a7323b3518c105abbfca250c1eb0d7b8b94d5424bbf7fa02c7b65941f936fa543f78860bb2a8ff657e66beb9e243edbd6ac32b937f34eb0fe6e12 SHA512 210db54ca3268a2a860dab6590bdbfb847289d1174683b96b3f94e3fb8957623fe19719c7106326f987173fbcb51a501740ee57e0f86db10e6112e4969aa5cc0
 EBUILD roslang-1.14.3.ebuild 345 BLAKE2B abac9fc1ac751a5421d26bc2497de9c7156b80a77c03de6a08d07a7cabf66b6b93fcc76a1da6b9727868682d3f356742ad508dbf10abcb99b8fa73faa5157b44 SHA512 f38c714eb4eff24db349063fb01c53b141a59ada5911569404fc31923252929d5de33111d2e875853b994202537974d36d8d347d07ba93c6a7495daed44ed0c9
+EBUILD roslang-1.14.4.ebuild 345 BLAKE2B abac9fc1ac751a5421d26bc2497de9c7156b80a77c03de6a08d07a7cabf66b6b93fcc76a1da6b9727868682d3f356742ad508dbf10abcb99b8fa73faa5157b44 SHA512 f38c714eb4eff24db349063fb01c53b141a59ada5911569404fc31923252929d5de33111d2e875853b994202537974d36d8d347d07ba93c6a7495daed44ed0c9
 EBUILD roslang-9999.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslang/roslang-1.14.4.ebuild b/dev-ros/roslang/roslang-1.14.4.ebuild
new file mode 100644
index 000000000000..770e484fec52
--- /dev/null
+++ b/dev-ros/roslang/roslang-1.14.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common package for all ROS client libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslib/Manifest b/dev-ros/roslib/Manifest
index c5e64ac26ebe..cae8a1b5006c 100644
--- a/dev-ros/roslib/Manifest
+++ b/dev-ros/roslib/Manifest
@@ -3,9 +3,11 @@ DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee554725450
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
 DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
+DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
 EBUILD roslib-1.14.0-r1.ebuild 595 BLAKE2B b954effacf7a6d3dfbfffdc37a9b9f3a919a495bc40b976cba8b25f600ef03f46c2fdbdbc8af85faa6295f4d99c4e17852313fed77ed5b5df71366ee380de0bf SHA512 8b6e937898de79be077c51e95a0776cace5b7593afa0ef85f04a0312d85b2eb22763315abc643cdce637d01e9c227c0cc1aea2385e46263d099c0a2677a7eba3
 EBUILD roslib-1.14.1.ebuild 595 BLAKE2B b954effacf7a6d3dfbfffdc37a9b9f3a919a495bc40b976cba8b25f600ef03f46c2fdbdbc8af85faa6295f4d99c4e17852313fed77ed5b5df71366ee380de0bf SHA512 8b6e937898de79be077c51e95a0776cace5b7593afa0ef85f04a0312d85b2eb22763315abc643cdce637d01e9c227c0cc1aea2385e46263d099c0a2677a7eba3
 EBUILD roslib-1.14.2.ebuild 595 BLAKE2B b954effacf7a6d3dfbfffdc37a9b9f3a919a495bc40b976cba8b25f600ef03f46c2fdbdbc8af85faa6295f4d99c4e17852313fed77ed5b5df71366ee380de0bf SHA512 8b6e937898de79be077c51e95a0776cace5b7593afa0ef85f04a0312d85b2eb22763315abc643cdce637d01e9c227c0cc1aea2385e46263d099c0a2677a7eba3
 EBUILD roslib-1.14.3.ebuild 580 BLAKE2B b0ce75c1aa2465d9f25b98cc2b110a95155d1a2047d15b0359780f0f59a8e52c3a460af7eeeb171a09d2f0ee50f001ccc7fa4d0287ad2de876435545e906dba6 SHA512 5269bcbdcc950bf9a41f5374cb0796b1d085130cdf4129e53be68eceebf8a67611e6206a6585a52051b6de75a895eb09b0372034255cb2ff2c2d3268c0ad44f6
+EBUILD roslib-1.14.4.ebuild 580 BLAKE2B b0ce75c1aa2465d9f25b98cc2b110a95155d1a2047d15b0359780f0f59a8e52c3a460af7eeeb171a09d2f0ee50f001ccc7fa4d0287ad2de876435545e906dba6 SHA512 5269bcbdcc950bf9a41f5374cb0796b1d085130cdf4129e53be68eceebf8a67611e6206a6585a52051b6de75a895eb09b0372034255cb2ff2c2d3268c0ad44f6
 EBUILD roslib-9999.ebuild 580 BLAKE2B b0ce75c1aa2465d9f25b98cc2b110a95155d1a2047d15b0359780f0f59a8e52c3a460af7eeeb171a09d2f0ee50f001ccc7fa4d0287ad2de876435545e906dba6 SHA512 5269bcbdcc950bf9a41f5374cb0796b1d085130cdf4129e53be68eceebf8a67611e6206a6585a52051b6de75a895eb09b0372034255cb2ff2c2d3268c0ad44f6
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslib/roslib-1.14.4.ebuild b/dev-ros/roslib/roslib-1.14.4.ebuild
new file mode 100644
index 000000000000..f7f039b0555d
--- /dev/null
+++ b/dev-ros/roslib/roslib-1.14.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Base dependencies and support libraries for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
+	dev-libs/boost:=[threads]
+	dev-ros/rospack
+	dev-ros/ros_environment
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/rosmake/Manifest b/dev-ros/rosmake/Manifest
index e866c68835c3..d0382c8065d8 100644
--- a/dev-ros/rosmake/Manifest
+++ b/dev-ros/rosmake/Manifest
@@ -2,9 +2,11 @@ DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee554725450
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
 DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
+DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
 EBUILD rosmake-1.14.0.ebuild 453 BLAKE2B 32e9013181907249a70550ecb1c6a009f830ed77c899222cd9091363c797792584111920d9edab243dadae8518baf427fb258d38722c12394e96b43ff1a2c746 SHA512 63133eabaada1be18e1b039eb50b0628045a6c3b1af1d17cade4354f2d7c3329a2da3897eb9b8a638e9b342991d4f0f1096163c9c2369d0ac7b56a95d564b0e0
 EBUILD rosmake-1.14.1.ebuild 453 BLAKE2B 32e9013181907249a70550ecb1c6a009f830ed77c899222cd9091363c797792584111920d9edab243dadae8518baf427fb258d38722c12394e96b43ff1a2c746 SHA512 63133eabaada1be18e1b039eb50b0628045a6c3b1af1d17cade4354f2d7c3329a2da3897eb9b8a638e9b342991d4f0f1096163c9c2369d0ac7b56a95d564b0e0
 EBUILD rosmake-1.14.2.ebuild 453 BLAKE2B 32e9013181907249a70550ecb1c6a009f830ed77c899222cd9091363c797792584111920d9edab243dadae8518baf427fb258d38722c12394e96b43ff1a2c746 SHA512 63133eabaada1be18e1b039eb50b0628045a6c3b1af1d17cade4354f2d7c3329a2da3897eb9b8a638e9b342991d4f0f1096163c9c2369d0ac7b56a95d564b0e0
 EBUILD rosmake-1.14.3.ebuild 453 BLAKE2B 3d7c3a0dff3c530c6ba95ef011d6b7bf6ecf23d69d877954dc866b71ff69185949c5fa8711bfdbec8082f12295a226b268bf6fb5c8a13af26027bd877821a78f SHA512 8ba6df61b2f97b6a81797f4b543622194cfe4db1fa71831c164b94d70a7e0f59eb5c42b437fe9f9308600a3c0d0096932eb8e604bafb83e616189028df7896ad
+EBUILD rosmake-1.14.4.ebuild 453 BLAKE2B 3d7c3a0dff3c530c6ba95ef011d6b7bf6ecf23d69d877954dc866b71ff69185949c5fa8711bfdbec8082f12295a226b268bf6fb5c8a13af26027bd877821a78f SHA512 8ba6df61b2f97b6a81797f4b543622194cfe4db1fa71831c164b94d70a7e0f59eb5c42b437fe9f9308600a3c0d0096932eb8e604bafb83e616189028df7896ad
 EBUILD rosmake-9999.ebuild 453 BLAKE2B 32e9013181907249a70550ecb1c6a009f830ed77c899222cd9091363c797792584111920d9edab243dadae8518baf427fb258d38722c12394e96b43ff1a2c746 SHA512 63133eabaada1be18e1b039eb50b0628045a6c3b1af1d17cade4354f2d7c3329a2da3897eb9b8a638e9b342991d4f0f1096163c9c2369d0ac7b56a95d564b0e0
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosmake/rosmake-1.14.4.ebuild b/dev-ros/rosmake/rosmake-1.14.4.ebuild
new file mode 100644
index 000000000000..bfa505412da9
--- /dev/null
+++ b/dev-ros/rosmake/rosmake-1.14.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS dependency aware build tool"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/rostime/Manifest b/dev-ros/rostime/Manifest
index 77ce36cc2948..504bb3b94956 100644
--- a/dev-ros/rostime/Manifest
+++ b/dev-ros/rostime/Manifest
@@ -2,6 +2,7 @@ DIST roscpp_core-0.5.6.tar.gz 31734 BLAKE2B b72e8f7ed04cac701e867cdc9c88ec4435cd
 DIST roscpp_core-0.5.7.tar.gz 32006 BLAKE2B d63c6bcf314de4237ed8c08b5af7a1a097b9d5af76b0644124419bb516f08f8c9030e509b9a4dfbd80fd2f1fff35b58e0452293339b0081c4d1cef590e5c05f3 SHA512 a3a40b2e05e1ad9d442050fd5a5b8a2106a27aef5222eaa9ac1b0c8aff13d1a40da252e81f0544b72380db35594c1d49de06cd3e94b9ba5ed087d71362f3babe
 DIST roscpp_core-0.6.0.tar.gz 32255 BLAKE2B d184d3d3c05a041c1c027877a314f5bd98515ee02d607cf3575ca939e7ec7d87807bf2ee96717cc5b23971ce297d3bdeb6f78c5883dbb6350ae01ba23ae8246e SHA512 3adee84e3fc8f3b66ac3093f0bac82a6fec92e1096c4f2c0c5dd001b0e599d895c71fe62aa19a53d7b097e2eebfceb111262991d46ac9013fff9d2d92ebeec75
 DIST roscpp_core-0.6.1.tar.gz 32611 BLAKE2B 387e17dfdc87af8880ee7b17c99e43558023a0241422e463dd8fc12f697604e655f01dfe5ea0142b819aa638903fb94adaec985a0c7c2feb79db886a2b97db18 SHA512 167d3b7bfa048a2c3f7b4239402c9077e1871aa2cc5f60ebab3e5ad3cb5acd94667b4e7de9eb2af2f8dfba74e0d82510f6bb591f7096d99e465f987643b2681a
+DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
 DIST roscpp_core-0.6.2.tar.gz 32730 BLAKE2B db7bbdf9252a821fe65e20cc81f01b5b55aff5bc2729664a150a6213636190201d059a0dfd25a0d523bb1fd1d6655d69b6cf7deb88845edafcd176c593d10fa2 SHA512 34e5442648fed7cebf694480d40825d4e5b1791409741b0a13aad7daa0d7f5190d6509d73780ba4e02620f789f9b0c7474b97772abba1dbea3bee98fe8d1ae59
 DIST roscpp_core-0.6.3.tar.gz 33419 BLAKE2B b2b44b6f696f200aab52f267ba4defb5ae54db7af61eed7c69046da2fdf6d68c5713f2b0ca9e4e4e36634597ecb2e501b29d7b96d825713be9533401940d9862 SHA512 2e512d26c29ffc3d7d4431f6153d273ddf26334390c972c9a95bca97536102e1a03ae82369d4804de31854df7ad471eb60c5a97c47465611c76562c083ce7c7d
 DIST roscpp_core-0.6.4.tar.gz 33661 BLAKE2B 5f38662f221f8a02c90cf8c739b5f9ecf5d83c82c9991d583fcaa7e49d3679c2f9eaa6efb1a8b1b5b44718ac80bde66a7931fb6e616394e0e33c5674ac710de4 SHA512 134d3bc1a928416e6fa6afdbcedb83fa546a47d2ead407d5c6e82275d4b3a21a228813d84bb17a23b071d6cd88dc4f53f670e9f1971e28049b97b56167c93217
@@ -13,6 +14,7 @@ EBUILD rostime-0.5.6.ebuild 429 BLAKE2B 36d6c8525c3585e6f82b3bb4a819a3308457224a
 EBUILD rostime-0.5.7.ebuild 429 BLAKE2B 36d6c8525c3585e6f82b3bb4a819a3308457224ad7b412b2749d354c84557f2f8c4f9858270d51c694a6e2caae2aac205d0f717c6462b22122f83807cb69b354 SHA512 ef98d05ed0e98e664b9ca9d1dd736be40ffd22003bdeedb3c6ba9477707e1868d57c1070916dc765edeb143d1ffba2a3231c940cc236b8790bd3f5b2f7a44dd3
 EBUILD rostime-0.6.0.ebuild 429 BLAKE2B 36d6c8525c3585e6f82b3bb4a819a3308457224ad7b412b2749d354c84557f2f8c4f9858270d51c694a6e2caae2aac205d0f717c6462b22122f83807cb69b354 SHA512 ef98d05ed0e98e664b9ca9d1dd736be40ffd22003bdeedb3c6ba9477707e1868d57c1070916dc765edeb143d1ffba2a3231c940cc236b8790bd3f5b2f7a44dd3
 EBUILD rostime-0.6.1.ebuild 429 BLAKE2B cc3affe89fc8cc3d6166feddede76c4062ed16d3be8be38c603c34bd0a994d4d8b814e23741e1816034ef82d7edc6ace4c483b1da8705b2796186d5415fcad4d SHA512 ef8e1d9ccd89a9c3756ade6ce584796d16273b1ec87f7bf67bc84c17fa81468d33c72fe02677f599631fd04a5ec9cf266b10300fa524bb80b9192d2e5962bcd3
+EBUILD rostime-0.6.10.ebuild 429 BLAKE2B 4e52ba258dcd50a574daa94e34b98510e728da99182b87f7c0ce9bf876e0f57c3c95b7b06475218bda84d71b8527f9e81bf236612b2229d028f3c95a2cacd044 SHA512 010d928ad23a12e5af670ebb1e183c3e393db80cfcbe1cb707ff0157ab908f8ac59fc4f89de9cab5dc50a5613ad8a88db5b42fc3ff5e67fdef8b17e909c0d00d
 EBUILD rostime-0.6.2.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
 EBUILD rostime-0.6.3.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
 EBUILD rostime-0.6.4.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
diff --git a/dev-ros/rostime/rostime-0.6.10.ebuild b/dev-ros/rostime/rostime-0.6.10.ebuild
new file mode 100644
index 000000000000..6d97b2f7c4f5
--- /dev/null
+++ b/dev-ros/rostime/rostime-0.6.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Time and Duration implementations for C++ libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-ros/cpp_common
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/rosunit/Manifest b/dev-ros/rosunit/Manifest
index d704f7460eba..15f184b906b5 100644
--- a/dev-ros/rosunit/Manifest
+++ b/dev-ros/rosunit/Manifest
@@ -2,9 +2,11 @@ DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee554725450
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
 DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
+DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
 EBUILD rosunit-1.14.0.ebuild 500 BLAKE2B 32eb9022bc2035f87168c5d79d09fac1ad49ae70a64c232fce1aea0bbad9e9770845c91311afa13bc410cb80069bc610ab1d8e572d63764d95c94aaa48ba2c93 SHA512 fbb7785549c4c31ae9f499566e853a481305fd8f27ca781b8e0a1493faf250df57e75e7b873a1786296d6e6a7eb467fb69008b651434f9b1cb0d1960f980ef41
 EBUILD rosunit-1.14.1.ebuild 500 BLAKE2B 32eb9022bc2035f87168c5d79d09fac1ad49ae70a64c232fce1aea0bbad9e9770845c91311afa13bc410cb80069bc610ab1d8e572d63764d95c94aaa48ba2c93 SHA512 fbb7785549c4c31ae9f499566e853a481305fd8f27ca781b8e0a1493faf250df57e75e7b873a1786296d6e6a7eb467fb69008b651434f9b1cb0d1960f980ef41
 EBUILD rosunit-1.14.2.ebuild 500 BLAKE2B 32eb9022bc2035f87168c5d79d09fac1ad49ae70a64c232fce1aea0bbad9e9770845c91311afa13bc410cb80069bc610ab1d8e572d63764d95c94aaa48ba2c93 SHA512 fbb7785549c4c31ae9f499566e853a481305fd8f27ca781b8e0a1493faf250df57e75e7b873a1786296d6e6a7eb467fb69008b651434f9b1cb0d1960f980ef41
 EBUILD rosunit-1.14.3.ebuild 500 BLAKE2B 581f2614a0edc064f445c4b6e3d8bc8a77eb96a4e88c11574d39bcf69585c1a963d1b29a3e220c8080013d51b13ac48548144ee9fc799ae81524050a1dd7d5cb SHA512 3b8b4bf8b571e1dd1e14f0098b1e1bc79daa16d02d5635976e56e7a1ed55bfd984a427ee0e9fd9375df57812afda02eb45158ceca3eac9f49c07fef5a275b0e5
+EBUILD rosunit-1.14.4.ebuild 500 BLAKE2B 581f2614a0edc064f445c4b6e3d8bc8a77eb96a4e88c11574d39bcf69585c1a963d1b29a3e220c8080013d51b13ac48548144ee9fc799ae81524050a1dd7d5cb SHA512 3b8b4bf8b571e1dd1e14f0098b1e1bc79daa16d02d5635976e56e7a1ed55bfd984a427ee0e9fd9375df57812afda02eb45158ceca3eac9f49c07fef5a275b0e5
 EBUILD rosunit-9999.ebuild 500 BLAKE2B 32eb9022bc2035f87168c5d79d09fac1ad49ae70a64c232fce1aea0bbad9e9770845c91311afa13bc410cb80069bc610ab1d8e572d63764d95c94aaa48ba2c93 SHA512 fbb7785549c4c31ae9f499566e853a481305fd8f27ca781b8e0a1493faf250df57e75e7b873a1786296d6e6a7eb467fb69008b651434f9b1cb0d1960f980ef41
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosunit/rosunit-1.14.4.ebuild b/dev-ros/rosunit/rosunit-1.14.4.ebuild
new file mode 100644
index 000000000000..eb257dfeac25
--- /dev/null
+++ b/dev-ros/rosunit/rosunit-1.14.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit-testing package for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/self_test/Manifest b/dev-ros/self_test/Manifest
index e0c47a2e0ae2..6f5a58bf6f4d 100644
--- a/dev-ros/self_test/Manifest
+++ b/dev-ros/self_test/Manifest
@@ -3,10 +3,12 @@ DIST diagnostics-1.8.8.tar.gz 508404 BLAKE2B 9bf90d268ac23d0007133ddc5f2ac0d6ba4
 DIST diagnostics-1.8.9.tar.gz 525881 BLAKE2B 6de75f5fa961da199daab1a6ae1c2b34b0edbd70c09e58f7384c76f9dd0c3a51cc8b0f20688dbdcafe164ade3a0e3bdc894064cc269f6b8fb0e31faa6f4d9654 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80
 DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
 DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
+DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
 EBUILD self_test-1.8.10.ebuild 465 BLAKE2B a5aad2726b233131331e309a6c23a906535f08dbc365c33515d34bc533cab445309231ea4e5189343d9987b8947cb2984404536ccb6f96418ce4bf782fc9983d SHA512 9baea4802e0e0b28548f5cb68b39e86ef32a0efaaae566465cb3b87ec511344ccdcf701e75f7c135c8f86ca2fcab4b30065e92b7020c9a193d95d285d365ef3e
 EBUILD self_test-1.8.8.ebuild 465 BLAKE2B e3bdb7edb258d01c1ea086e253166d05b83dbf0a7bd88940e269f35f33478d410c6e4e56944fa48b3ea7f86ced5dec60703d8adf25e16bf380a9bf5c5ef800c7 SHA512 b226692a78a29a877ba8986009e3bc505e2176c641a0100c059e1df483f62327a3da651c2bb89ea92f98b09dfeb72924f52c5b562502b4f5d1c82cd78925859d
 EBUILD self_test-1.8.9.ebuild 465 BLAKE2B e3bdb7edb258d01c1ea086e253166d05b83dbf0a7bd88940e269f35f33478d410c6e4e56944fa48b3ea7f86ced5dec60703d8adf25e16bf380a9bf5c5ef800c7 SHA512 b226692a78a29a877ba8986009e3bc505e2176c641a0100c059e1df483f62327a3da651c2bb89ea92f98b09dfeb72924f52c5b562502b4f5d1c82cd78925859d
 EBUILD self_test-1.9.0.ebuild 465 BLAKE2B 9bbb52cdfd989148345f8feea974c3562302702bde48d5dd4b10e73e3aad531186553613e821e73703a5f99ae8513e3354273389c003044f4470509e8c4233a4 SHA512 91bb83ba6bbb711667f115de8b59c7c67cb130779ad040b2b6f6349466b0fc8129749d098c08a02536babc8f7f8cd2492a00a35ff3b5ab21d04df3a1fcd2d016
 EBUILD self_test-1.9.2.ebuild 465 BLAKE2B 9bbb52cdfd989148345f8feea974c3562302702bde48d5dd4b10e73e3aad531186553613e821e73703a5f99ae8513e3354273389c003044f4470509e8c4233a4 SHA512 91bb83ba6bbb711667f115de8b59c7c67cb130779ad040b2b6f6349466b0fc8129749d098c08a02536babc8f7f8cd2492a00a35ff3b5ab21d04df3a1fcd2d016
+EBUILD self_test-1.9.3.ebuild 465 BLAKE2B 3818c10c15897497f44bbff4342113532ecce420d64f87621e58cc166a465f1da2e4066bde01742e357b2afa70bee29df66ec0d62f762083ea8f718d40ec738a SHA512 69b013df58f1d1c53af91a31ae34e6cd2e4888392c958907f50e86c6b431ee0a8cc60c862e278d09dd0d703382ce88eb26e6a4bfec200cbd7436e995b24e59cc
 EBUILD self_test-9999.ebuild 465 BLAKE2B e3bdb7edb258d01c1ea086e253166d05b83dbf0a7bd88940e269f35f33478d410c6e4e56944fa48b3ea7f86ced5dec60703d8adf25e16bf380a9bf5c5ef800c7 SHA512 b226692a78a29a877ba8986009e3bc505e2176c641a0100c059e1df483f62327a3da651c2bb89ea92f98b09dfeb72924f52c5b562502b4f5d1c82cd78925859d
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/self_test/self_test-1.9.3.ebuild b/dev-ros/self_test/self_test-1.9.3.ebuild
new file mode 100644
index 000000000000..4be6495b629d
--- /dev/null
+++ b/dev-ros/self_test/self_test-1.9.3.ebuild
@@ -0,0 +1,24 @@
+# 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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Robot self-test node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_msgs
+	dev-ros/diagnostic_updater
+	dev-ros/roscpp
+	dev-ros/rostest
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest )"
diff --git a/dev-ros/sound_play/Manifest b/dev-ros/sound_play/Manifest
index c96fb8b7fd80..eeef66626323 100644
--- a/dev-ros/sound_play/Manifest
+++ b/dev-ros/sound_play/Manifest
@@ -1,4 +1,6 @@
 DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
+DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
 EBUILD sound_play-0.3.1.ebuild 883 BLAKE2B ce92dce9d12107ea31d5ff1ad4175d43be03255a8a4c9d1cca3b032a99674d0161951c80633452b70760980bab9aa10e05687031636a0e49dd288737b3d9f84f SHA512 061d07513c20b8cf7ee0deb675526be846daa56dd71c947e0f066f68e015a79f8617018db0a6685a6e8492bff45a6a09a671c234885ebb0c3fb2d31f68b024fe
+EBUILD sound_play-0.3.2.ebuild 883 BLAKE2B 6a2e3a80d19fddcca1a18f02fbe68b6097edf83459d9731b356e7413ed4e51f21728ba8962d16250f7047e541e5a365dcb3a0867f1dafb546a01be10b821a591 SHA512 8b3458348592d723ae469aa7619e984063ea3a6ca8e8fe7916d36480c675e3cc14b95aa5fa6b5ead5d0d2f4999401ecd8569fe41cca846a569903be06ab210da
 EBUILD sound_play-9999.ebuild 883 BLAKE2B ce92dce9d12107ea31d5ff1ad4175d43be03255a8a4c9d1cca3b032a99674d0161951c80633452b70760980bab9aa10e05687031636a0e49dd288737b3d9f84f SHA512 061d07513c20b8cf7ee0deb675526be846daa56dd71c947e0f066f68e015a79f8617018db0a6685a6e8492bff45a6a09a671c234885ebb0c3fb2d31f68b024fe
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/sound_play/sound_play-0.3.2.ebuild b/dev-ros/sound_play/sound_play-0.3.2.ebuild
new file mode 100644
index 000000000000..c6c2efd7eed4
--- /dev/null
+++ b/dev-ros/sound_play/sound_play-0.3.2.ebuild
@@ -0,0 +1,34 @@
+# 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-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslib
+	media-libs/gstreamer:1.0
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	dev-python/gst-python[${PYTHON_USEDEP}]
+	app-accessibility/festival
+	media-libs/gst-plugins-good:1.0
+	media-libs/gst-plugins-base:1.0
+"
diff --git a/dev-ros/test_diagnostic_aggregator/Manifest b/dev-ros/test_diagnostic_aggregator/Manifest
index 9efde9957ef7..65c34990c7c5 100644
--- a/dev-ros/test_diagnostic_aggregator/Manifest
+++ b/dev-ros/test_diagnostic_aggregator/Manifest
@@ -1,9 +1,5 @@
 AUX gcc6.patch 487 BLAKE2B 9301c9e8e22bb780ea2d91a0055fc0f2f03af1ce3fefeb3bf8c5d53d544f1b73b5420a3cf510c6adc71a615ddfea2894c9ff1fbc4655a403b5b599753a25727e SHA512 20b0cf8ed7774493fa0626fd89932368d6bcbb50e4719cbd29c58012d5bd60357392984959452f8ba12266c54cbd8d825d972de2a3f46f067bda164868d32f86
-DIST diagnostics-1.8.10.tar.gz 525999 BLAKE2B 97d28f89c01fb8ee17fda9b0207f68848c57af754980562dce05d9eb76b1505f316ef64fe06a8a76db807d0b6d39657924e0f5c9dd8372a1df2fbefd51cacd8c SHA512 a3719b1cb745e376bbff55c483c92916588b4548c0c7b57cad299d3b748ca278a2d6b1a874168dd489b60a6dbc2250b40db1c55b54a4043de1b5c3ce3c8a5513
-DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-EBUILD test_diagnostic_aggregator-1.8.10.ebuild 492 BLAKE2B cde5d5392fc76ab0cc24930e8dfdaf4db933f62cf967ed5eca3e10ad8896bd98bd72997b16a599ee45ad4d6389cd8cc7058da06c06868e716092685f9a4d4624 SHA512 a2abb07dd5a7c00a5953fda4dde21ba895d5660c2beaba8534af1da674b723ae88f9ddf9989ad2f62d1f865d8f8e4542b07730067a8c60fca54aa27ea6b7b015
-EBUILD test_diagnostic_aggregator-1.9.0.ebuild 492 BLAKE2B cd2356a248cf15596fa624f5a5f624d317e013c45e33c108ea843406fbbac89f8bb9162c4facdae73ebcc729635aeb5627dff5c872f00b9f548e25e9d53f9dca SHA512 6c60a94ee6d0c02e3dc89b27cf29ccd24dd6bd66e6a7732feec766be6c989c23e520dad70fa31d2fcfac3cfe0aebadac85964be8cda56b931d89557df9f96382
-EBUILD test_diagnostic_aggregator-1.9.2.ebuild 492 BLAKE2B cd2356a248cf15596fa624f5a5f624d317e013c45e33c108ea843406fbbac89f8bb9162c4facdae73ebcc729635aeb5627dff5c872f00b9f548e25e9d53f9dca SHA512 6c60a94ee6d0c02e3dc89b27cf29ccd24dd6bd66e6a7732feec766be6c989c23e520dad70fa31d2fcfac3cfe0aebadac85964be8cda56b931d89557df9f96382
-EBUILD test_diagnostic_aggregator-9999.ebuild 455 BLAKE2B d5de75bbe893213ab13ec5d427955f4b00fed1f70b125c70a0e112845fb611fd35d5b270962b65676bd628cb77d3eb9d513edaf6ad41bee1b6ba3744e8611d2e SHA512 35da5236b9b09505bf97bcae256d16a7700a7170020e82577a53d260b3e3dd751e79b14e71169e61ce3d9b0ebcfb1cb0b1bdf21f92438360633ea0cad37d8eda
+DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
+EBUILD test_diagnostic_aggregator-1.9.3.ebuild 492 BLAKE2B e8945f4e168fe32a7410c274dd196039445a8d8755bb6f1199371f011ce89e251eec7e6270767e5b083ea1271127a907620a3fd5b035cc60029f299b2136f291 SHA512 f93e6e1110111f3c3b1dfcc322bb0ed1c895dec96fb837075be6b09a1b4220d7de411c00a284293c45cc8e57d335239db0e9d54cb2e26b17a808190aa09c3b63
+EBUILD test_diagnostic_aggregator-9999.ebuild 492 BLAKE2B e8945f4e168fe32a7410c274dd196039445a8d8755bb6f1199371f011ce89e251eec7e6270767e5b083ea1271127a907620a3fd5b035cc60029f299b2136f291 SHA512 f93e6e1110111f3c3b1dfcc322bb0ed1c895dec96fb837075be6b09a1b4220d7de411c00a284293c45cc8e57d335239db0e9d54cb2e26b17a808190aa09c3b63
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.10.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.10.ebuild
deleted file mode 100644
index 26eb4591a5b0..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="diagnostic_aggregator tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_aggregator
-	dev-ros/diagnostic_msgs
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.0.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.0.ebuild
deleted file mode 100644
index e91f3025a206..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.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=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="diagnostic_aggregator tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_aggregator
-	dev-ros/diagnostic_msgs
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.2.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.2.ebuild
deleted file mode 100644
index e91f3025a206..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="diagnostic_aggregator tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_aggregator
-	dev-ros/diagnostic_msgs
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.3.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.3.ebuild
new file mode 100644
index 000000000000..cabd94dbe35a
--- /dev/null
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.3.ebuild
@@ -0,0 +1,25 @@
+# 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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="diagnostic_aggregator tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_aggregator
+	dev-ros/diagnostic_msgs
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/rostest
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
index b2364a6257b7..cabd94dbe35a 100644
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-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
@@ -22,3 +22,4 @@ RDEPEND="
 	dev-ros/rostest
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index ad3f53bddf79..df75c178a9fc 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/activeldap/Manifest b/dev-ruby/activeldap/Manifest
index 038f287d0526..d55aa26aed5a 100644
--- a/dev-ruby/activeldap/Manifest
+++ b/dev-ruby/activeldap/Manifest
@@ -1,5 +1,7 @@
 DIST activeldap-4.0.6.gem 225280 BLAKE2B 0f03ef95f3d0600d2661eab048c8dda3fbabe519add67f7785895e346d835d1e0396270f829f16a982f12863c80378be2f4f7ff7cf84016007b005b1914cec15 SHA512 03053e3798b557c73c3a0918b72d1d3c2cada4da3475913ef17a6f9f2f1ac1e102052459ef1a6d8c25ce41382b64c1a3097ccba1c768497a33a3a971b9778d3b
 DIST activeldap-5.1.1.gem 224768 BLAKE2B cbb54a3e442592ffcd46b99dc92301955e0ec2e6930c7dff0159ddc41166311f9f7b06a0d878dff4180962d6811690fc55e6eef9693048d485672dc83560b63f SHA512 13ae4f05717a9de80f56e19033e694ae1291cf4486dc4c69055892fb2c43469b0dba968949bd668a89d035126d8bde144ad410313dce0d6de80a4ddff884a745
+DIST activeldap-5.2.0.gem 224768 BLAKE2B ae0aa9b2f33121bef3974fdcda5dc06278072241165b5c049fe23bcda8572603dd7695e8839892075ab928e3653c8dd8b6ec87fa17e8c5f9ddb0422b13821676 SHA512 72796a48cb067d61c4f278a3d74f81ebc2c0b1ef648cc02bdf9db0bf9b04a93a924dca3f6134b44c7a9cded7a292984099bd544796b94fb435e21b09d7fc48b3
 EBUILD activeldap-4.0.6.ebuild 856 BLAKE2B 44419f128f93e1ee06e4b4012c0c041e67dbaf2c38af7d65f4c5b8f978ec7f8caa15c5bf36e2f01cd23e621004d51cb3169737450741ff91f16cb737ea8f59d9 SHA512 da750eb877564477f4c5d1d7a4b3ab4359339b74d6d5113b5964a43de35a0dbc5be8057945befc8ae590799add88e8b1019df3d073c5055033656bfd1fc6e5d1
 EBUILD activeldap-5.1.1.ebuild 856 BLAKE2B 45035e1f5a1ec6b933642ad93e9895b1143b241c5a64508aa8112a9a6392789090636d72f4ff69b5c9941ed08c71d3a67e6b8f01801b4c0e4b3992811cf7aa04 SHA512 521655546ef6575bbf90a44902ac9c415c49815cb4845ca45fe4caa01e812f149413aa09c5430f2cd75eb7e68012e8ccc12e75883d0ae8ee1bc50c2a1473bee1
+EBUILD activeldap-5.2.0.ebuild 867 BLAKE2B 7f034fe47c1f1321ffd46c0814b53272b893b58ec9483574256e362236195385119a9fe4b67080a5209aca4a5d985fb7ff656800f1509db7dd27bdd19373766d SHA512 34d16809216d753bb15371427163bc4d609b4aa1342320366c96b4918eab43d31c1f85bb5c984ea2bede86d2c8025d98b8f6a58bef92049c80d2e00786dead1d
 MISC metadata.xml 347 BLAKE2B 14d83abbee66dd0fac29431f2e219444dc61b0a27861dfb3eae63a245fec285627ec788f4da897dadf81f3cf2d94406121c565a3c29121400498d1f96ba7fe17 SHA512 642b21533d2c7665de55d54190762be8b6c295060ad0d20ce2a65b81d86cdd3156571470189acdc142b4f54d7b7eb60e4e7e2be8d3534f220c299f8cf3c1f555
diff --git a/dev-ruby/activeldap/activeldap-5.2.0.ebuild b/dev-ruby/activeldap/activeldap-5.2.0.ebuild
new file mode 100644
index 000000000000..be5311720e6c
--- /dev/null
+++ b/dev-ruby/activeldap/activeldap-5.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.textile TODO doc/text/*"
+RUBY_FAKEGEM_EXTRAINSTALL="po"
+
+inherit ruby-fakegem
+
+MY_P="${P/ruby-/}"
+DESCRIPTION="ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
+HOMEPAGE="https://github.com/activeldap/activeldap"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Most tests require a live LDAP server to run.
+RESTRICT="test"
+
+ruby_add_rdepend "
+	>dev-ruby/activemodel-4.0.0:*
+	dev-ruby/builder
+	dev-ruby/locale
+	dev-ruby/ruby-gettext
+	dev-ruby/gettext_i18n_rails
+	|| ( dev-ruby/ruby-net-ldap >=dev-ruby/ruby-ldap-0.8.2 )"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc doc/text/*
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples
+}
diff --git a/dev-ruby/bcrypt-ruby/Manifest b/dev-ruby/bcrypt-ruby/Manifest
index d709ab42e39f..4cb8d3d44996 100644
--- a/dev-ruby/bcrypt-ruby/Manifest
+++ b/dev-ruby/bcrypt-ruby/Manifest
@@ -1,3 +1,3 @@
 DIST bcrypt-3.1.11.gem 44032 BLAKE2B debdc199ff3806b32998c91a99006f293ca6ebbfe2573546afda7c705fbdc0ac8f4cdfba97c1765668cfe3782cb4f9affff1b59b20c42e19fd14a6fa52f66160 SHA512 bf9ff0d3cdd7044b4ee5796cd04869f21bb3384143b0f336bc2cd9a8f0db3f9562aa23a39601c1d86f153b62f07469ef066616f8a52cfcd840377e331cb22454
-EBUILD bcrypt-ruby-3.1.11-r1.ebuild 1639 BLAKE2B 73376ee142637fd1a131452c03d23468ccd2ae3189d76f00b9a07aabf92659acc983195cec90c4e5fa2d10be06bf6e5244836ac0da563672b7b1c686832f2145 SHA512 fbf363b761cbf1db54cd2bae8ad592f9be4dba55143b41090d97d512f322374044cef57dd5f26eec0e0bc2b5538ba85c90119e646ce01643f9b0b1c13527251e
+EBUILD bcrypt-ruby-3.1.11-r1.ebuild 1632 BLAKE2B dbcd215a7168f7b3db6d64b07df88e5827698043ee6af3c147a02d178c1ecce02a6cf359525e36ea65c545dea923c14bf185776ea82b84e0e3fdc2dcb41b3a97 SHA512 b5246d4420931b77c58d3ede50e039b461047fd28b605d8a887ba12ae1e7ad8c88bf4a192eb16a7def6a7f6902f4674f38e0dbaf12670c5edb2dc6d7fcb54062
 MISC metadata.xml 346 BLAKE2B 635b8241d82a243f102d3ee6ce24c6cb183a9decd70cb02ee8734c85c9796b3dad0206b4e18da86df0e68fdc72a782b0494d682e757631718d0d60ee27b3d67f SHA512 ade206e8719923e0e758268c757100148580fd817bf477beee8df9b9b9f99a50b82b898e555bb6b0fd91239af22b1d7aa320caa1fed5c093a8799e82fac97608
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.11-r1.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.11-r1.ebuild
index dffcf9630271..3c7e313f372d 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.11-r1.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/exifr/Manifest b/dev-ruby/exifr/Manifest
index 57a3f1618bfe..96b7c6632b5e 100644
--- a/dev-ruby/exifr/Manifest
+++ b/dev-ruby/exifr/Manifest
@@ -1,3 +1,5 @@
 DIST exifr-1.3.3.gem 231936 BLAKE2B 44958407a3f743a995b4ec28a287ea5352bf2da77362ce8e3cf61a51ef5b1d86836e64766a95697b4d3f142690d1928e11affb57fdc2568ee65e76f28787b0e8 SHA512 7362913874d4d78f8c5b7da7a5bc99a6f7bb120e58ebb67dc196e60bc7ac14243a2989a7e4e7db1853c71d09d866275d909c6407d72ec0271c34c1bb7f15ebc9
+DIST exifr-1.3.4.gem 232448 BLAKE2B 525f2b8c74b15b2abb3a5fac82e475421a0e68003159cb5dcce99436ef7adff13ca614d82cfc55d2680bef64a9de7d5c65a9e1eb72d72b04987a5882fcaf81dc SHA512 1609018119942bd845fc06a93783cb8035da1bdbf8cdaa8335f649f226ba6c6fc52c984528db5fbc3277faa80410fa3708845f26d2e5a48ef36999f22e1cc3be
 EBUILD exifr-1.3.3.ebuild 507 BLAKE2B 25f2f0f228ac0822a9b1b6b15f96701667e4ac75af39f76969a3c0c020bdbe101cef7120eb7969f67dd949dc269bb65dc0a51250823eedb8c32427949754775d SHA512 961b7dc15cc92b4d7dbd889b3c0d4522780200aa27d1bb55ed439cc532043df7467bfd36fa2cb84b4f47e1bfb5b62ae302026792df53b701d18ea50ceab357c9
+EBUILD exifr-1.3.4.ebuild 500 BLAKE2B 34b2149a016da78cae5d049a945327a5973833339ba2d4ed8d00aeb748b9d0bd74ce8423570757b9ab36da0361bf05428209bef5302f8c846407c648f35c43f1 SHA512 fee71096f1e22999c9c783dd0d6c3f69b1d612bb1f613b4334646673a5303a07d8666b9c51488d4d50aa4ce437cf6cbc03f452fe577b28341680a12cbc6f7884
 MISC metadata.xml 338 BLAKE2B 47c3d987095290c119098638186a209bceec785b33cd6501a3a45c373f2e0a15f1f9da565b7b05c948ab9889780969935c631f418fed04a6b2d45d346e530f82 SHA512 76f53e033898bf27e6d8a3a2681dd5aa66f7b112fda61489397fb0a1205ac1c2e3a07007493d9de82e7ce5fa57b4f7452d214b6873f325fd0ff53d9730721bc1
diff --git a/dev-ruby/exifr/exifr-1.3.4.ebuild b/dev-ruby/exifr/exifr-1.3.4.ebuild
new file mode 100644
index 000000000000..3243469b2c3d
--- /dev/null
+++ b/dev-ruby/exifr/exifr-1.3.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_DOCDIR="doc/api"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to read EXIF info from JPEG and TIFF images"
+HOMEPAGE="https://github.com/remvee/exifr/"
+
+# License is not specified in source distribution but is in the GitHub
+# repository.
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/rest-client/Manifest b/dev-ruby/rest-client/Manifest
index 8750ac56036e..0e404302667d 100644
--- a/dev-ruby/rest-client/Manifest
+++ b/dev-ruby/rest-client/Manifest
@@ -1,5 +1,5 @@
 DIST rest-client-1.8.0.gem 124928 BLAKE2B e7ec09b6d91b1bb97f0a6ab9add98c696e5b2b0dbdd08b3bdd7e6ec9ff1b07dd356d4f3a84a485c7c9be58dd389b73920bfbf28d8d1e22ee3bf2f9f618bc28bd SHA512 d4c03b2d2807ae963b116e8c977411305b55836e4129b18ce2e88ea5795838c448bece151f6b57aa03920ea21d9120835159a7e9c4bc5c9998beb3705d1f2bfd
 DIST rest-client-2.0.2.gem 149504 BLAKE2B 839003255545ad8d67b0fd896f56b628d647a90fdf9eaf4e27f6c5d0179f15a1c17683e81ff7f288ffac55dcd523f5b01b4217a277b6c260bf45df8cef3998e2 SHA512 c132518a9ff0029e79826cf90de442b01f6f422b464e04914947c2f757cb7046b96c915f0248a82172f7980519fa9fe5f7bcb9dcfe28889abc62dbb48cee1030
 EBUILD rest-client-1.8.0-r3.ebuild 794 BLAKE2B d3efc607838448cf2bc2a28aaeb25e8173a98a05f9dc550c05e73c54ee5f9e006c997386b83bbd8aa8514213c09fefa26a11c5063fb338f805e847fc947904eb SHA512 7bc7ded2dd6b63e012bd20135a5305810d17dbf61698bd4e53c4a210b7017f5b2615cfd264baef617d9a7df72194ee08e26dbbb310ebf8f3476879c10732f8c5
-EBUILD rest-client-2.0.2.ebuild 865 BLAKE2B cae7e8e8cd615fa6b21c1031f1a7ee2a5ee3f85f64d7a99f493acab634487caba0c7bdb9c392cc9c19fade99865ec8e7bfd23077248f89065c2cf5b6a6b62c6b SHA512 710fa0dcc77a232bb5f3a6a1e73d3803ab7e02ffebfe3465747eeada41fc8a41fbe005c86662e473058000872348aa068cdab45596d49a9459546bf3ab7dcb9e
+EBUILD rest-client-2.0.2.ebuild 876 BLAKE2B 3a721a1b118ef6067a179988d8fe3f9cd19468e86819e06092a317d8a9859aa1c057310679a43c57fada2930ee8e91091054b3ccbc5a547c7229cf5b20fa487b SHA512 b522ba2d1e59561553cfb10b9e45de34158388f76cf88bfd7dfeae957d120363f27476262739d52a9f59121c70aae41cdc6fef76682dd0efe0d73e93a770fcfa
 MISC metadata.xml 348 BLAKE2B fe9d706faa604067ae6a773bcb6f1738aea6003905ba97c7d1b2c01847013a71a7e6293a4e0eb01371ec70fbc6d62ffd2220c8d63f0741d9d53a5517b817bbc0 SHA512 333b578a89b557f43afab3b52f1e14cc9ecc4985c2909f046c9dbb9f9e333ad9ad7ce30af72141348f6205fa3b9e213143974e05aa8cb269ff17712c0fce5757
diff --git a/dev-ruby/rest-client/rest-client-2.0.2.ebuild b/dev-ruby/rest-client/rest-client-2.0.2.ebuild
index 4b8540bc007f..89b520306179 100644
--- a/dev-ruby/rest-client/rest-client-2.0.2.ebuild
+++ b/dev-ruby/rest-client/rest-client-2.0.2.ebuild
@@ -31,6 +31,6 @@ all_ruby_prepare() {
 	sed -e '/bundler/I s:^:#:' \
 		-e '/namespace :windows/,/^end/ s:^:#:' -i Rakefile || die
 
-	# Remove spec that requires network access.
-	rm spec/integration/request_spec.rb || die
+	# Remove specs that requires network access.
+	rm spec/integration/{httpbin,request}_spec.rb || die
 }
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 83a3d7c196e8..03784704190a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index a90d1399da75..a205d9b79ad6 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -8,8 +8,8 @@ AUX package_xml.patch 1588 BLAKE2B 15a11031b704f307778e8cb85438851bfa38a2784abee
 AUX sitedir.patch 884 BLAKE2B ba051cbd046971d3b6327755b0de83c03b3a441a3e47e7d791e653bcd0b7ed3373752367a4ecfb8570a6b5d7c6fb3ae006f0c516909646d7ba7142f20b352217 SHA512 c619b6bcfa007f90464146767ea5b1aed4dad79d16bcc7daa573df14dcaa6eeb2ff96eb9d838d3bbfd0480b87d5538ffaf31dc059e25224d425f3786523b475d
 AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e83acaa0aaffed9c316ed482a821219c9c074c71ea15bad343a7f63b887b9b266982fe4afe7f71 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913
 DIST catkin-0.7.11.tar.gz 206933 BLAKE2B cda31e3d097516ce830060a2323956ec27c4113d161e95ab55564c00209e23d894e2acf3bf11b78e19538d4d8ff4c85814362a89bca58700da5fb609fb708fb8 SHA512 71810a80c1ac4334fdaed176285bee6bcb0443529debecf421723881e3d6316f41d4ed07c5eafa55515ba9d8143d5dc5fb683eda5ad54e52fda5c24085c44c96
-DIST catkin-0.7.8.tar.gz 203828 BLAKE2B 169a8381297f5ea213c6e4179f63020330b19fb52821bb851f0716857607fda2af3e867ff3f23113bd66d9b96a9b47d60c6bf3643b9552c8f7686a8126b4dd18 SHA512 c3628c551c8a5a1e544f7816a5bdedf413217c6e1fc7bb612801d29fbb247660b35d634c26f8847ace8984482978a8b8bf72c3373fd1e2e0972917f206ee0605
+DIST catkin-0.7.12.tar.gz 211602 BLAKE2B ee5b9e57601847f79a2e7c49bb9b38974b0385a1c524c70cc549511d31b9fe8d03bf95e254b9c40a420fad990da40bf9c5d29f198ae42bd772c54a89cdc532b9 SHA512 ada496fae0959330b369c8a29daf9c575fcc94c3ee7e27e0180614fc49912450b23163622759975e588ffcdd49180e5f2fc8351e02bf1aef9b1f2db92811dbd6
 EBUILD catkin-0.7.11.ebuild 3139 BLAKE2B bc6d94dc8ecc6939cf87c49afefcb74f664c9283b38735303265ca392472d8457f7a7c58f30ccbbfd2adc8f3682effb716acf4772f920245da3bf9d545ec3b32 SHA512 8b7e0b4e54866abf40d87daa43a16ed396afec17674b6d09898bf794a326f44fcbf8cb5836184f35e245ae34e488bd99a8ae01137bec2e60fae56d65577f0f3c
-EBUILD catkin-0.7.8.ebuild 3139 BLAKE2B 6a79b59b3737995740a010bd564765f4e8ee5ef527c6a65d7100335047e774c81a46e54cd2e142903c50ca6a8dc82c52fbe4522aad7e41c58ad419da0b256e26 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01
+EBUILD catkin-0.7.12.ebuild 3139 BLAKE2B bc6d94dc8ecc6939cf87c49afefcb74f664c9283b38735303265ca392472d8457f7a7c58f30ccbbfd2adc8f3682effb716acf4772f920245da3bf9d545ec3b32 SHA512 8b7e0b4e54866abf40d87daa43a16ed396afec17674b6d09898bf794a326f44fcbf8cb5836184f35e245ae34e488bd99a8ae01137bec2e60fae56d65577f0f3c
 EBUILD catkin-9999.ebuild 3139 BLAKE2B 6a79b59b3737995740a010bd564765f4e8ee5ef527c6a65d7100335047e774c81a46e54cd2e142903c50ca6a8dc82c52fbe4522aad7e41c58ad419da0b256e26 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01
 MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94
diff --git a/dev-util/catkin/catkin-0.7.12.ebuild b/dev-util/catkin/catkin-0.7.12.ebuild
new file mode 100644
index 000000000000..6f125a7d7fb0
--- /dev/null
+++ b/dev-util/catkin/catkin-0.7.12.ebuild
@@ -0,0 +1,119 @@
+# 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/ros/catkin"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ${SCM} cmake-utils python-r1 python-utils-r1
+
+DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
+HOMEPAGE="http://wiki.ros.org/catkin"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/empy[${PYTHON_USEDEP}]
+	dev-util/cmake
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/distutils.patch"
+	"${FILESDIR}/catkin_prefix_path.patch"
+	"${FILESDIR}/gnuinstalldirs.patch"
+	"${FILESDIR}/catkin_prefix_path_util_py.patch"
+	"${FILESDIR}/package_xml.patch"
+	"${FILESDIR}/etc.patch"
+	"${FILESDIR}/sitedir.patch"
+)
+
+src_prepare() {
+	# fix libdir
+	sed -i \
+		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
+		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
+		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
+		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
+		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
+		cmake/*.cmake || die
+	cmake-utils_src_prepare
+}
+
+catkin_src_configure_internal() {
+	local sitedir="$(python_get_sitedir)"
+	mycmakeargs+=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+	)
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	export PYTHONPATH="${S}/python"
+	local mycmakeargs=(
+		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
+		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
+		)
+	python_foreach_impl catkin_src_configure_internal
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+	unset PYTHON_SCRIPTDIR
+	python_foreach_impl cmake-utils_src_test
+}
+
+catkin_src_install_internal() {
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_install
+	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
+		dodir /usr/bin
+		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
+		done
+		touch "${T}/.catkin_python_symlinks_generated"
+	fi
+}
+
+src_install() {
+	python_foreach_impl catkin_src_install_internal
+
+	doenvd "${FILESDIR}/40catkin"
+
+	# needed to be considered as a workspace
+	touch "${ED}/usr/.catkin"
+}
+
+pkg_postinst() {
+	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
+	ewarn "installation path for package.xml files on Gentoo."
+	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
+	ewarn "packages that have it installed in the old location:"
+	ewarn "		emerge -1O /usr/share/*/package.xml"
+	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
+}
diff --git a/dev-util/catkin/catkin-0.7.8.ebuild b/dev-util/catkin/catkin-0.7.8.ebuild
deleted file mode 100644
index eb49a4b8c816..000000000000
--- a/dev-util/catkin/catkin-0.7.8.ebuild
+++ /dev/null
@@ -1,119 +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/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/empy[${PYTHON_USEDEP}]
-	dev-util/cmake
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils.patch"
-	"${FILESDIR}/catkin_prefix_path.patch"
-	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py.patch"
-	"${FILESDIR}/package_xml.patch"
-	"${FILESDIR}/etc.patch"
-	"${FILESDIR}/sitedir.patch"
-)
-
-src_prepare() {
-	# fix libdir
-	sed -i \
-		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
-		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
-		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
-		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
-		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
-		cmake/*.cmake || die
-	cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
-	local sitedir="$(python_get_sitedir)"
-	mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
-	)
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	export PYTHONPATH="${S}/python"
-	local mycmakeargs=(
-		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
-		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
-		)
-	python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_install
-	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
-		dodir /usr/bin
-		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
-		done
-		touch "${T}/.catkin_python_symlinks_generated"
-	fi
-}
-
-src_install() {
-	python_foreach_impl catkin_src_install_internal
-
-	doenvd "${FILESDIR}/40catkin"
-
-	# needed to be considered as a workspace
-	touch "${ED}/usr/.catkin"
-}
-
-pkg_postinst() {
-	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
-	ewarn "installation path for package.xml files on Gentoo."
-	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
-	ewarn "packages that have it installed in the old location:"
-	ewarn "		emerge -1O /usr/share/*/package.xml"
-	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index a28d9157232a..33da217b9e09 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,3 +1,4 @@
+AUX kdevelop-python-5.2.1-qt-5.11.patch 715 BLAKE2B f2b8b9c3bdcefaedae0c3865abb55486f2c071ac3d6a4ba69361f34878dd2e84908cab8fbd02cfd4793b45eeec1f1ab07191799b341c537bce4d4a9eb22e1deb SHA512 ab06b40d1ff846ef5e48ce1f28834e96b406f740e125d5a4fa2ef56c69f6ce632f5d2a2db1b1100c836c722943de2bd94959b3e27626037ad417c1dbc52281ae
 DIST kdev-python-5.2.1.tar.xz 1070708 BLAKE2B c1381e2a692446ac544e5e837236d90d5250c5b854f982374ff3c195d6d42d6534f6f81b118e872fbe4bea3f15e81b5396f3b581d6a64bf224e1a5ec631b9a89 SHA512 e65317a7da59cfaa5c14f0c10f965b1d7167e1e4e1b553f4c5f2ad9bce6d0ddbd93267cd9707a81a63117016fbc4dff77bca4ff2b2680ae585eb0f7354f3cf23
-EBUILD kdevelop-python-5.2.1.ebuild 1168 BLAKE2B e6e88767249fd607486ad0bf766caa1305a352c21a5f7c8feea95c2ee017c943c9f316f1c5084fd0c7924ac6d1d523dfc3ec2f198768ac005b218f22d5f0123d SHA512 083555b74b7af5d028a7b690d30a46c202f19125a0a5a519d5237a406c06bfdea76bb28e8e80bb56499f3442fa87da4e078ff22c0595b2b372cc788792aa6a8c
+EBUILD kdevelop-python-5.2.1.ebuild 1214 BLAKE2B b2b0c1d64e5e394ce7f8f443e8acd4966bc68bf23145ff8fa155ba74ea33562017fdebd3699b254a36d7aaed74b8b75a74a0f68f67205f7e9d57ff5dab245143 SHA512 311770f9efee7128aec66cbd7473eb0877c329c3a6e0c016cf0128da875e0dfd7edb527ed9b8a442655b11ace67469f5efc3691d7a6221813f92b8ed12b52d58
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/files/kdevelop-python-5.2.1-qt-5.11.patch b/dev-util/kdevelop-python/files/kdevelop-python-5.2.1-qt-5.11.patch
new file mode 100644
index 000000000000..67528c558504
--- /dev/null
+++ b/dev-util/kdevelop-python/files/kdevelop-python-5.2.1-qt-5.11.patch
@@ -0,0 +1,24 @@
+From a4a3cfb040054e7ca938bdd593c6c3c80d80807f Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Thu, 10 May 2018 06:55:07 +0200
+Subject: Fix build with Qt 5.11
+
+Some includes were added transitively, now they need to be explicit.
+---
+ codegen/correctionfilegenerator.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/codegen/correctionfilegenerator.cpp b/codegen/correctionfilegenerator.cpp
+index bb79a25..53ebec4 100644
+--- a/codegen/correctionfilegenerator.cpp
++++ b/codegen/correctionfilegenerator.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include "correctionfilegenerator.h"
+ 
++#include <QAction>
+ #include <QTemporaryFile>
+ 
+ #include <language/backgroundparser/backgroundparser.h>
+-- 
+cgit v0.11.2
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild
index ba7fd2bc14f1..11bbd220000a 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild
@@ -39,6 +39,8 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 	kde5_pkg_setup
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 1b22add6538d..ccfc933bc626 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,10 +1,19 @@
 AUX scons-2.5.1-respect-path.patch 1351 BLAKE2B e7bb7662394d6f5c6354b1616f5d4f36d65da8404916aea72c95bae5cfd9e1e3fb4286dc912ae55ba8c0863599223d68b3935ce18f5144f77006e6244e97f7f4 SHA512 6cc0d3b6dd711804f90af9b275e08071e6b0bb370e59aa5caadf3e192e096708f90b373de6ffba2ddaaffce0e2b5013df06f4e9259452bfcca8adcfa6b485618
+AUX scons-3.0.1-env-passthrough.patch 1507 BLAKE2B 9e21e0b14a3b6c95e2c501b5d264915a10c4c5908de98719c9a73c37f5f7de32824dce6df32a0884c4aeb53658d05cda5dbb9c6102ecd6307c085719d4e568c2 SHA512 07fa387b9ad50cd1e92495a414973acddac8c062827858b44867ff1da0560c1493d29992fe4ac2c6de8eb37ab218967df9a6d9ffa2cb26be772324a637fadbcb
+AUX scons-3.0.1-respect-cc-etc.patch 3339 BLAKE2B 14ba11c4fded9f0f1e9e151cf059b65e7aa1617c14d291ace2206a9dc6f567ecc566cbdd5ad9c1e264772fc6ad5e2e0bdb13007a882b4314aed33565509d1b2d SHA512 f8b523d5a1721fb6fffcb6c6972bca77670638121f8d20912510ebe7e9576385e3d5d5328d8f6c873bde6a8fb28c8d3b89123f7f6e411ff9d976205494842a1b
 DIST scons-2.4.1-user.html 1110981 BLAKE2B 3c2c7c3bb283e18e63b5dfe64928c2821ceb74ac6d5f4c4fc08f0ceb98ef25f6114308d02d65be0ee8231e367556bdce0f76f1f37bb9d3c1ab813a653fda2f54 SHA512 e73caa3daedb5da419a417dbec73a3958da162311e9ad09a7d5e9d6989686b24cf5c1b34fdb1d547a43de1da36e99566e6c367fde05af032a2d1000a7e12270c
 DIST scons-2.4.1-user.pdf 2527773 BLAKE2B 16c9a90fd57af7552f8d05fcf018ed99b76d29c148169dee4fd610aa40e439448f5a7a6e8ba8d72830a605a26141927f5dcd1643f99a1bfe9433d87350e96569 SHA512 d53d41e51096d1923e168054d335da1498e9ca338e39aef7985967f839656d368b65a8b979dac701ca1c529deeff4a79f402f058d23ef4e658f849ce0784eb45
 DIST scons-2.4.1.tar.gz 638990 BLAKE2B 44084dd396d8cbe63da59aed706cda7342bbe51dd4f78bd324ad6ce822ae45b9da1099400e1dfeafdb2e4e8f1906e88be423598cc2c2915a1544f37285b31297 SHA512 bd0830719dfc0c2e8620ec767ee6342af74a170cd895acda2995761eafe52e1efa9471626fcaedb0dd9a779ef9bb9b4306bd6cd3c2a5bd7bd2500018b40653e0
 DIST scons-2.5.1-user.html 1112180 BLAKE2B 93df42b296d1be6ffcb73143c5ec9f46225e3e9d07154cf8f703d5f624d2996d85569ff302093a7a73dc0001cfeddf49ee9e57d9a1939d3c6b4689f8773e3ede SHA512 5be58a6bba4b92fc51f0b271fd7e08b820dda10775aaa40a012c0e54d485e02ebf6d0d0be379bd90980a9b496e86a951c8760a4a90107fb3b8f422e874e46046
 DIST scons-2.5.1-user.pdf 2522755 BLAKE2B 0dbf4ec98cd1dfb4889595762fdf57c2988a6784d75f8c3ac53e79d686b745ae4dd7b674ce34d61255c798e203fb6de93eaaf936a4842b27990350fa73b6bd46 SHA512 0bd7f67a1355ec33125bef87ce1bc352bda5b0befd9809673a427851c843191d74930b4ca9add705152393521f81d926595d173b0101013da216217dc5b64397
 DIST scons-2.5.1.tar.gz 620909 BLAKE2B 021e02583dab06a859e46d164be79dcaa49a1a383c5d3fb9baa64afabb793e049b7ebefff1bbbcc8be1f364ca5c64e1a9c7ef937c32407853e39f4d84a91e51d SHA512 0e39f7f22a6c4ecc13edcd843b050754da5ded5371b3a8b406395f7b53dd280f95f804707eec271f8de3624d06f5b4ba3cc788dc4eb891cad224a163544f51b9
+DIST scons-3.0.1-user.html 1121915 BLAKE2B 0ee57d112ba6269a488335e9354723c645e4b06129c26ca64d45923066ad92cf5519fa4933ef74dd5254d5b068b2909290c5c930a4247ebd6a5f1761f683a6e2 SHA512 e49ae91b04509d32f67d17cabb6619ede49c7190d80efcbd1e0bd1992574ea08c7abc892cad26f8b995b0f43bccd099a96ce633d63d6f56aafc442f9aa734aec
+DIST scons-3.0.1-user.pdf 2541376 BLAKE2B 43895501bf8b4a7eda12c5b3b076e6a71e949727224c279ef77671f7d4094245d37b9d8aeca6daa7d043c5513cc0c83e82a06f8a50bb4add4f0d750fce416bac SHA512 9fab1915c96cd32908cbbf123dfb8c97be99ec45df0461fa68ac47706f6bfc51d7ab970a43630e5414b01a8b9d27409e356b57c134478cec13f1bcbd97f615e7
+DIST scons-3.0.1.gh.tar.gz 5481813 BLAKE2B 750668bf034ff48f635db0395fc4fc950a7148c315099738da4d96f346d025b7dd3849e376d566e5f55793ee0b901ad8a4d7ff661068420f085ab76404ca244c SHA512 092a5d88191e4c9deee2e14371745fad1c3beee746f55256729444ad56a141a28f45ebeef4b2a7ec37344048ff16864d85b978855c0285a14b7c6f46f91158ac
+DIST scons-3.0.1.tar.gz 634815 BLAKE2B f5bacec048969d592697bc3dfb44678c25a92982f7ba81f9951e73532e8b9ac0906fe72c979d7818db5ab9b2c6dd380df21d323e47ea4cc0db646d6eed4b7d94 SHA512 b7be40ba507366cc678f31b910553cadaf59781c3a91833a34acbd29d9cad0cda38f6753034bf92c3af55d1e0c2f72aba5d81f1ec67205d0345b005d286f7084
 EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a464031395dd72e8f1311b703a398d9abb56eae9a67d4654529ec2fe06b8465f00fe83c442e251875dc53317 SHA512 69f7b513981e51bf547aad20f31af7ee98b77bb11bc10257499f92ea32d4a664cf83d77cabea81a56b068f2c18a40503567611e7ba78b987d4c6de1d52648b90
 EBUILD scons-2.5.1.ebuild 1604 BLAKE2B 13dfacaa0117905ed25e1caf7b22e97211999c92a538c380fc3785780c077f2511ca89ba50ae0c462edfb5027b99c3fa8290d10535eab5503034eca2d27496e2 SHA512 8c77ac2c7a6204cb7be8c654b1e8d4cce351dc83eed71c9d1714dd697fc6d17aaa4caf55e361f31994e0f201b6ac4bbce87bb01e1717806c3a4dcf367720d9ca
+EBUILD scons-3.0.1-r1.ebuild 1967 BLAKE2B ae9dfc2809576dfa427c386d3943a15d39710f6401ea86ecc99f68420b11b07df817873b801df0a1802f0f51d973ee90bf7af2eceb79faabe39c70aa7972011b SHA512 58e7761c68debf79f1740f02800e94271b7339981696870411b8179b4e4e0156d8921b08c758f31ebf085da89fd4f0e880472787835ac2bc464c50a17df9a3c6
+EBUILD scons-3.0.1-r2.ebuild 2063 BLAKE2B e2112913d1726903f0852585e3d93c029104fd83c5a598ebef1562e344e9c804d495669e74a2b9fe2f2e05362308fae60f29d3315ab028b72ee25a16830191e2 SHA512 a359c4f0dc2daea7dc12200d8dfeb91bd3e7d4768de2b807f82e863dd468251264e250061ec1088550d096a18005947a5f0f622aedf1eb721ce7cd920758d67c
+EBUILD scons-3.0.1.ebuild 1738 BLAKE2B eb1430c2c64fe79b36cf776b1df482726982e7b871393e5f1e829e2e5e02c21a1db129248121435b97bd8288f4aed5cbde3a0f167041d8a0c26fe86575903062 SHA512 1454bc63720c78d58362ae72d311d3fd4b81ef8b01900cb36f6cda2aab235d06a4fb6c2631927ac4efcee0fc761c6a672a925bda248a7def5d49b43529d042d8
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/files/scons-3.0.1-env-passthrough.patch b/dev-util/scons/files/scons-3.0.1-env-passthrough.patch
new file mode 100644
index 000000000000..16de316766b1
--- /dev/null
+++ b/dev-util/scons/files/scons-3.0.1-env-passthrough.patch
@@ -0,0 +1,40 @@
+From f2f8536be12f1d095382e7598060c1eb51eb5337 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 9 May 2018 17:04:49 +0200
+Subject: [PATCH] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1
+
+Support GENTOO_SCONS_ENV_PASSTHROUGH=1 variable to override the default
+of wiping the environment and resetting PATH to default, and instead
+pass all variables through.
+---
+ src/engine/SCons/Platform/posix.py | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
+index 8db08db1..af34650c 100644
+--- a/src/engine/SCons/Platform/posix.py
++++ b/src/engine/SCons/Platform/posix.py
+@@ -87,9 +87,17 @@ def generate(env):
+     pspawn = piped_env_spawn
+     # Note that this means that 'escape' is no longer used
+ 
+-    if 'ENV' not in env:
+-        env['ENV']        = {}
+-    env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
++    # Force pass-through of environment variables in Gentoo builds
++    if os.environ.get('GENTOO_SCONS_ENV_PASSTHROUGH', False):
++        new_env = os.environ.copy()
++        if 'ENV' in env:
++            new_env.update(env['ENV'])
++        env['ENV'] = new_env
++    else:
++        if 'ENV' not in env:
++            env['ENV']        = {}
++        env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
++
+     env['OBJPREFIX']      = ''
+     env['OBJSUFFIX']      = '.o'
+     env['SHOBJPREFIX']    = '$OBJPREFIX'
+-- 
+2.17.0
+
diff --git a/dev-util/scons/files/scons-3.0.1-respect-cc-etc.patch b/dev-util/scons/files/scons-3.0.1-respect-cc-etc.patch
new file mode 100644
index 000000000000..345f39ca548e
--- /dev/null
+++ b/dev-util/scons/files/scons-3.0.1-respect-cc-etc.patch
@@ -0,0 +1,85 @@
+From 7dca875d157f477e05a652f4f1dd1b6903d9dc0a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 10 May 2018 08:01:08 +0200
+Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
+
+---
+ src/engine/SCons/Platform/posix.py | 17 +++++++++++++++++
+ src/engine/SCons/Tool/cc.py        |  3 ++-
+ src/engine/SCons/Tool/cxx.py       |  3 ++-
+ src/engine/SCons/Tool/link.py      |  3 ++-
+ 4 files changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
+index af34650c..ee7f96d5 100644
+--- a/src/engine/SCons/Platform/posix.py
++++ b/src/engine/SCons/Platform/posix.py
+@@ -93,6 +93,23 @@ def generate(env):
+         if 'ENV' in env:
+             new_env.update(env['ENV'])
+         env['ENV'] = new_env
++
++        # Furthermore, force common compiler/linker variables as well
++        envvar_mapping = {
++            'AR': 'AR',
++            'AS': 'AS',
++            'AS': 'ASFLAGS',
++            'CC': 'CC',
++            'CXX': 'CXX',
++            'CFLAGS': 'CFLAGS',
++            'CXXFLAGS': 'CXXFLAGS',
++            'CPPFLAGS': 'CPPFLAGS',
++            'LDFLAGS': 'LINKFLAGS',
++        }
++
++        for envvar, toolvar in envvar_mapping.items():
++            if toolvar not in env and envvar in env['ENV']:
++                env[toolvar] = env['ENV'][envvar]
+     else:
+         if 'ENV' not in env:
+             env['ENV']        = {}
+diff --git a/src/engine/SCons/Tool/cc.py b/src/engine/SCons/Tool/cc.py
+index 590ec5fd..5f9229a0 100644
+--- a/src/engine/SCons/Tool/cc.py
++++ b/src/engine/SCons/Tool/cc.py
+@@ -80,7 +80,8 @@ def generate(env):
+ 
+     if 'CC' not in env:
+         env['CC']    = env.Detect(compilers) or compilers[0]
+-    env['CFLAGS']    = SCons.Util.CLVar('')
++    if 'CFLAGS' not in env:
++        env['CFLAGS'] = SCons.Util.CLVar('')
+     env['CCCOM']     = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+     env['SHCC']      = '$CC'
+     env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
+diff --git a/src/engine/SCons/Tool/cxx.py b/src/engine/SCons/Tool/cxx.py
+index 430851c8..ca5ab563 100644
+--- a/src/engine/SCons/Tool/cxx.py
++++ b/src/engine/SCons/Tool/cxx.py
+@@ -74,7 +74,8 @@ def generate(env):
+ 
+     if 'CXX' not in env:
+         env['CXX']    = env.Detect(compilers) or compilers[0]
+-    env['CXXFLAGS']   = SCons.Util.CLVar('')
++    if 'CXXFLAGS' not in env:
++        env['CXXFLAGS'] = SCons.Util.CLVar('')
+     env['CXXCOM']     = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+     env['SHCXX']      = '$CXX'
+     env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
+diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py
+index 07e92507..614d1779 100644
+--- a/src/engine/SCons/Tool/link.py
++++ b/src/engine/SCons/Tool/link.py
+@@ -292,7 +292,8 @@ def generate(env):
+     env.Append(SHLIBEMITTER = [shlib_emitter])
+     env['SMARTLINK']   = smart_link
+     env['LINK']        = "$SMARTLINK"
+-    env['LINKFLAGS']   = SCons.Util.CLVar('')
++    if 'LINKFLAGS' not in env:
++        env['LINKFLAGS'] = SCons.Util.CLVar('')
+     # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
+     env['LINKCOM']     = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
+     env['LIBDIRPREFIX']='-L'
+-- 
+2.17.0
+
diff --git a/dev-util/scons/scons-3.0.1-r1.ebuild b/dev-util/scons/scons-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..212863e12920
--- /dev/null
+++ b/dev-util/scons/scons-3.0.1-r1.ebuild
@@ -0,0 +1,71 @@
+# 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 distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? (
+		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+	)
+	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+	# support env passthrough for Gentoo ebuilds
+	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
+)
+
+src_unpack() {
+	# use the git directory structure, but put pregenerated release
+	# inside src/ subdirectory to make our life easier
+	if use test; then
+		unpack "${P}.gh.tar.gz"
+		rm -r "${P}/src" || die
+	else
+		mkdir "${P}" || die
+	fi
+
+	cd "${P}" || die
+	unpack "${P}.tar.gz"
+	mv "${P}" src || die
+}
+
+src_prepare() {
+	# apply patches relatively to top directory
+	cd "${WORKDIR}/${P}" || die
+	distutils-r1_src_prepare
+
+	# remove half-broken, useless custom commands
+	# and fix manpage install location
+	sed -i -e '/cmdclass/,/}$/d' \
+		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
+}
+
+python_test() {
+	cd "${WORKDIR}/${P}" || die
+	"${EPYTHON}" runtest.py -as \
+		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		--builddir "${BUILD_DIR}/lib" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+	rm "${ED%/}/usr/bin/scons.bat" || die
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
diff --git a/dev-util/scons/scons-3.0.1-r2.ebuild b/dev-util/scons/scons-3.0.1-r2.ebuild
new file mode 100644
index 000000000000..78842609b21e
--- /dev/null
+++ b/dev-util/scons/scons-3.0.1-r2.ebuild
@@ -0,0 +1,73 @@
+# 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 distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? (
+		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+	)
+	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+	# support env passthrough for Gentoo ebuilds
+	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
+	# respect CC, CXX, C*FLAGS, LDFLAGS by default
+	"${FILESDIR}"/scons-3.0.1-respect-cc-etc.patch
+)
+
+src_unpack() {
+	# use the git directory structure, but put pregenerated release
+	# inside src/ subdirectory to make our life easier
+	if use test; then
+		unpack "${P}.gh.tar.gz"
+		rm -r "${P}/src" || die
+	else
+		mkdir "${P}" || die
+	fi
+
+	cd "${P}" || die
+	unpack "${P}.tar.gz"
+	mv "${P}" src || die
+}
+
+src_prepare() {
+	# apply patches relatively to top directory
+	cd "${WORKDIR}/${P}" || die
+	distutils-r1_src_prepare
+
+	# remove half-broken, useless custom commands
+	# and fix manpage install location
+	sed -i -e '/cmdclass/,/}$/d' \
+		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
+}
+
+python_test() {
+	cd "${WORKDIR}/${P}" || die
+	"${EPYTHON}" runtest.py -as \
+		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		--builddir "${BUILD_DIR}/lib" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+	rm "${ED%/}/usr/bin/scons.bat" || die
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
diff --git a/dev-util/scons/scons-3.0.1.ebuild b/dev-util/scons/scons-3.0.1.ebuild
new file mode 100644
index 000000000000..1a6f2c59360e
--- /dev/null
+++ b/dev-util/scons/scons-3.0.1.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 distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? (
+		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+	)
+	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc test"
+
+S=${WORKDIR}/${P}/src
+
+src_unpack() {
+	# use the git directory structure, but put pregenerated release
+	# inside src/ subdirectory to make our life easier
+	if use test; then
+		unpack "${P}.gh.tar.gz"
+		rm -r "${P}/src" || die
+	else
+		mkdir "${P}" || die
+	fi
+
+	cd "${P}" || die
+	unpack "${P}.tar.gz"
+	mv "${P}" src || die
+}
+
+src_prepare() {
+	# apply patches relatively to top directory
+	cd "${WORKDIR}/${P}" || die
+	distutils-r1_src_prepare
+
+	# remove half-broken, useless custom commands
+	# and fix manpage install location
+	sed -i -e '/cmdclass/,/}$/d' \
+		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
+}
+
+python_test() {
+	cd "${WORKDIR}/${P}" || die
+	"${EPYTHON}" runtest.py -as \
+		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		--builddir "${BUILD_DIR}/lib" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+	rm "${ED%/}/usr/bin/scons.bat" || die
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 8d1fde24f135..e2d157e7af9f 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
index 17757cf2aab6..43627fe05168 100644
--- a/dev-vcs/kdesvn/Manifest
+++ b/dev-vcs/kdesvn/Manifest
@@ -1,5 +1,6 @@
 AUX kdesvn-2.0.0-deps.patch 1436 BLAKE2B edce1dd6ed89dd991b790aae05da128e585bafc20be94dd220176ec264b9db38c15973ea0b2ec7e4ba566849897bf82d25593a598c31c27e3c128defd725354b SHA512 8a4dffee12f8974d60662b4035baa564f02e69e6f24d81c8e63f03c102302c3b617c5b02a5734616fa614ac6984db600da8765aa1fddf78b2d07ed38436d9c36
 AUX kdesvn-2.0.0-desktop.patch 654 BLAKE2B 8f28395849e732c499ac205970da753af9ba7532cc078321fdb4c214927da38a7f566d7e5c3e30faa46e494599a5ee3c5a49604ccd58969f7fc0d10769b3fac8 SHA512 f12b78a2f5640639a9dc781b8754b7dbdc31fa8198c0f3157771ef199e0d17acb86cd592cb903022ee46fca035c55d6cb80108b76891454ceb630086d88be6eb
+AUX kdesvn-2.0.0-qt-5.11.patch 706 BLAKE2B 8c8aae9d62aae648b6c72239c3ebaf13202953b583c8b6b471e9cd142f04701a5bd1c479eb1388a90732ce379f06ff88855ae5a706a0fae249769709c5da2724 SHA512 f706636642d26f9c97f4c917ac388c9903bce9349dc0607cf35e88d72c70e60a969c0ad94cae0896ed5dddea0ff22341ef720a150d1f20224b285c40c3dcc9c4
 DIST kdesvn-2.0.0.tar.xz 2014660 BLAKE2B 41999913ecb1cd3a526bc898feaddd1385773ffdd64bee4b037625745172da62281cf34da284d1dabdae652fad0e4ab31bf0d305ca30309290c35003a2488d9c SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2
-EBUILD kdesvn-2.0.0.ebuild 1541 BLAKE2B e02b19387f1e72f61d86b0e016bb6cc00a12d0908301e1114b0ce55268144fc5194aa80e7d99788def8aac4ff001559a7b284ede20f3e67b69de11bf1c500cec SHA512 4bf6cc1aa219d9911e9f471fa4d1e7c59a27fe48600becae7f34a9f52730b5eda6a9215a449148cd6660f3055d3e44066b35ef8a2909e9d42ba276bfbfd63c3b
+EBUILD kdesvn-2.0.0.ebuild 1575 BLAKE2B 66adeca1e53695dd3d268c0f877c88b0d50782c6f68e3d71602621dd4cc6b9313a40dfebd733e9446bd51d541650387132b570ee72e3c29e18f6b202cc1bd775 SHA512 9f14f4b5802c74c3019ddff981cc0676ca678a3c391169337238305ddf9deeb8044780986acb24923b95554269c19deb39d402cf203b435ad1f6f9d0d6657004
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch
new file mode 100644
index 000000000000..019d2271001a
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch
@@ -0,0 +1,25 @@
+From 605484fd9fc873b9b8d571f398c3cab05c68d860 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Thu, 10 May 2018 09:28:15 +0200
+Subject: Fix build with Qt 5.11
+
+Some includes added transitively previously now need to be explicitly
+put.
+---
+ src/svnfrontend/blamedisplay.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/svnfrontend/blamedisplay.cpp b/src/svnfrontend/blamedisplay.cpp
+index 2d87502..5673181 100644
+--- a/src/svnfrontend/blamedisplay.cpp
++++ b/src/svnfrontend/blamedisplay.cpp
+@@ -30,6 +30,7 @@
+ #include <KTextEdit>
+ #include <KTreeWidgetSearchLine>
+ 
++#include <QAction>
+ #include <QBrush>
+ #include <QFontDatabase>
+ #include <QInputDialog>
+-- 
+cgit v0.11.2
diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
index 483633ed6ea6..b89d778a3a1f 100644
--- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-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=6
@@ -53,6 +53,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${P}-desktop.patch"
 	"${FILESDIR}/${P}-deps.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
 )
 
 src_prepare(){
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 49abf87ea2de..b00ac0f53009 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 7b388849df60..467f955f5e9a 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -110,11 +110,12 @@ fcaps() {
 		root=${EROOT:-${ROOT}}
 		;;
 	esac
+	root=${root%/}
 
 	# Process every file!
 	local file
 	for file ; do
-		[[ ${file} != /* ]] && file="${root}${file}"
+		[[ ${file} != /* ]] && file="${root}/${file}"
 
 		if use filecaps ; then
 			# Try to set capabilities.  Ignore errors when the
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
index 02c9061ba95d..5335968bc52e 100644
--- a/eclass/scons-utils.eclass
+++ b/eclass/scons-utils.eclass
@@ -93,7 +93,7 @@
 # -- EAPI support check --
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5|6|7) ;;
+	0|1|2|3|4|5|6) ;;
 	*) die "EAPI ${EAPI} unsupported."
 esac
 
@@ -135,6 +135,9 @@ escons() {
 		_scons_clean_makeopts
 	fi
 
+	# pass ebuild environment variables through!
+	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
+
 	set -- scons ${SCONSOPTS} ${EXTRA_ESCONS} "${@}"
 	echo "${@}" >&2
 	"${@}"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 90b7f65ae3ca..a0262efe58d4 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest
index 52e3d74d5be6..600b261cab4d 100644
--- a/games-emulation/advancemame/Manifest
+++ b/games-emulation/advancemame/Manifest
@@ -1,5 +1,8 @@
 AUX advancemame-1.2-pic.patch 344 BLAKE2B 61e312fe33565171824e2e875a22187134bfc8905dfa2f6bc50b43427acd0f25502d1da1f7f591c1882e82f37d591c737af0aaaa98705c345637d786886e6c20 SHA512 5ae1a76a5e08e65efece7b295af7e177e8da7d65c7de9a03529d8a6909d38c6510d8c3e122bc4bc542760bc2cdf2e26a1edf56d27bcfa6b1fe25ea9c0f467360
 AUX advancemame-1.2-verboselog.patch 838 BLAKE2B 157d3797c5b92148d35f502fbc76aac9742c21b277d897308e4a074e1cba95b6fe1ea3e6b758be0a8d8b7e10fba5d33f5ac318d7c332f6bf622215627168646e SHA512 d34ff98ff2971a01dd46a66b322507afec4930f89afd2141e753233efeccdc582644dbf576eae08300c8e3be0336e09e56609983bcd602a69a47985ecd954e6e
+AUX advancemame-3.7-move_aclocal_to_acinclude.patch 2277 BLAKE2B f66691900297b845d9b20f93c989d4f31c7e9cd87be5168fc9e716080f6d23bcf590b372df3275149ad28927581d4e406a4bcd3bb6ba1af3b732f97c7f5483f6 SHA512 1ece971e4d51d4ac6e8bcc9b72413b6cb9d19206797131c1ed6af33da3eec18797be128776061a7478dac807dc4e83a75a9495dd0a6c788090f55eb13aeaa89b
+AUX advancemame-3.7-remove_static_configure_option.patch 1076 BLAKE2B 17014295ddf61b910376338998791b645157175b640839ba076c72861cc643c2c5d969139230e7c49ee5e60ce790a100fc3f1612d2370e6bcb3a7a9f37ae4f14 SHA512 b7c1c961c123d8a175325626005c8d2081ba98f0f392dabde795732340f323caf513c6b691790afe254860044fca97cf497209d94dc0ff6e1d98fc8df4bda563
+DIST advancemame-3.7-use_pkgconfig_for_freetype_and_sdl.patch 21144 BLAKE2B ba374d664db45f938d3b054820868b5aaa63a7461938f5e8a320dc607ef3444c8fc5f87cdd3ef9db130c1048ef9e75afed4f856997f048bcb44eb99d3bcbaefc SHA512 80136d71117329997846fe0f03a3cf3439ee8ff3db649f50a3008595ed2d82cd0e3dcd9c6908edf30e19d516943eeed129eb994a6326effaf94a7eaa5d1b8fa2
 DIST advancemame-3.7.tar.gz 25616260 BLAKE2B 455004ff7ce3f7517c6b06767e9d1656bff6b93f822d363cbd42738e0f9ba988c243f600db5f20e24897c27faaf5c458072e2bc9c97cf92803f76299cf3010b8 SHA512 b5af59cdd3cf70dfae0769ed35eb6ce00a6f01d05eefcb687f322420faa2ee5aabf83394249c2ab7f7f1241d3fd09c2f0412666b2dbd27b91e7bc3622f925f74
-EBUILD advancemame-3.7.ebuild 1827 BLAKE2B 685e054241036197c4e387d16a0b89167a37f12f10e57c5965fb7e3ebdf369f985c4c35e07dee275574ae77c5128d3676b6e53a4df22346485f57995bda1c247 SHA512 99ea75cdcb038bfb36d1cdc625162767867b72031c0823ad09386664f00c9c283a25df2b2b65f1ec74e65e955a656de2c721af6b7a6984131fc8f9a32ae70e99
+EBUILD advancemame-3.7.ebuild 2156 BLAKE2B 269e0044b610bf6c51d2de3cc689c3b4cf6a8529d66b94d08344404ae21eb64c5e225a7651e4639fff08373936a029d3815b32bc461c3706168d18bca7066546 SHA512 0cbe417469a221e735bdfc71b02f1b69e487e9fa903a7ff94a967ef7cc2364966ebf7107985d2cdbfdd760ee5b9492c60e2623782422f20c1e2c7aca1b86ba0d
 MISC metadata.xml 1139 BLAKE2B 0722cccd2aa4d9e24eb990e460c91d8df503c1adffa680ac5e1f2b900bdfc93099feb06aab43b43ce27defc3183c6b75c594ce99e7f1396f5512babfc9de68d0 SHA512 a9a85b10cfbf6c7a75c317db8d242d29655d14d9891b897171161af613221fe93ad776ddb53fcddd14f08295d1e02c3c3fbccdce027e2a0d1c434fe60e49f349
diff --git a/games-emulation/advancemame/advancemame-3.7.ebuild b/games-emulation/advancemame/advancemame-3.7.ebuild
index 37773715f8e2..c371c14107c3 100644
--- a/games-emulation/advancemame/advancemame-3.7.ebuild
+++ b/games-emulation/advancemame/advancemame-3.7.ebuild
@@ -2,12 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu"
 HOMEPAGE="http://www.advancemame.it/"
 SRC_URI="https://github.com/amadvance/advancemame/releases/download/v${PV}/${P}.tar.gz"
 
+# Fetch too big upstream patch
+SRC_URI+=" https://github.com/amadvance/advancemame/commit/70f099ac49786a287ebd3949ce8f8670a5731abd.patch -> ${PN}-3.7-use_pkgconfig_for_freetype_and_sdl.patch"
+
 LICENSE="GPL-2 XMAME"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -25,20 +28,28 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/os-headers
+	virtual/pkgconfig
 	x86? ( >=dev-lang/nasm-0.98 )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2-pic.patch"
+	"${FILESDIR}"/${PN}-1.2-verboselog.patch
+
+	# Patches from upstream
+	"${FILESDIR}/${P}-move_aclocal_to_acinclude.patch"
+	"${DISTDIR}/${P}-use_pkgconfig_for_freetype_and_sdl.patch"
+	"${FILESDIR}/${P}-remove_static_configure_option.patch"
+)
+
 src_prepare() {
 	default
-
-	eapply "${FILESDIR}/${PN}-1.2-pic.patch" \
-		"${FILESDIR}"/${PN}-1.2-verboselog.patch
+	eautoreconf
 
 	sed -i -e 's/"-s"//' configure || die
 
 	use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
 	ln -s $(type -P sdl2-config) "${T}/${CHOST}-sdl2-config"
-	use truetype && ln -s $(type -P freetype-config) "${T}/${CHOST}-freetype-config"
 }
 
 src_configure() {
@@ -55,7 +66,6 @@ src_configure() {
 		--enable-zlib \
 		--disable-slang \
 		--disable-svgalib \
-		--disable-static \
 		$(use_enable alsa) \
 		$(use_enable fbcon fb) \
 		$(use_enable oss) \
diff --git a/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch b/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch
new file mode 100644
index 000000000000..4a30e179ae27
--- /dev/null
+++ b/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch
@@ -0,0 +1,78 @@
+From b0edfe1e5bb1a705fad539e5ab1c299d38dcf9d4 Mon Sep 17 00:00:00 2001
+From: Andrea Mazzoleni <amadvance@gmail.com>
+Date: Tue, 8 May 2018 18:55:39 +0200
+Subject: [PATCH 1/3] Use acinclude instead of aclocal
+
+aclocal.m4 is generated automatically, and we don't have to lose the content.
+---
+ acinclude.m4 | 20 ++++++++++++++++++++
+ aclocal.m4   | 29 ++++++++++++-----------------
+ 2 files changed, 32 insertions(+), 17 deletions(-)
+ create mode 100644 acinclude.m4
+
+diff --git a/acinclude.m4 b/acinclude.m4
+new file mode 100644
+index 00000000..ceed823a
+--- /dev/null
++++ b/acinclude.m4
+@@ -0,0 +1,20 @@
++dnl @synopsis AC_CHECK_CC_OPT(flag, ifyes, ifno)
++dnl 
++dnl Shows a message as like "checking wether gcc accepts flag ... no"
++dnl and executess ifyes or ifno.
++
++AC_DEFUN([AC_CHECK_CC_OPT],
++[
++AC_MSG_CHECKING([whether ${CC-cc} accepts $1])
++echo 'void f(){}' > conftest.c
++if test -z "`${CC-cc} -c $1 conftest.c 2>&1`"; then
++  AC_MSG_RESULT([yes])
++  $2
++else
++  AC_MSG_RESULT([no])
++  $3
++fi
++rm -f conftest*
++])
++
++
+diff --git a/aclocal.m4 b/aclocal.m4
+index d6e7b527..56e944be 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1,20 +1,15 @@
+-dnl @synopsis AC_CHECK_CC_OPT(flag, ifyes, ifno)
+-dnl 
+-dnl Shows a message as like "checking wether gcc accepts flag ... no"
+-dnl and executess ifyes or ifno.
++# generated automatically by aclocal 1.15 -*- Autoconf -*-
+ 
+-AC_DEFUN(AC_CHECK_CC_OPT,
+-[
+-AC_MSG_CHECKING([whether ${CC-cc} accepts $1])
+-echo 'void f(){}' > conftest.c
+-if test -z "`${CC-cc} -c $1 conftest.c 2>&1`"; then
+-  AC_MSG_RESULT([yes])
+-  $2
+-else
+-  AC_MSG_RESULT([no])
+-  $3
+-fi
+-rm -f conftest*
+-])
++# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+ 
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
++m4_include([acinclude.m4])
+-- 
+2.17.0
+
diff --git a/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch b/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch
new file mode 100644
index 000000000000..342ba1c5c07a
--- /dev/null
+++ b/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch
@@ -0,0 +1,41 @@
+From 890af36a3939f0978af779caa878ddeb44183d8d Mon Sep 17 00:00:00 2001
+From: Andrea Mazzoleni <amadvance@gmail.com>
+Date: Tue, 8 May 2018 19:32:44 +0200
+Subject: [PATCH 3/3] Remove the --enable-static configure option
+
+I doubt it still work and it doesn't make sense anymore.
+---
+ configure.ac | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4e609993..1c94e037 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -139,13 +139,6 @@ AC_ARG_ENABLE(
+ )
+ AC_SUBST([CONF_DEBUG],[$ac_enable_debug])
+ 
+-AC_ARG_ENABLE(
+-	[static],
+-	AC_HELP_STRING([--enable-static],[enable static compilation. (default no)]),
+-	[ac_enable_static=$enableval],
+-	[ac_enable_static=no]
+-)
+-
+ AC_ARG_ENABLE(
+ 	[bare],
+ 	AC_HELP_STRING([--enable-bare],[enable compilation without drivers. (default no)]),
+@@ -232,9 +225,6 @@ if test $ac_auto_ldflags = yes ; then
+ 	else
+ 		LDFLAGS="-s"
+ 	fi
+-	if test $ac_enable_static = yes ; then
+-		LDFLAGS="-static $LDFLAGS"
+-	fi
+ 	if test ! -z $ac_host_ldflags; then
+ 		LDFLAGS="$ac_host_ldflags $LDFLAGS"
+ 	fi
+-- 
+2.17.0
+
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 2e43bd319fad..0d0041f1f14a 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 0693416afef3..dd303f11c959 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,5 +1,7 @@
 AUX urbanterror-4.3-fix-build_system.patch 2774 BLAKE2B d750fab8dcf67e6ac37d6b9e44abf3c7961320bbd51093b198d31e470396dc415219b09ac910a7938a557b6af4d9df39bb7f35cf5e90bb56f97cd334b584db4c SHA512 90d06ee5bb77e13e34923f446c0e8e90fdef5628c6199a4f9508336aa0bb30c0ab273ac794a8eb483c2534e64bf81f76ef449ed90000314f227d39de572809f2
 AUX urbanterror-4.3.3_p20180218-fix-loop.patch 1442 BLAKE2B 045a018bb3476f94b471f62ccf3bacce2b68523de235698b47f2e98979f3a1284b826e9dc74f4fd225ba930057df6d9bed599872568330952fa4ffe0389e2563 SHA512 7a31cded5b99fda6f4c92f5d1ce9ef7606dc87f08a70efc3aea970e6a870e22aeb0a772f63a11d151cd227f68803e028b2f5adee381d8f65c523c585a474b53c
 DIST urbanterror-4.3.3_p20180218.tar.gz 10069644 BLAKE2B ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624 SHA512 e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8
+DIST urbanterror-4.3.3_p20180410.tar.gz 10070300 BLAKE2B c81b93137b7c528354b3d894d45636195947ab4f7e3e8af031e8c164114fa3db16d500046187ce5ad688a6d6c65844b1b1b1282773c2171b38f59c7093d251dd SHA512 ea9021543c91ef7619f1f15febecd36c1e38a382c4959d5916022c108458a17f3649ac74784da0c06ef2ed738390bd247888ca4ba8d033b8c1121ab9540dcb31
 EBUILD urbanterror-4.3.3_p20180218.ebuild 4533 BLAKE2B c54b46f90dbb630a5cfe81580d2f48715ced43be8d4ed202a83617f7b33e0d0252d8aeed1e88fcaa0046e81ed33828fd69816a995185cab0eaf14ac527188b5c SHA512 3b4e1fc69e35c3db3c0b189618ecd79da61f9f9a5a1b63b8a4041fa91e5baecbaaa18758344b7f6f3ac1952a645ceb1d81b33966bbe079c81e9d1571b57f63cc
+EBUILD urbanterror-4.3.3_p20180410.ebuild 4525 BLAKE2B d78cc0eeba336a087817cbce73a85f2d907a9db0fee377ee2391306943420708796dee2300aa5d482f595fed06c474c582dde94f14f7ad4bc599030392ffe8c8 SHA512 ab20a9be4d1295f4c8592da8be629032ab1ecc23b64c76a9d9b91aad033114abbcddc90594e6123c452a1695ebed51a3a7be34d45acd11b385071d69454fcdc2
 MISC metadata.xml 1109 BLAKE2B 9e9f6a21667badafad0c007a2694a50ceaa467ce28fdc9b3f8838d58dd201f56b0b08c78d3285dfd53dd14db6c5ab26461cb400308abc920ce234048fdc48f8b SHA512 cb55a92c3c03065a17f71e5cfc8151a8c12acbc341389a14f96119960eb23c11613adaa8e9b552946d2db728121118a5130447c892d61a1a909b4dd8b94a5dcc
diff --git a/games-fps/urbanterror/urbanterror-4.3.3_p20180410.ebuild b/games-fps/urbanterror/urbanterror-4.3.3_p20180410.ebuild
new file mode 100644
index 000000000000..ebea9db38f90
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.3_p20180410.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit desktop eapi7-ver flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
+	EGIT_BRANCH="urt"
+else
+	COMMIT_ID="d6db4589efd1ff2b7a4fa2983e58993d06098327"
+	SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ioq3-${COMMIT_ID}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
+REQUIRED_USE="|| ( client server )
+		voip? ( opus )"
+
+DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3-fix-build_system.patch
+	"${FILESDIR}"/${PN}-4.3.3_p20180218-fix-loop.patch
+)
+
+RDEPEND="
+	client? (
+		media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+		mumble? ( media-sound/mumble:= )
+		openal? ( media-libs/openal:= )
+		opus? ( media-libs/opusfile:= )
+		vorbis? ( media-libs/libvorbis:= )
+	)
+	curl? ( net-misc/curl )
+	~games-fps/urbanterror-data-4.3.3
+	sys-libs/zlib:=[minizip]
+	virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	if use client; then
+		if ! use openal && ! use opus && ! use vorbis; then
+			ewarn
+			ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
+		fi
+	fi
+}
+
+src_configure() {
+	default
+
+	tc-export CC
+}
+
+src_compile() {
+	# Workaround for used zlib macro, which got renamed in Gentoo
+	# wrt bug #449510
+	append-cppflags "-DOF=_Z_OF"
+
+	local myemakeargs=(
+		ARCH=$(usex amd64 "x86_64" "i686" )
+		DEFAULT_BASEDIR="/usr/share/urbanterror"
+		BUILD_CLIENT=$(usex "client" 1 0)
+		BUILD_SERVER=$(usex "server" 1 0)
+		BUILD_BASEGAME=1
+		BUILD_MISSIONPACK=0
+		BUILD_GAME_SO=0
+		BUILD_GAME_QVM=0
+		BUILD_STANDALONE=1
+		SERVERBIN="Quake3-UrT-Ded"
+		CLIENTBIN="Quake3-UrT"
+		USE_RENDERER_DLOPEN=0
+		USE_YACC=0
+		BASEGAME="q3ut4"
+		BASEGAME_CFLAGS="${CFLAGS}"
+		USE_OPENAL=$(usex "openal" 1 0)
+		USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
+		USE_CURL=$(usex "curl" 1 0)
+		USE_CURL_DLOPEN=$(usex "curl" 1 0)
+		USE_CODEC_VORBIS=$(usex "vorbis" 1 0)
+		USE_CODEC_OPUS=$(usex "opus" 1 0)
+		USE_MUMBLE=$(usex "mumble" 1 0)
+		USE_SKEETMOD=$(usex "skeetshootmod" 1 0)
+		USE_VOIP=$(usex "mumble" 1 0)
+		USE_INTERNAL_LIBS=0
+		USE_LOCAL_HEADERS=0
+		USE_ALTGAMMA=$(usex "altgamma" 1 0)
+		$(usex "debug" "debug" "release")
+	)
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myarch=$(usex amd64 "x86_64" "i386")
+	local myreleasetype=$(usex debug "debug" "release")
+
+	if use client; then
+		newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT.${myarch} ${PN}
+		# Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
+		make_desktop_entry ${PN} "UrbanTerror" ${PN}
+	fi
+
+	if use server && ! use client; then
+		# dedicated server only
+		newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT-Ded.${myarch} ${PN}-ded
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use client && xdg_desktop_database_update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# ^this is a new installation, so:
+		if use openal; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta s_useopenal \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
+		fi
+
+		if use altgamma; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta r_altgamma \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
+			elog "Be aware that altgamme works on a global scale, so external"
+			elog "applications like redshift can cause trouble. Disabling"
+			elog "these while playing is a usable workaround."
+		fi
+
+		if ! use altgamma; then
+			elog ""
+			elog "If you are using a modesetting graphics driver you might"
+			elog "consider setting USE=\"altgamma\"."
+			elog "For details take a look at:"
+			elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
+		fi
+
+		if ! use client; then
+			elog ""
+			elog "You disabled client support. You won't be able to connect"
+			elog "to any servers and play. If you want to do so, enable"
+			elog "USE=\"client\"."
+		fi
+
+		if use skeetshootmod; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta sv_skeetshoot \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	use client && xdg_desktop_database_update
+}
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index a0885e68e44b..a177b82db212 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index bab5f2d7204c..36721103acef 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,5 +1,6 @@
-DIST openrct2-0.1.1.tar.gz 6284135 BLAKE2B 71ac2671c42fb679f5430ef0d0bd5e05d112aebd20b4b59e05e3527bacf24137b81bcedc72f9cc86cbf0b7612d6dc14c82881a828108aa5b16b8ddeeed78c46e SHA512 fd84907819ac317af88c0446afcb04acdb43cd6671f0837f1294191aacf58e93887d46e6eb28d86f558577f4e7c834bc42a9ec486f67e0b64cb7bc0cc1bda427
-DIST openrct2-title-sequence-v0.1.0.zip 1766393 BLAKE2B 19612ba78572c4f271349387a24fc9caf389552ad78841ed86ff069c20686da339c83cabe041a1ae240055721984372f1ef20bd009f1ac8b38bf3ff82297b29a SHA512 0d1b47c5fc5d1d9e5580b30d0f43d5532b388f1a5685060ca9313ec2f76c61a5fc96b8aa37689072b71edd9fb1aedddd46fa38c237ccb7198841d7bc33bf2a2b
-EBUILD openrct2-0.1.1.ebuild 2184 BLAKE2B c1eec024209ec2b6348be961416506469abc6259e2ad531764bf849e1e98b59efefcf84d7b5f01f0fcfacd022764ff46f6d0e002e86c283a2413aad6efe03354 SHA512 b3dabb2a44d2d3617db03d5049a3c29b3e03fd5c653eb6058f1470f72ac62b0d8fa8490d67f8bca932ab5094b0c500393477c0923ffbab13bc14db851d847896
-EBUILD openrct2-9999.ebuild 2184 BLAKE2B c1eec024209ec2b6348be961416506469abc6259e2ad531764bf849e1e98b59efefcf84d7b5f01f0fcfacd022764ff46f6d0e002e86c283a2413aad6efe03354 SHA512 b3dabb2a44d2d3617db03d5049a3c29b3e03fd5c653eb6058f1470f72ac62b0d8fa8490d67f8bca932ab5094b0c500393477c0923ffbab13bc14db851d847896
+DIST openrct2-0.1.2.tar.gz 6769785 BLAKE2B 0cc6ef6c68c1db6c822dd6038bc2d115f487a52b5891316273ee36db1713913baa2f119dabace88a37c16f87c90b14cf84df75a24b26b22571e98966afd2adbc SHA512 489dac96e1eda1449680f98a4b500eeb7b3f1ffbdaa5a5c701300071eb3a7862c65fa5a81e769083927b95a14914db54307724756a9841cff0c769c9e5471adc
+DIST openrct2-objects-v1.0.zip 2050225 BLAKE2B 52ae6f5ab4de5d4b121cea6a3d6711b04f1c4857795c995f7568e3be2862409104be55e233781ff6708c7e821f49af8e91f9f4c87c037b6a8a77698534747925 SHA512 a125fee04c12c49ffd16880eb5b8722e25c5fb82adae305d9904c3a6251c83e73e4a29c7e3694acee3abf336894759cfbff94018c6b210df4d794ca3ec34dc84
+DIST openrct2-title-sequence-v0.1.2.zip 4073116 BLAKE2B a36fb07e8da62afce129f2224f4cf5cc226922094132a3dc515fda1f02e0f8bbe07c973363f824ae58a54a26f252ad96f3f673bf5f142be5c964f45b6f712ed6 SHA512 7592c5397ceb27347c127ae5c4f8e11d7ef2ff23c97f627b354f941894420f546ffdcff88e2348e42c82d182ccf620e739c745d894a9b5650a0d7d028b68a106
+EBUILD openrct2-0.1.2.ebuild 2325 BLAKE2B 7e7f5b87be6b5182bd64a746ba2e80732309277fc635cea93b0867ba65beff9f10bf13792d3e5b31ef42d3c217a5e58aa9b643a3e6aab811281a1a7628c61839 SHA512 ec94c4ff953d139ba359cabf6c064de04b64bf17bdd9f5230ca8ed39aaf7089828425507ce8f6ad247a1f763c9a6a5b4974dd8bcd773e363eac07f61256c5efa
+EBUILD openrct2-9999.ebuild 2571 BLAKE2B b04b112df994b6ea260407bd396a724c5eb772f06fb58b0e5dc99fdf8e0c3ec792354265123db0b8ff92d6a856f6210c789949d4b4a6ab5c53f5046587fcf93e SHA512 689c71dbc7d1a297fc61e73c6fecdc678b9e800ea557e26a1cc4afbdede49e28c71cf1a3e91b15b4b7cd4ad0ec41cdfdfdedebc7e95f95d54979cc3c9ce6af4c
 MISC metadata.xml 967 BLAKE2B 6dc048c366eb9719d895ab269a207a51f233125ee0861e360bf0d65a2de0d56b8bed7147f71bbf1d8c4b286a843a3542e74e17c8e3231682742435a2b28dfef0 SHA512 874ed9f406c5219bc5c6102b775a53b4e2526ff0f7cfa0dd9b5511717d10ee1fd63012cd19a926904b556195a12a7e2328548de9d1000605afdc471db513198f
diff --git a/games-simulation/openrct2/openrct2-0.1.1.ebuild b/games-simulation/openrct2/openrct2-0.1.1.ebuild
deleted file mode 100644
index cc286b38589e..000000000000
--- a/games-simulation/openrct2/openrct2-0.1.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.website/"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"
-	EGIT_BRANCH="develop"
-	inherit git-r3
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/OpenRCT2-${PV}"
-fi
-
-TSV="0.1.0"
-SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="libressl +multiplayer opengl test truetype +twitch"
-
-# This is needed because of this bug: https://github.com/OpenRCT2/OpenRCT2/issues/5469
-REQUIRED_USE="multiplayer? ( twitch )"
-
-RDEPEND="
-	>=dev-libs/jansson-2.5
-	>=dev-libs/libzip-1.0
-	media-libs/libpng:0=
-	media-libs/libsdl2
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	multiplayer? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	opengl? ( virtual/opengl )
-	truetype? (
-		media-libs/sdl2-ttf
-		media-libs/fontconfig
-	)
-	twitch? ( net-misc/curl[ssl] )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-if [[ ${PV} == 9999 ]]; then
-src_unpack() {
-	default
-	git-r3_src_unpack
-}
-fi
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_HTTP_TWITCH="$(usex !twitch)"
-		-DDISABLE_NETWORK="$(usex !multiplayer)"
-		-DDISABLE_OPENGL="$(usex !opengl)"
-		-DDISABLE_TTF="$(usex !truetype)"
-		-DWITH_TESTS="$(usex test)"
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DDISABLE_RCT2_TESTS=ON
-		-DSYSTEM_GTEST=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/openrct2/title
-	doins "${WORKDIR}"/*.parkseq
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		ewarn ""
-		ewarn "You need the original RollerCoaster Tycoon 2 files to play this game."
-		ewarn "See: https://github.com/OpenRCT2/OpenRCT2/wiki/Required-RCT2-files#how-to-retrieve"
-		ewarn ""
-	fi
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-simulation/openrct2/openrct2-0.1.2.ebuild b/games-simulation/openrct2/openrct2-0.1.2.ebuild
new file mode 100644
index 000000000000..ae25725577a7
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.1.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
+HOMEPAGE="https://openrct2.website/"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"
+	EGIT_BRANCH="develop"
+	inherit git-r3
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/OpenRCT2-${PV}"
+fi
+
+TSV="${PV}"
+SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="libressl +multiplayer opengl test truetype +twitch"
+
+RDEPEND="
+	>=dev-libs/jansson-2.5
+	>=dev-libs/libzip-1.0
+	media-libs/libpng:0=
+	media-libs/libsdl2
+	media-libs/speexdsp
+	multiplayer? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	opengl? ( virtual/opengl )
+	truetype? (
+		media-libs/sdl2-ttf
+		media-libs/fontconfig
+	)
+	twitch? ( net-misc/curl[ssl] )
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? ( dev-cpp/gtest )
+"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	mkdir -p "${S}/data/title" || die
+	pushd "${S}/data/title" || die
+	unpack ${PN}-title-sequence-v${TSV}.zip
+	popd || die
+}
+
+src_prepare() {
+	sed -i CMakeLists.txt -e 's/-Werror//' || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_HTTP_TWITCH="$(usex !twitch)"
+		-DDISABLE_NETWORK="$(usex !multiplayer)"
+		-DDISABLE_OPENGL="$(usex !opengl)"
+		-DDISABLE_TTF="$(usex !truetype)"
+		-DWITH_TESTS="$(usex test)"
+		-DDOWNLOAD_TITLE_SEQUENCES=OFF
+		-DDISABLE_RCT2_TESTS=ON
+		-DSYSTEM_GTEST=ON
+		-DBUILD_SHARED_LIBS=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn ""
+		ewarn "You need the original RollerCoaster Tycoon 2 files to play this game."
+		ewarn "See: https://github.com/OpenRCT2/OpenRCT2/wiki/Required-RCT2-files#how-to-retrieve"
+		ewarn ""
+	fi
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index cc286b38589e..1058facd68fd 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
 HOMEPAGE="https://openrct2.website/"
@@ -18,22 +18,21 @@ else
 	S="${WORKDIR}/OpenRCT2-${PV}"
 fi
 
-TSV="0.1.0"
+TSV="0.1.2"
 SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
 
+OBJV="1.0"
+SRC_URI+=" https://github.com/OpenRCT2/objects/releases/download/v${OBJV}/objects.zip -> ${PN}-objects-v${OBJV}.zip"
+
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="libressl +multiplayer opengl test truetype +twitch"
 
-# This is needed because of this bug: https://github.com/OpenRCT2/OpenRCT2/issues/5469
-REQUIRED_USE="multiplayer? ( twitch )"
-
 RDEPEND="
 	>=dev-libs/jansson-2.5
 	>=dev-libs/libzip-1.0
 	media-libs/libpng:0=
 	media-libs/libsdl2
-	>=media-libs/speex-1.2.0
 	media-libs/speexdsp
 	multiplayer? (
 		libressl? ( dev-libs/libressl:0= )
@@ -47,15 +46,33 @@ RDEPEND="
 	twitch? ( net-misc/curl[ssl] )
 "
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	test? ( dev-cpp/gtest )
 "
 
-if [[ ${PV} == 9999 ]]; then
 src_unpack() {
-	default
-	git-r3_src_unpack
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	mkdir -p "${S}/data/title" || die
+	pushd "${S}/data/title" || die
+	unpack ${PN}-title-sequence-v${TSV}.zip
+	popd || die
+
+	mkdir -p "${S}/data/object" || die
+	pushd "${S}/data/object" || die
+	unpack ${PN}-objects-v${OBJV}.zip
+	popd || die
+}
+
+src_prepare() {
+	sed -i CMakeLists.txt -e 's/-Werror//' || die
+
+	cmake-utils_src_prepare
 }
-fi
 
 src_configure() {
 	local mycmakeargs=(
@@ -65,20 +82,14 @@ src_configure() {
 		-DDISABLE_TTF="$(usex !truetype)"
 		-DWITH_TESTS="$(usex test)"
 		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DDISABLE_RCT2_TESTS=ON
+		-DDOWNLOAD_OBJECTS=OFF
 		-DSYSTEM_GTEST=ON
+		-DBUILD_SHARED_LIBS=ON
 	)
 
 	cmake-utils_src_configure
 }
 
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/openrct2/title
-	doins "${WORKDIR}"/*.parkseq
-}
-
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		ewarn ""
@@ -87,8 +98,12 @@ pkg_postinst() {
 		ewarn ""
 	fi
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index f23c48f62e3d..01a08ae9dc9f 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index f35e9f68a699..bfed69eef171 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,4 +1,6 @@
 AUX wesnothd.rc 502 BLAKE2B 70803edb2084abfee5382624adba4a31e0bd1d5e9e2a7d800f7732fb262bacc80eb39550f2c15d19b7be9bc626d07aa5eafca04ea07abfda92a1778681a51428 SHA512 5e0a4680a35f81e749b8e0d56e3cf372c4a13b19578deda072560d0c63460426d7bde3e0e955287c8fbc939c700dc487283373ff9bc72bbcd9cf633ddaeafc96
 DIST wesnoth-1.12.6.tar.bz2 387869758 BLAKE2B 53328f8ebbaaabb266064fea57c0d28779183ba1b77ae8522c4dbb01c4a9ad9068d76307b48cec6576648132bf34f9a45efdb93ad36e03d035ed06e84711c9b6 SHA512 12ca3b5de8fd385b05cc8e76604f7aed68127a7542599d6e97cce793e10636e00bd65dcb088701e20ccc7191f41b1d67a00b291f885df880fac00d13d6fbde7a
+DIST wesnoth-1.14.1.tar.gz 481355736 BLAKE2B 2cc41a36706919bbc505a9a6726ea9b0fbfd5bfde677da937fdde2645587f4407fb6ed2f7271efaf1763f9ab69a57d153130291d5dc0a79862e554963dd37079 SHA512 0372eb9479d3d24dc4bf692a83fe310d5b4493989f18f0a23070ee19a4bee2672efd38babe1579b08a321e3acba1ede5823376619c8a90102f968e53cc6e3f02
 EBUILD wesnoth-1.12.6.ebuild 3106 BLAKE2B 20d3d1069778f17dde09d92b734ca4aa1a9f6c20cf0cf65339a418c686e83e9a7b1d40e39aa823f467b50c62cf4cc7ec71a110ce390213189008940c0cfe3ef8 SHA512 3220f1581f8f4561d2c179267d47fd8c8c1eeb0a296467e6d07311635e01f2981b64b747377e229f0e3cd575accab4b66be99be36994b81400db20f56f795f5d
+EBUILD wesnoth-1.14.1.ebuild 2580 BLAKE2B 090b530d0ff6a130615181c7cfc14927431abba0f95ee868898b7ea90d98c9d5704bbcc945d18744b18937618851d691b4cd196ee1730a835dc63bdfcd1095a7 SHA512 50521d7edca1889cc3ec3d8185326dd6b83b14d57edabda5bd48ebab6f7abc2d54737da759bed0f44385c5b249b40917f8166aeed0379b132f3f7c1d847787e5
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.14.1.ebuild b/games-strategy/wesnoth/wesnoth-1.14.1.ebuild
new file mode 100644
index 000000000000..d66a51cc0288
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.14.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils user
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+	https://github.com/wesnoth/wesnoth"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi nls openmp server"
+
+RDEPEND="
+	>=dev-libs/boost-1.50:=[nls,threads,icu]
+	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+	!dedicated? (
+		dev-libs/glib:2
+		dev-libs/openssl:0=
+		>=media-libs/fontconfig-2.4.1
+		>=media-libs/sdl2-image-2.0.0[jpeg,png]
+		>=media-libs/sdl2-mixer-2.0.0[vorbis]
+		>=media-libs/sdl2-ttf-2.0.12
+		media-libs/libvorbis
+		>=x11-libs/pango-1.22.0
+		>=x11-libs/cairo-1.10.0
+		sys-libs/readline:0
+		dbus? ( sys-apps/dbus )
+		fribidi? ( dev-libs/fribidi )
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-libs/libX11
+"
+
+pkg_setup() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash -1 ${PN}
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use doc ; then
+		sed -i \
+			-e '/manual/d' \
+			doc/CMakeLists.txt || die
+	fi
+
+	# respect LINGUAS (bug #483316)
+	if [[ ${LINGUAS+set} ]] ; then
+		local langs
+		for lang in $(cat po/LINGUAS)
+		do
+			has $lang $LINGUAS && langs+="$lang "
+		done
+		echo "$langs" > po/LINGUAS || die
+	fi
+}
+
+src_configure() {
+	filter-flags -ftracer -fomit-frame-pointer
+	if [[ $(gcc-major-version) -eq 3 ]] ; then
+		filter-flags -fstack-protector
+		append-flags -fno-stack-protector
+	fi
+
+	# Work around eclass
+	append-flags -UNDEBUG
+
+	if use dedicated || use server ; then
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="ON"
+			-DENABLE_SERVER="ON"
+			-DSERVER_UID="${PN}"
+			-DSERVER_GID="${PN}"
+			-DFIFO_DIR="/run/wesnothd"
+			)
+	else
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="OFF"
+			-DENABLE_SERVER="OFF"
+			)
+	fi
+	mycmakeargs+=(
+		-Wno-dev
+		-DENABLE_GAME="$(usex !dedicated)"
+		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_NOTIFICATIONS="$(usex dbus)"
+		-DENABLE_FRIBIDI="$(usex fribidi)"
+		-DENABLE_OMP="$(usex openmp)"
+		-DENABLE_STRICT_COMPILATION="OFF"
+		-DCMAKE_INSTALL_PREFIX="/usr"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	DOCS="README.md changelog.md players_changelog.md" cmake-utils_src_install
+	if use dedicated || use server; then
+		keepdir "/run/wesnothd"
+		newinitd "${FILESDIR}"/wesnothd.rc wesnothd
+	fi
+}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index d8efd58ea947..d155bf902317 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
index 6df176b6b8c0..2660841af0de 100644
--- a/games-util/nml/Manifest
+++ b/games-util/nml/Manifest
@@ -1,4 +1,4 @@
 AUX nml-0.4.4-pillow3.patch 288 BLAKE2B 5d1446821d75432002a36439c6e39fa7f644f9a63be0da178c33287893fe65637d6ce66aa55df916227636cb8e0228a08e363a0b682b02dc63823a671b50849c SHA512 cdb6113102fadbf3b3d9cab930b15cfd88d609c9bb09048a3fb247051169933a0796c10d0c29b9d6bf9320ddcf73a4681255d8e1465a7a98268029d3433ba524
 DIST nml-0.4.4.tar.gz 377998 BLAKE2B a65df2c371c1b1dda2469a968372f21f9f27e9739c8d8a9a0f582c126169921ee3ffc9745f6ef4ac21aebdeea35fd26385d3149e84d50381c4796b71b378571f SHA512 fd7b8d7abfc8b5ea694eedf00bbc4069a82de942178a58ec05e9d3efe7c8663103ffb6b98f7614ce165eb7cba42cb4c7589f77fb67dd95eb6293f62b3179c7b0
-EBUILD nml-0.4.4-r1.ebuild 696 BLAKE2B 67e057ae09d01368159f7a2769cab4935c077a54c40b5b65641955acf8570f4b5ec6d42d961851f2f0bd41d2b255eeecfdc3921da71d796050069d1ad926c9af SHA512 404842e94347d163a876c07d1e28b117994d6c4fb94cad973b67f9240fbfcdc6043fa8c8820dfe5ca45e89ef04d689bf328737c2ad900fcd60b3688e15fe0a9d
+EBUILD nml-0.4.4-r1.ebuild 698 BLAKE2B 786f608cf31527a1c09fcb85cef1e17845d48bf60f121609d6b0cb474700ca9ea2e6b08b6525cae1d5d6b9b46616105cd1ab3bb53dafae288f1cab0da7d2702a SHA512 96a31fd9a4e41422edc6420008b27c592bdd8e30848b6ea0ba0206b80393d5322440a9781db8f159f7894d59846accdacc7caa8fc14b411823e8936307ea6e36
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/nml/nml-0.4.4-r1.ebuild b/games-util/nml/nml-0.4.4-r1.ebuild
index 81b58fd04e33..62f2f8ddbf5a 100644
--- a/games-util/nml/nml-0.4.4-r1.ebuild
+++ b/games-util/nml/nml-0.4.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Compiler of NML files into grf/nfo files"
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 78fe5b2c4406..d0c38cbc6eab 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index bcbeda2f3297..6d1329cd03a1 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -2,8 +2,10 @@ DIST gnome-commander-1.6.1.tar.xz 6550308 BLAKE2B d4353bce913a43e091f2d66b16c932
 DIST gnome-commander-1.6.3.tar.xz 6653164 BLAKE2B 04d39ad7e19939b1791de838a03a9406abb11599e8c43d86cf491aef087e9c78574d28bc076ceefab81a18f09fb1ac49b7cb893b0381a7890744a77438c53453 SHA512 92f138c3cff1b88b967340f945bfa58c5840fb3db806943b4d4eb87211fea10de01a8a365de6ca2b18cb0503bd850e758c3a37fe604b5402481c03e953e94dd3
 DIST gnome-commander-1.6.4.tar.xz 6678752 BLAKE2B 987aa7ff2b34df163a82a9e1964d21860a90ba2ff6fb71190ebfec245090a9ffea1aa8a45c037cd848135dec7a56b7cd26e31d70be8c5ce3f24ad132cff3b19a SHA512 00fcf86025b69a38e68b2c69977ffe54e8b00028176163ce746824a73faed55eeff2fe37eea2e191fd0e7fc1901e2ed701938c3fdfabe9e9b8bdaaec152df0e0
 DIST gnome-commander-1.8.0.tar.xz 7433656 BLAKE2B 686581eb6775e336928f18f3c817d4d34b19da2c5c91660e453223833b24f6bd1400d8ecf2ca3698fc18f2d926343006058b00fefda889204f251b223d6a2d34 SHA512 0023528301812431bffde4c0d314d07d2399d450604bf88426078cfbeed5ee286f16ad0037f85c2b281e9037fd0c622aa92a4a5be055c198d9bdbd3d211c197d
+DIST gnome-commander-1.8.1.tar.xz 7298888 BLAKE2B 57def43a8d8794ea813e6520c436d86f3fb9218e64f0b1e7280e03370870a29887737006e056ee0e2af78e12e225a8f5789c4f86f68eac13e27420cbef0fd2d7 SHA512 76efb88e1ee8843fcb9cf17c421dda1769d39b1bfd9d5c97e3ff570117bcac44dfd17a2efbda5079155115611b10b75644ec12df541bd6f7f8d0f65e471f6b32
 EBUILD gnome-commander-1.6.1.ebuild 1646 BLAKE2B eeda53ba1d8701c2b54b358dc6c8c602c90a229402aa50695a6cf2db8510138404ce5e021b25f2d5aac650557017696c453064d73e43bda7bc3e9120cb4c15de SHA512 d20e75f3636b5f38de32bdd91a59cf7c32990618540ac4cdb26dab691211eafd2cb4dc8a15321a03a08ce0bc1bd539ab45eeef9642192f5c5bef4f1cc7843535
 EBUILD gnome-commander-1.6.3.ebuild 1689 BLAKE2B 9e49a1c947fec74f9315728516d0844cb430caf4e11d22a8bbb1ba43556bec0478ed0a3fd6281686b4f6a28f9cbdd0f7c241e77035d69022176a017ee90b9ec3 SHA512 5c8e045fb2bc379231bfa57f57c2241abcebcfd9541c8e36b7c4716242f89a08bca26e48e97a52e1e2d271f24f10e3982e0c2db4d277c8d09f36990ea7771d48
 EBUILD gnome-commander-1.6.4.ebuild 1689 BLAKE2B d15a4b3994c54b101a25885b5da98db65391d363db11fd1559781306f6874c8a87c76db537add0f0cfec505ba409f5724bb5c7d7d4d8321fe88cc586b40649fb SHA512 f0e82260e869ad2058e29556fed7f3f98e057bb95831c9f869160e5a1ffe14255bad9379278781725ab772b2653ace2d8d1a4144b821abb9fed1ef621c61202f
 EBUILD gnome-commander-1.8.0.ebuild 1661 BLAKE2B 37d4213c719206cf8487ca6ec19b810eb00c341418418d72e7171b6547731b2f8a786d91d1cf7fc3cb40449c753458cd2e39487475abbeef028628830d7669d6 SHA512 f485244eeeec66c9c203dfa0070429e04f4a8627debe328ded6ccbbaa3df32aa777ade92cac15307aace0a33563cbfa88b154e39a2a0954cdc6a43ca369c029e
+EBUILD gnome-commander-1.8.1.ebuild 1393 BLAKE2B 8ceff5a01dd6a92033cff8f187fa0426a2947c5574661413c441fc1f29a76286fe7ead13995be146547cb190ed995c24c7b9eddd0b5749d55835edb46db05886 SHA512 9ac41a885a22b2645ca673575caa6667e9a0a3e6b9be81870b5b60bda0a5d4e0e33f0de1768e3d263f37a15f279a2e1a5d0ed852d29d986f5579e10a374eb09e
 MISC metadata.xml 1272 BLAKE2B 808953256b9af04ad4d4d8021e40f8d90b04333d03f67a15f2d50461706059269e02ed0316160245d636482ee6a741c4591c474e24028b5493383c99ab0bb1bb SHA512 4b2df4f1f6935f0efa0c1b1b8d975ea1927e049824c6bb35101ce93069477c39bb68e584648c1e88cf4e60083ecfe5a101ea11381b525d3245e3ff128914f4b2
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.8.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.8.1.ebuild
new file mode 100644
index 000000000000..652a2cabc700
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.8.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="A graphical, full featured, twin-panel file manager"
+HOMEPAGE="http://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="chm exif gsf pdf taglib samba test +unique"
+
+RDEPEND="
+	app-text/yelp-tools
+	>=dev-libs/glib-2.44.0:2
+	unique? ( >=dev-libs/libunique-0.9.3:1 )
+	gnome-base/gnome-keyring
+	>=gnome-base/gnome-vfs-2.0.0
+	>=gnome-base/libgnome-2.0.0
+	>=gnome-base/libgnomeui-2.4.0
+	>=x11-libs/gtk+-2.18.0:2
+	chm? ( dev-libs/chmlib )
+	exif? ( >=media-gfx/exiv2-0.14 )
+	gsf? ( >=gnome-extra/libgsf-1.12.0 )
+	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
+	pdf? ( >=app-text/poppler-0.18 )
+	taglib? ( >=media-libs/taglib-1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( >=dev-cpp/gtest-1.7.0 )
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_with chm libchm) \
+		$(use_with exif exiv2) \
+		$(use_with gsf libgsf) \
+		$(use_with pdf poppler) \
+		$(use_with samba) \
+		$(use_with taglib) \
+		$(use_with unique)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
+	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
+}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index b973fcc69e3f..b4032ac68062 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index dc9911c722e6..570239091f0f 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-17.12.3.tar.xz 284008 BLAKE2B e88d748d5640fd5906b3f4d843d50da59841f9e3dd6f15ce19e9bca32112597300d85e257ba77ca47b6c4a556a14fd2177c6ea7ef3e8cacc0ae6b9b8d8af9791 SHA512 456f67e88961c1187d5a347f2651665848468b3179dce91bcdef2dbbcca7fdb7d760bdf25f8dd8de9b41ea2794a069385c1cfbac407b6e187b0c6f3e460638d4
-DIST akonadi-calendar-18.04.0.tar.xz 334864 BLAKE2B 369f3fa6753d6b7477ea875e50fac56b374364b65654d1b3497f54bd391dfe8c3d20da85a11588b8e676ea8e7d3d89599b8bee3e8a7b89554039f9197c3e00e9 SHA512 fe62ba15a3797ef76d0c837e59b49eb99954e2f10e4ee157882e536d9d1c16e39dfdbd21449e9e07bdb6f768f4637dcb089918f8a0102be25b4e54c749a54468
+DIST akonadi-calendar-18.04.1.tar.xz 335936 BLAKE2B 48f0fa4c881b42e82243de23628110379388aca1a72fda04668fa826d3e4a06a07e744ed582897f65101875f2ceb0eaea7c5efef3d7a3350e426300b6d0d42f9 SHA512 a09b1dea05d4c6be066d2f45e660fb2600bb52afbbd2e17d877a97b9ea9e027b94b42bc0e4facd9b3f88a0c4c82b7b9ee926c37d68757da359846d5cacb965c8
 EBUILD akonadi-calendar-17.12.3.ebuild 1119 BLAKE2B a425c6af9addb555435ba7cf30701ef49f06d8bd3612d227e0965215149833a96f7b8d6078b573d373793f0ca393ef379dd0626abe9383d1fcaa5e6530d46c44 SHA512 e4fd44158d5fac5b7e6d3a9642c2a65bcafeb3f23303277aeb054bfe44680b662138a3fc8ea44f111cfba4f7c30b137b23a8f8784239c9f2165401fda45b08e0
-EBUILD akonadi-calendar-18.04.0.ebuild 1157 BLAKE2B 4e2b0e0e13a77f8f22377dc06df05f544552ea2e69467e056f9f93feb9091dda131a937f5e0397db039f5b86cba5ba05e39a215f3f889cb5fa44deabd228318e SHA512 76ce422a144f91b442b90a3351810770d8c81b31903aee03f189d2ed85d949c9b385a4faa768a736ead8c5d4db08d6ce3bcd95ae8180fea3722c7376f402bf49
+EBUILD akonadi-calendar-18.04.1.ebuild 1157 BLAKE2B 4e2b0e0e13a77f8f22377dc06df05f544552ea2e69467e056f9f93feb9091dda131a937f5e0397db039f5b86cba5ba05e39a215f3f889cb5fa44deabd228318e SHA512 76ce422a144f91b442b90a3351810770d8c81b31903aee03f189d2ed85d949c9b385a4faa768a736ead8c5d4db08d6ce3bcd95ae8180fea3722c7376f402bf49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-18.04.0.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-18.04.1.ebuild
index 7d72f8ee9a3f..7d72f8ee9a3f 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-18.04.0.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-18.04.1.ebuild
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index c83ef97c8d3f..e3c527917711 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-contacts-17.12.3.tar.xz 345296 BLAKE2B 2f249c14dd8ea549eb1a8aa8c5508dfb9ba43f4521e979b3ff9a76d50a5337a7df6a7d4ef18cfe821659c45bd7f7c691ef301c32dadca93c9cfcf06eca9b85e1 SHA512 37e621015ebbc80d765e4668cd720901b815c55b84f78ff39c163ec90dafdd50ef46567c6091afa02d434d339d4b172e5332d8954a134a50215a12bb099822bb
-DIST akonadi-contacts-18.04.0.tar.xz 390212 BLAKE2B 128e741618494738d61378a530065c7260676b021eb9cbba56aca860997735889b7f8d95bd82ac688d754db5434524d8c580e874d902237b69a6aad8604241a7 SHA512 8a744e94848cc592c2b788b44a68d37e4c59c62fd44dbb722b110765fd85ae8d76134e38481a4ffd7ee611b7d504df6cf2b1441f2ca7eb316ac3a5093aa38179
+DIST akonadi-contacts-18.04.1.tar.xz 392028 BLAKE2B e34540b3862e31896af8aca3adb6b23b632d673586d30de9090b639716d81415e9803df371786b6129d5cd5c3f937cc424d099e8bea3c3e8c2049bc1b53872bb SHA512 30c6f45fe5ccbc3394144388ffe6c3314c1a1fd85b67e58e0d606b14c31209091ac8f6e5281f22c295bc8bb45d2265a471cc4173952a406963046138ebada929
 EBUILD akonadi-contacts-17.12.3.ebuild 1058 BLAKE2B ddef52c6bf8a3ddbfee6a98071854aa8d75d78e7cb214e2a4db9fdd24fb91f236226418bd337bd3de8c4bd1efa12d147f23a2498124f72c62212775a60e01bac SHA512 49290735cea6df0b8b5c617db7486bc480fe7afe0953cc09d7bdca9c33008ba145c1be3991b925f7c05c08f6b4544692873711311cd3ffaef8fc02ee9612c75b
-EBUILD akonadi-contacts-18.04.0.ebuild 1063 BLAKE2B 919f870a67faa2401fc885c868e82be4166fc4d56558403b02efd6fbb2729e75ad7ec3de86582d68c635dff7aa4a645005ab950eb86893256076b992a115d38a SHA512 85c70ef918476023c2ea734a9ea341d49060a418ec4c4ae9f638510142d09566946356eaf12813149829a37e6c41c27263f49de08c24929624136b04b69ecac6
+EBUILD akonadi-contacts-18.04.1.ebuild 1063 BLAKE2B 919f870a67faa2401fc885c868e82be4166fc4d56558403b02efd6fbb2729e75ad7ec3de86582d68c635dff7aa4a645005ab950eb86893256076b992a115d38a SHA512 85c70ef918476023c2ea734a9ea341d49060a418ec4c4ae9f638510142d09566946356eaf12813149829a37e6c41c27263f49de08c24929624136b04b69ecac6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-18.04.0.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-18.04.1.ebuild
index 8e7312d67503..8e7312d67503 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-18.04.0.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-18.04.1.ebuild
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 45b9826e20ce..7e94a3aa868b 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-import-wizard-17.12.3.tar.xz 436656 BLAKE2B 149488e7c5188df4edd78d9d3d58565b5eb629f25cb7a2e759ee8f6fb6e1112948cbc7e953778ca744616739b3ad86f4707c1680e87e1509c35aab64fb46f5e2 SHA512 3c3001803921c2860bf1c16c73db5cffadd5ae1b77f0577d1bd0eb05e19b4632657ea4524088698e770b9843cda69faee9071c8a4269de158d65ed730b8fa074
-DIST akonadi-import-wizard-18.04.0.tar.xz 435540 BLAKE2B 11a52e7dba10d876c07b55c075b862b5735d98336af805a5372ad598bd5e5e312726fd31b04599c7d455491f31f411fcb3a7d7ac6807081ce28e72dc2ef0bbfc SHA512 e5fca1aca6e6cc1485aac08dd9cfd75083bc742cd1cedc938d7340a0e0dc1c80da076381c8bcdcddc8b7edb57e5580a73010ed8b7de14f8fb8e97a80ab1a8954
+DIST akonadi-import-wizard-18.04.1.tar.xz 436616 BLAKE2B 2bc156d81cfcfffd4a75b712aee566af2fe61cefe034847b8a482187b774067a774efc8b7e64f40a0fd1fa82d12711710df039f9382d7d663cac8d37e94ab2cb SHA512 bb7f54dac6049a0eec4664ac922e6c96e386beca9d857f891afba37f2e7fdccfffd86bf31c9ad9c81ac186d55fb4fd8a95543033e1cd9bd7597f24493a9803d5
 EBUILD akonadi-import-wizard-17.12.3.ebuild 1092 BLAKE2B a3c04404c27a3c23943e62c613292d92c84b8b7d5dabd7f29e31000622d41f40cdd722413a48e295b75a656b289be45a8acc25fdf4c06c2a39fe179f379cd352 SHA512 850a96332b61d3054856ba2e35863d128a9ba3422fae734f405f273c7d309bdcabc780f6d201d3fc7824be9c6ecaf8c418e5632417229f7690f3f2d1afaed7f1
-EBUILD akonadi-import-wizard-18.04.0.ebuild 1094 BLAKE2B 6854fefd7b24dda144412d954eb9bcf680d5e4265fbb92a8f1a70c33e49e1433dd4c25d8ebcf6844a1f1b871fc34ab902a43087a36bdf890924adef288512c13 SHA512 f3bd6bebf5a4222f528a889aec9d92afc79b069ab28d024faf9c1b2e6746aef74ac4d80c66a4068ee563e4eb1cfce047dbcecae3a970fff7b0442fef419e702a
+EBUILD akonadi-import-wizard-18.04.1.ebuild 1094 BLAKE2B 6854fefd7b24dda144412d954eb9bcf680d5e4265fbb92a8f1a70c33e49e1433dd4c25d8ebcf6844a1f1b871fc34ab902a43087a36bdf890924adef288512c13 SHA512 f3bd6bebf5a4222f528a889aec9d92afc79b069ab28d024faf9c1b2e6746aef74ac4d80c66a4068ee563e4eb1cfce047dbcecae3a970fff7b0442fef419e702a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.0.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.1.ebuild
index 711036b2177b..711036b2177b 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.0.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.1.ebuild
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 1d5cc6eebefb..a205135e8b20 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-mime-17.12.3.tar.xz 129916 BLAKE2B d0aafdbb9b2ba2e39dd33a6e8f5e7638b840c4b7a67731ac87c1c33d986a240b38fe18e467c0987f54b8aea51b42c7078b3eda588a349cbc439031dfbc8b4cb1 SHA512 5f260b00ddb5949cb924e62b1781ef4d6d3b23fca310ef120440345f6095ab678a41672287b139c8e0ac7c3d5a7dc0aaa15cfe9d59ecf75b51b1c09de7d952b7
-DIST akonadi-mime-18.04.0.tar.xz 136948 BLAKE2B 56615517845c728d05639f4e4eb84f28be663393c28a1ba5337c609e42723a3cb1aca10f5f65e70bbcb49eb05389f49ab6ed7bd200953c80ba17a036534c815f SHA512 f1f9a33378f81c5c255c12be3a739521666a1a14f4a14a18c48dc43037a6bd9d75de23c170d61234cfcbaf78fbcf7ac5c75b03ab9e5f4d0a8e679730c6bdb9d3
+DIST akonadi-mime-18.04.1.tar.xz 137320 BLAKE2B 38e89a17d09f9cb9b1264dbb279910d56969c4044ff18651068b6662a3bac50156efbc6b6574bd17207e316960f042c3e49cab0b282c16edff6942669e3fc7ae SHA512 b797a7a964f6277bc5d8e63b19511f1613ec61fe5d2fbb18668e96c291532e4a2e24eef110903fd26676f0269fbebc42d6ff9bee341a5384a90e5190a02cdb91
 EBUILD akonadi-mime-17.12.3.ebuild 854 BLAKE2B 5e2093113fd022f6defade297d54d8b290882949a864e607ec996acb69c3ab6d42aec8c5bc92c12f988d53b6c57387706ed4351770d41c0d299a65ef14a81e57 SHA512 f58ce0841389e462c36a82572177e19a14116f4a4d31b672e0bf7967aad2528492cc2b55096caddc6322e365ddd20a501736fde32368266afffe54a0884edbdd
-EBUILD akonadi-mime-18.04.0.ebuild 892 BLAKE2B 965bfda44299d0d7cb434c893ee2d6ba66480cc49ff32a198ed88e1d9f58c50218783c101f6c03af498ccd8a1dd0348fa79d0c132c052a27c5648c9d9dfd9fcf SHA512 0a38fa339efb8d08f336765b185bf87114f0e8c4230e765bbb7321bb541e5b9e4fa8b7073c49ddbf765ff049e65fcf5a4c66ab3140c357a8dce628b88afcf8f7
+EBUILD akonadi-mime-18.04.1.ebuild 892 BLAKE2B 965bfda44299d0d7cb434c893ee2d6ba66480cc49ff32a198ed88e1d9f58c50218783c101f6c03af498ccd8a1dd0348fa79d0c132c052a27c5648c9d9dfd9fcf SHA512 0a38fa339efb8d08f336765b185bf87114f0e8c4230e765bbb7321bb541e5b9e4fa8b7073c49ddbf765ff049e65fcf5a4c66ab3140c357a8dce628b88afcf8f7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-18.04.0.ebuild b/kde-apps/akonadi-mime/akonadi-mime-18.04.1.ebuild
index 1b39beb487f2..1b39beb487f2 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-18.04.0.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-18.04.1.ebuild
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index b0fd217759d6..f8a31aa9ea5f 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-notes-17.12.3.tar.xz 24520 BLAKE2B c37debede8bcbf97a6f2bee6d7195ddda69f466034b6ba60299bf93485dee1826930a7d029ebc39df7e6317c9124db57a8b7d97a6713635f4fd266dbc1dcc93b SHA512 306fafd7ef59f541cc30b111f4ab83cc2d218c8949ed14805f8116388a328ec8d522194408afbf455d133ef8a40153c04b9dbf907e4b0e784458f9fe2aaaae62
-DIST akonadi-notes-18.04.0.tar.xz 24564 BLAKE2B f609d1106fcda1630011e03056493bf61445861bbdd55aa31533f97fb5dfa64148b6c3866d313a19fd8368ba935279581f8d9ded1ecf601af6a06a85949b60f9 SHA512 f826c52dbc99a7c5f34afbb8a31ec8bd596b4227f4cf9751f3d71a16adbed4dab29040915fbf2d9f004afd7d205ca82f85fce572942264e17599a3ee51f45144
+DIST akonadi-notes-18.04.1.tar.xz 24608 BLAKE2B a2885a1293aa01450c730ea7e8b2befdd06c3b1b60ae050abaa859c8c4589bd8ff4fadba995937783db7ae2b77441dce7e1f1cdd29fe202c4c8ea2533e21ae93 SHA512 966b917ba7c2c015132bda325ac04765ae0abe035ad899c9b10b5667213a20887208f67af2ca16b027895410d10fe0b673072a2e44b62412714ca78eeeff1f56
 EBUILD akonadi-notes-17.12.3.ebuild 565 BLAKE2B 2c4c204454e138dd32186a05beb3fabdc9e52ab2173c3624c7b3b0eedd6cffdb78b6474731a16ae204d542263086c47e31cfea34aff9343714f856b8b76fe6c8 SHA512 2d16befdb5691c46a816b6c0b659d83f3dee26c9f02704870eeed720a1cbf78012690af2172a4e4194cd0929e71679f074bc6ea7f913663fe83cec665ac3dd98
-EBUILD akonadi-notes-18.04.0.ebuild 567 BLAKE2B 6bf6f7d182475533dacf721500c4d2bf0086f6f99c69a8c253a18370073b348e63a220a17964242448c241367b5a4b241d2ed0f28faf474ad9926a6affeed89c SHA512 34371782e6bc37e5c09d0707b177b3fc55513ac6c07ba9d5f4f65236895d511da07196cc34e9e3ddd91e2715062b0599590ecd44675efb143d4e9bf41ac7d8da
+EBUILD akonadi-notes-18.04.1.ebuild 567 BLAKE2B 6bf6f7d182475533dacf721500c4d2bf0086f6f99c69a8c253a18370073b348e63a220a17964242448c241367b5a4b241d2ed0f28faf474ad9926a6affeed89c SHA512 34371782e6bc37e5c09d0707b177b3fc55513ac6c07ba9d5f4f65236895d511da07196cc34e9e3ddd91e2715062b0599590ecd44675efb143d4e9bf41ac7d8da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-18.04.0.ebuild b/kde-apps/akonadi-notes/akonadi-notes-18.04.1.ebuild
index 0afe6508a57e..0afe6508a57e 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-18.04.0.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-18.04.1.ebuild
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index cb6ef37100c3..64000bc8bc56 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-search-17.12.3.tar.xz 81872 BLAKE2B bcbc5cd5d2cf37bb80c890164c45f0141d7d668c59ad099888831efb45781d15d8d34ffac2c18a9dde4fc697cf02dfe0493d01c60bc687b137dcd6cbdb11f6da SHA512 3c227f25784069bca95abe43657fa2964049dac840629f6ceeb8ea7378f4a8860b4dc2346a7cf1069d9cd0950ceaa65c1aad772199a4e15b27d099ca16c46689
-DIST akonadi-search-18.04.0.tar.xz 81892 BLAKE2B b6c89d64ddd765cfa2da758e6d7918c884681be59648f0a2e0cc3e0f23d5ac2d56b482c4423d19a1166c43744444d4284c659c1d6020ea179b83b7e0cf8c095d SHA512 8e4fb7c99f2b4f1dc15238798bbcc193a220e445e19ed26f390fe51f7b4811195bde62f93009e04f1874159a0c3eace234648d2ccec45bc7b29a295b42013696
+DIST akonadi-search-18.04.1.tar.xz 82436 BLAKE2B fc759ecdf4c887298f203b2ea717523d5ce21f047cbd7789f2213c2a5bc12191c322226c6b22ce467ff09f500e5e44d5b79f85e47fca5b6f3e70ff49f5721b4d SHA512 3bcaf0502cc1a0022e593a0daf3843dae3db42ae101b801e596f8c0bfdf8536d9621bbf6cfd6f0dbe6ed26b81eede4a07e060210895405069a9324152f8256a0
 EBUILD akonadi-search-17.12.3.ebuild 1083 BLAKE2B 03df45067702dc1038267a895a4e54ea43da89761757bd719311f7056d6dde47f658774046e5527fc3f82b47a29fd13b3c124d519a3f1354dd4a5efe392c9bb1 SHA512 2f9ba09ab02ee26a096a82a0150cf82fd9c116969154e3b3727147822293087716b865f0dcdef4c850dadd27d2a4d8041468fbe1e0209d79591b6cc48b70fb4d
-EBUILD akonadi-search-18.04.0.ebuild 1085 BLAKE2B 6f3e305cc83fc0e7e258d8f04cd7672a2a347e127160181622f5236e5972bb2919f4937e7775cd34dfebc1a9446977566194ff4abac92689ca3c3d3057929c8a SHA512 43c58328684563f17fe61360369c9c4908f8b41468ca5e1d9e6db2f4d33a182c63ea07ee36359a9031a67839988ca3db85759d17b4096781b107fefec0bcead3
+EBUILD akonadi-search-18.04.1.ebuild 1075 BLAKE2B 8d8f3dbf21a8e5cae0ab11bc2eed9e7c2ff3a6838a4f64563772478960589d38948a3c2fdb201ca7823ff91df45b9d714dc446dacd5a829e3df3ae064d9313d9 SHA512 88f73387b8c6975a746a3f7e8629e409f2e9dd8ff707849ab08def3b08010b96aa294c88fda0e2d69b8358e99cc5e20ef588c0caf57c47598747c30946a26b8e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-18.04.0.ebuild b/kde-apps/akonadi-search/akonadi-search-18.04.0.ebuild
deleted file mode 100644
index 5504a5b85b7b..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-18.04.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/xapian-1.3:=[chert]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi-search/akonadi-search-18.04.1.ebuild b/kde-apps/akonadi-search/akonadi-search-18.04.1.ebuild
new file mode 100644
index 000000000000..069e1b7eb656
--- /dev/null
+++ b/kde-apps/akonadi-search/akonadi-search-18.04.1.ebuild
@@ -0,0 +1,42 @@
+# 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="Libraries and daemons to implement searching in Akonadi"
+HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep krunner)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/xapian-1.3:=[chert]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index bae829370206..d9a4666409a9 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,6 +1,6 @@
 AUX akonadi-17.03.80-mysql56-crash.patch 2064 BLAKE2B a4107b5732d0147e3001484c7c4c5e3bba64909d21656686142cf9d58304d7496dea8d11b72836bbdeee09691d9c1e160445ecf94fc280cca3c35f45c078d969 SHA512 35e89ac8fa7640354a0a0f50abff06ec34075722e4e8f3b6297da7384a3deef62f7826c1a7a08aef72329ab0b6ef3b20b1bbec231674e20733fa15fd388195f7
 DIST akonadi-17.12.3.tar.xz 1521576 BLAKE2B d4809ccac14a18d922f04bf772892aaf7f43209b030880ec72d7ded662a1dd03bd768d71a30c1655a1634ad7b20f3c24c176d4da9a5beb1e9c543c256dbb4b97 SHA512 410b72dfa6eb3272bb8b959f7e0ba5951faef598e7c73696844bb6e33d4f5edb0bed4dc5ccea68111a7eef3c9f7a776acf8823c9a138b6af28d819ce8077595f
-DIST akonadi-18.04.0.tar.xz 1524812 BLAKE2B 3b13a2842b0fc8a2ec360fd550c1e47c80d564fec7b7d3128157d6cbf1687db2271a396a6f885ad884f95995fc0342bc8fe6435b11cac2e91ecbad95deb46e0a SHA512 311d278ebf58b94f8d7704cdddb2fb3253216790f79ea287f56dfd026500428d73f9af3d77a12dd9a45721ac1e2ab350e612e6b76205ca2cd347d9b8ac061151
+DIST akonadi-18.04.1.tar.xz 1525744 BLAKE2B 9db4189aeecf293cb3b3bea8977c02d24cf9a2d470c46a527ab50a0dde331a9618e80c77ebc379682c888c7a557d3e8dcc53b14c7a3f75b4d123ef4bbb2b5856 SHA512 db76bbe6e31ff8fa2b0a59a43bd86e86fd73e17c0c30f3e8ce64ba90d2c2f284b1b3422ed00fbdae83d43124cae57aa39a0d80ee116978ccdb6fa38dd7a9a07e
 EBUILD akonadi-17.12.3.ebuild 2913 BLAKE2B 11de71f1612a4719b972280d9d5c790cba36f5e35ea84d7491518a69793df1d782b61ecc893b395c6b6ba510b2e32f78e361713b400d39784958fdeee8fc3253 SHA512 0dd8a2ba7c8452a00d4d349636b8ab42ade6da7c9fe9dfe0742301ce397a20aa811c6018a0a0c027f4b0a9c8583a616fbbcaf8d09f93fa4570b680cd92935699
-EBUILD akonadi-18.04.0.ebuild 2915 BLAKE2B 8f061eb8ce1bbcc1ef0aa30066ee3b37c902422f0c2f857f425ef4bea6dcfce8d7ddc37245b36d299c64bf41f321a159f4add3eddb5dbb90ccbd504b4bf7749f SHA512 b509bffd7bf710862d48afeaa18b69936800031dadb3a5d22f87559e179305c06e8ed3c4bd21a33346e2984e910d3718384021584d6caeec029e495127aecc21
+EBUILD akonadi-18.04.1.ebuild 2915 BLAKE2B 8f061eb8ce1bbcc1ef0aa30066ee3b37c902422f0c2f857f425ef4bea6dcfce8d7ddc37245b36d299c64bf41f321a159f4add3eddb5dbb90ccbd504b4bf7749f SHA512 b509bffd7bf710862d48afeaa18b69936800031dadb3a5d22f87559e179305c06e8ed3c4bd21a33346e2984e910d3718384021584d6caeec029e495127aecc21
 MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa
diff --git a/kde-apps/akonadi/akonadi-18.04.0.ebuild b/kde-apps/akonadi/akonadi-18.04.1.ebuild
index 99c2e48ae5e8..99c2e48ae5e8 100644
--- a/kde-apps/akonadi/akonadi-18.04.0.ebuild
+++ b/kde-apps/akonadi/akonadi-18.04.1.ebuild
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 61759ed9a5bd..bac36a8de558 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,5 @@
 DIST akonadiconsole-17.12.3.tar.xz 185432 BLAKE2B c4be134ccf31a42f9244d7ad0b717e4cd8e7c89d1208e70339f096b84c64fc22223de318fb4d3e843ed7bf2c0d61ceeed4e4dc10db964c581b537ef9d7f7d0b3 SHA512 f491a16fb93a23cbad1160d5bf63ffe07ee015097211e23464031060247b550399140626f016d2a5336ed783a55f8d803a7aea6c8f4cac9495fcde35b082765a
-DIST akonadiconsole-18.04.0.tar.xz 185584 BLAKE2B 40e1da352383d08eef06c8363faa669279087473d60c46a4efb2409660920352b7d73cec5dc149e5b2d6af544afc01f552a116d5dd9e153ce6a2075a4e22f556 SHA512 e3ea3cd9699a1b781b05532254c45ba0965a229d55e309597dbee18861d78b43a5fb6166c29073d21e6fdbd1cbd032a284ca2776ebd164c2e5c4585e1d8180d7
+DIST akonadiconsole-18.04.1.tar.xz 185796 BLAKE2B 36f6f0d465f0920a79c6b368ea3e3c5a05b2e7a943eeb505d3045f385c69eb0051b461624cf8dfaa49767bcc69e2025aad1f82bd3024dce5d26f37e2509e2f9c SHA512 eb6d899f8ca68ba88bd9380dae462930bcf053667bf21b21033f9cda8e662cc127f6e11cfd4141f12c0da7f8c38f069980c8bc7f215edecb23c009141b2eeb66
 EBUILD akonadiconsole-17.12.3.ebuild 1257 BLAKE2B 6615ac6b229103c846bbd417d3f4e94ef06325e284b9776aab1c75a3f31a8cf0e9998b7e1b25b2e247f3770392eb91e296715ba7b87f8212217444aeee1d64c4 SHA512 810f571af94767290bcc5173c2c12f637374ded17cb99d08c13d9b2e4a0a890b21b761b36e278424128466cd469a4fc8f58f6e2080f59518a9e39a0b3e67d78d
-EBUILD akonadiconsole-18.04.0.ebuild 1226 BLAKE2B 7d3ea8ff8679de8097b08958a3c5f2398c815eea56de8e3a9bdb9f30901fdbe0ce6a38f5110bcd5ef5fda168550476aa53b3a85189449fe1fde2f95ef395fc3c SHA512 944b60428b920f9d89f7c3e84e6bcba02be7b4748fdcbb08d33eb8c00637aebe6b70f804a64a83e228b81198eca3ea237db4d995b4ac27b40280f64765f19137
+EBUILD akonadiconsole-18.04.1.ebuild 1226 BLAKE2B 7d3ea8ff8679de8097b08958a3c5f2398c815eea56de8e3a9bdb9f30901fdbe0ce6a38f5110bcd5ef5fda168550476aa53b3a85189449fe1fde2f95ef395fc3c SHA512 944b60428b920f9d89f7c3e84e6bcba02be7b4748fdcbb08d33eb8c00637aebe6b70f804a64a83e228b81198eca3ea237db4d995b4ac27b40280f64765f19137
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-18.04.0.ebuild b/kde-apps/akonadiconsole/akonadiconsole-18.04.1.ebuild
index 5943cc52ea5a..5943cc52ea5a 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-18.04.0.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-18.04.1.ebuild
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 04c30336c5da..cae0b0f12e23 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,6 +1,6 @@
 AUX akregator-17.12.2-crashfix.patch 383 BLAKE2B c50546f9897bdccf1bddc00e51d6068282fa4eb04a9ea81f8ef8f566158a013c01ff3607504af2a6bcd1f026415fe8f6274b2268b608caf0a48c8d98b51833ea SHA512 df344cde73e4dd1813214bc3dcd4624661bdd53f2174d8dffb5fd222c10133d83f678f0cac68c84dea21dc09888a8f120cd23b3c6d1f34e320b5af51fa0e3dd1
 DIST akregator-17.12.3.tar.xz 2251784 BLAKE2B b5adb96501b6226817b6aa29a55f47f34d0dc85bacf68d4b971e9c2688a12c9f5ba24b274a5f154ceb2549a3558359cf97fbff176a2af9ac2abb4e6abdee5f89 SHA512 dc047fdedfba0f45b9822378352ae57e8b1ddef6712e669868be65f6820da46ec601483e1ff6b509b84fde236faea2a8fb4317bfd88cbd641e2d7af034a8452b
-DIST akregator-18.04.0.tar.xz 2249180 BLAKE2B 2184b415e337cb924c88cf31cd6cb9ef804c817a1a0b0d1979e80cd629a709afad24f2202cf935757fd6ca177b685a2e9dc9a95d92d343feba3b44529c480af2 SHA512 e78d6b17c3811704ef34abacf3271233a89614c807e30b161040fdb578f1ef360bc5d9e9382cf33457f0e5c0ceb14647068c1f3d9fadde8a6a58f3b2113be597
+DIST akregator-18.04.1.tar.xz 2250984 BLAKE2B c0ea673095dbc8122dee8f2d9ddfca6bb3d0e5280db4fa279af373b8dfdf1c9ae1bfe1bd8959a07dc70c6e1bcf031e15657d495fa7307c5892d04676a3ac9d8e SHA512 bd353432a32c2499fae5b5c0b2b184069eb322cd53779765b02fe236e6f7bc32322a96fe8931b26f53a992f05a432d3fb95017ddc568b7c4f1749f46324624a3
 EBUILD akregator-17.12.3.ebuild 1494 BLAKE2B f61953255f5a9da53b9f4f98f24ec9b9b8150f2248c00223c4edc332fb81b326583c686dc057b2badaa131c78adb04a89b511e7caa210484f1c6cb3596569dc0 SHA512 46e4bcb6178e734884715c85d4369dbfdfee7076a520a995c53d06ad89328b0315d12e81474b61dbcde6b1a7c0a163ef700f0593002999b710c9f1e80c21e3c7
-EBUILD akregator-18.04.0.ebuild 1496 BLAKE2B 279651b4549fa9d2565b38e7a611139fade8e73f5b4ae7eb35aa4fec13ebe51b5511f7f1c1cb88002d1dddc714f3333de7d0ae017dc7becb5960143353fc208f SHA512 cca7160091fa046dbe3dfbc852ac87c0983f4689a2b2fe01be599426797d627089bd970015998916b9618755ce4eb2118a7a7cd74d429701afecc2cb6c3416dd
+EBUILD akregator-18.04.1.ebuild 1496 BLAKE2B 279651b4549fa9d2565b38e7a611139fade8e73f5b4ae7eb35aa4fec13ebe51b5511f7f1c1cb88002d1dddc714f3333de7d0ae017dc7becb5960143353fc208f SHA512 cca7160091fa046dbe3dfbc852ac87c0983f4689a2b2fe01be599426797d627089bd970015998916b9618755ce4eb2118a7a7cd74d429701afecc2cb6c3416dd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-18.04.0.ebuild b/kde-apps/akregator/akregator-18.04.1.ebuild
index 9d2cb6d441c0..9d2cb6d441c0 100644
--- a/kde-apps/akregator/akregator-18.04.0.ebuild
+++ b/kde-apps/akregator/akregator-18.04.1.ebuild
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index 035de747b8d1..c4b1118bc769 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,5 @@
 DIST analitza-17.12.3.tar.xz 331052 BLAKE2B e250093623dd516051684473fdb03becaed6c3361bc478f633276a16cf5f75f6c6a8e2df5cb98b8a998e570f4619f2a0c32a59170fbad2563ac93e00e29991f7 SHA512 31d461e09736b4109b6d0af37e4ff1af075963566b0363b7801849bea83b411a53a8498d6c7b55778636e7bd22c120e46dd99dfa74d841532269044449f7621b
-DIST analitza-18.04.0.tar.xz 331008 BLAKE2B 0cbe12bc8c137f492596734962f013742b90c5ba9e72c70f651259e46ff09abc845bb2c0fb7be5901592e0149eaa957ddc974e0812b6edbd0b789ae8fb93d670 SHA512 3920429a1a04902232ecc7e3f91fa7239ea04fb4063210c9a6875fc129bd89d5c00d0ee3e1f99133572f607f34560277b882a1e7337bf816044842bc39b4c0ad
+DIST analitza-18.04.1.tar.xz 331612 BLAKE2B d7a047810aa77c5dfa98fd0efcfc9e9963fee46b1ee42bf945f23890ba01d67500d59d7aaa6eab7cfc7459a6b765e336d3fb18711d4c6ae717d7cc0a9d5c6b07 SHA512 76547578bf2ac88123ba70ff8f35643cf17c14acf72b720f1dee9cd73f4033741cc99157ec1284cd3ae8d60162a40b202c3bbe3d3f3f6ba22090deb0449b7c11
 EBUILD analitza-17.12.3.ebuild 812 BLAKE2B 266c4304bbf2c641f6c7a920266a96c9b318de14cffefda537d363a1daaa14e841e994ecd0aee5f81a28a4b582cd0d11cf91dde00cf2332e7af5a747ed6d33a5 SHA512 d3605937b54067d575f07d1189730ca18d0df4f6d33d2f011ef691a6a48892ee3340da088e873bbd4c4b2f2dd5fab2eab9ed010ef4603aaca881259464cc3ac1
-EBUILD analitza-18.04.0.ebuild 814 BLAKE2B ab20e18be9ecc2c7f816a21f9847b704a0cf55fc32c63bbb241ac7f0058fd2671e653a4a615e3fa5d688618a5fdddb434db801a5ebedd3cbb00a2ac2930076ec SHA512 267071d595f3cb78d909f9ef0f814d90e31ec54cf783a484ed59f55cf3e8d1ea4cf66b7fbd215873119ce2566d9cbe5000ef70c1b2f3c9f1e67f16553b3010d8
+EBUILD analitza-18.04.1.ebuild 814 BLAKE2B ab20e18be9ecc2c7f816a21f9847b704a0cf55fc32c63bbb241ac7f0058fd2671e653a4a615e3fa5d688618a5fdddb434db801a5ebedd3cbb00a2ac2930076ec SHA512 267071d595f3cb78d909f9ef0f814d90e31ec54cf783a484ed59f55cf3e8d1ea4cf66b7fbd215873119ce2566d9cbe5000ef70c1b2f3c9f1e67f16553b3010d8
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-18.04.0.ebuild b/kde-apps/analitza/analitza-18.04.1.ebuild
index dc538401ed67..dc538401ed67 100644
--- a/kde-apps/analitza/analitza-18.04.0.ebuild
+++ b/kde-apps/analitza/analitza-18.04.1.ebuild
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 7bab5d49ccbe..25ceeb82248c 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,6 +1,5 @@
-AUX ark-18.04.0-missing-memory-include.patch 934 BLAKE2B d371207e04b2c05b3fe54e5dace192ca6a6c5d58225f72ec4c40f638167825ca29219528df259b8d000547e26a5fc7347791d8620efb82658f8bc2039a7c6323 SHA512 01b1e7aa6c0190909ca0bbb207b29c0fa631910fefc0a07c2d16e2b2884eb9ede3bff2a49d3a65c54331c06003cc3093c5d4aba2fdc7b500d03e999ef268a192
 DIST ark-17.12.3.tar.xz 1970120 BLAKE2B b8e14f6b5f541c514107cf76b612edd99d6e0d97dfbe7600349bdcf2bd5afbfd1fcaf256d0358ff0c8838d8334a14ddd1ac5d29ce9befebe960444e0828aba5e SHA512 2f32f0107afa20ef115caddaf3c7ce6be37a575c72ea440f571312309d945a0e0491a4327db379e8ca7622a2b5016c5b2bbbfb3377d3b4272430f85b23fbb911
-DIST ark-18.04.0.tar.xz 1969376 BLAKE2B 9d1e017c0d37307b8f8b9c7c0f9ec2be0d856c97cd39e0d928cd201553543883941baa4226a035e1cce9049125a80bde0d9a20da1159823bcc5d23be0fdaabff SHA512 0a6ab705bfec8af43c847f50580e97452e29ad83f34271ba09f5ec5eacefafe09b312149565ea802e25cf15597ecd78108e2581ebf52396af22f52aa228de69f
+DIST ark-18.04.1.tar.xz 1971344 BLAKE2B c1778e8777b6772f9ff72a23296b29daab9179c3ddc83297e46695f8e9b6c64490b3dad716104a5c9cbe936562481174a69d8356032caf901c0e8b91ae732ec2 SHA512 0a6a390f3771c4dc1d6386fcb17eac0416bc7494f6517d60a8007a676322b1986f6ff526ba8514a9f68913bd67f2105dfe9bfd1aa24feb2f19f67b442b1d1f8e
 EBUILD ark-17.12.3.ebuild 1834 BLAKE2B 89c23fab134592a27905dd66a4598b20df701ff11e9d2716b6015c85ee789779b90ac04077c4894544fd9e9cf92a878dd0cfa24f131d13075079aa29ff4cef37 SHA512 4577863a920fb488b2f275a78e74427176e4c2680ab604b6fe96c3e96ecacf692b1c757e09c787fb4a9a4b386094db4e1687d3fe61118ba570e9908201e06ff8
-EBUILD ark-18.04.0.ebuild 1897 BLAKE2B 39a6778e422f891e5b32d22fc3d7f38ec7a92771fc88e8fcb77cb54e0a10ebfec7ced8ae3264a6cb519035df19eea9886203a56fbcc8dd3f8481afcb4a45961e SHA512 f3d847f502c9eb86f29187d85d3448d16accaaf103cc39ad9f50be7b6e2b27c766aa4135c3b0609c6a81fde2fa552decf3a9aa70dee021df7fadda32f1716787
+EBUILD ark-18.04.1.ebuild 1836 BLAKE2B 0dbb76a934c833060023797c380d8bc57bec858c0ecaccae9eff606278c1e7a849788b4cd5f04ad26493e3b336e52ad27319152cdc8986c1cf48509700c1776b SHA512 669204c448e23da0fe05365dfefa81de2e88d5cfbad74d41944b21b0ef933b01f661e6e95529059008dd9f839cd3f0df51683866e5ceab625dcd19b95d8a15eb
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-18.04.0.ebuild b/kde-apps/ark/ark-18.04.0.ebuild
deleted file mode 100644
index 273b2b1ad902..000000000000
--- a/kde-apps/ark/ark-18.04.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Archiving tool"
-HOMEPAGE="https://www.kde.org/applications/utilities/ark
-https://utils.kde.org/projects/ark/"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 lzma zip"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	app-arch/libarchive:=[bzip2?,lzma?,zlib]
-	sys-libs/zlib
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
-"
-
-# bug #560548, last checked with 16.04.1
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-missing-memory-include.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package bzip2 BZip2)
-		$(cmake-utils_use_find_package lzma LibLZMA)
-		$(cmake-utils_use_find_package zip LibZip)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	# not a typo, app-arch/unar is a real package
-	if ! has_version app-arch/unar ; then
-		elog "For handling rar archives, install app-arch/unar"
-	fi
-
-	if ! has_version app-arch/p7zip ; then
-		elog "For handling 7-Zip archives, install app-arch/p7zip"
-	fi
-
-	if ! has_version app-arch/lrzip ; then
-		elog "For handling lrz archives, install app-arch/lrzip"
-	fi
-}
diff --git a/kde-apps/ark/ark-18.04.1.ebuild b/kde-apps/ark/ark-18.04.1.ebuild
new file mode 100644
index 000000000000..eb5ba8737873
--- /dev/null
+++ b/kde-apps/ark/ark-18.04.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Archiving tool"
+HOMEPAGE="https://www.kde.org/applications/utilities/ark
+https://utils.kde.org/projects/ark/"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 lzma zip"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	app-arch/libarchive:=[bzip2?,lzma?,zlib]
+	sys-libs/zlib
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+	sys-devel/gettext
+"
+
+# bug #560548, last checked with 16.04.1
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package bzip2 BZip2)
+		$(cmake-utils_use_find_package lzma LibLZMA)
+		$(cmake-utils_use_find_package zip LibZip)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	# not a typo, app-arch/unar is a real package
+	if ! has_version app-arch/unar ; then
+		elog "For handling rar archives, install app-arch/unar"
+	fi
+
+	if ! has_version app-arch/p7zip ; then
+		elog "For handling 7-Zip archives, install app-arch/p7zip"
+	fi
+
+	if ! has_version app-arch/lrzip ; then
+		elog "For handling lrz archives, install app-arch/lrzip"
+	fi
+}
diff --git a/kde-apps/ark/files/ark-18.04.0-missing-memory-include.patch b/kde-apps/ark/files/ark-18.04.0-missing-memory-include.patch
deleted file mode 100644
index 1935fc4ccaeb..000000000000
--- a/kde-apps/ark/files/ark-18.04.0-missing-memory-include.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 23ce7f8c727d76d4532b8949c383c3f17b64a539 Mon Sep 17 00:00:00 2001
-From: Marco Genasci <fedeliallalinea@gmail.com>
-Date: Fri, 20 Apr 2018 11:40:30 +0200
-Subject: [PATCH] libzipplugin: Add missing <memory> header
-
-Summary:
-Build fails on some setups for use of std::unique_ptr.
-See also: https://bugs.gentoo.org/653546
-
-Reviewers: #ark
-
-Subscribers: kde-utils-devel
-
-Tags: #ark
-
-Differential Revision: https://phabricator.kde.org/D12374
----
- plugins/libzipplugin/libzipplugin.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/libzipplugin/libzipplugin.cpp b/plugins/libzipplugin/libzipplugin.cpp
-index 5641c97b..be260b39 100644
---- a/plugins/libzipplugin/libzipplugin.cpp
-+++ b/plugins/libzipplugin/libzipplugin.cpp
-@@ -41,6 +41,7 @@
- 
- #include <utime.h>
- #include <zlib.h>
-+#include <memory>
- 
- K_PLUGIN_FACTORY_WITH_JSON(LibZipPluginFactory, "kerfuffle_libzip.json", registerPlugin<LibzipPlugin>();)
- 
--- 
-2.17.0
-
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index d6d5b6dec3bb..105ab895c2d6 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
 DIST artikulate-17.12.3.tar.xz 3747444 BLAKE2B 69ab847203f3a6ee408435320d3973d48d55501010ce34c329605ea653cd26a0e2c8a082fba3d91e610f153193441db310cd58416ba6f1907d3680f35197f6f2 SHA512 b984eb53a78bac012a9918a24d995dd89413225ebbd0bda29dd6840ccb14f40efc14b80b0ea6a5df335dcf28f7bb45ad8d1af8296a8d761e4ae48288f2354a23
-DIST artikulate-18.04.0.tar.xz 3746024 BLAKE2B fe6a62ee447a033760b6b18721c4786b0465a152991ccfc418a94f5e2a89eb907ff48056772a30fbb312da2c3d62aaaa8c14b888063a062c0d618c5d02b0248d SHA512 01fec3affd588f07033b74f1d60986350090d12cfd6345b81d8d4a1b94427a5e7e55f1f5cb66bb50404a8c614d7cf1aca062e3dede10774c2f81659bbfc15f51
+DIST artikulate-18.04.1.tar.xz 3748636 BLAKE2B b7a026ae1de19a3a4eefe12e2ff07c61fe800a7a4f52745358a47d86860719ff25118ddaaca907866dfa6fd8a0f6971f30da716d83a00288d661fb54129d6e9c SHA512 503c4fac6f5ecf5bccdaad9f66f4743732b2a2b1fd435a147c2d58dbed58a22002bf5fce04949bf73ed816c90d610e6346fe5d68cee2541b28c4a69292dbae96
 EBUILD artikulate-17.12.3.ebuild 1117 BLAKE2B bdd3c88ff3d484548cca21867c77ce376faddce842e2f6597843b70cf2b1618cdec825309ce1a64ff0d099dcb1943ff9636812a39620d0e2e307041cdb7d85b6 SHA512 4e4eaa3064916cd463b6c296f4e071295496bdd6bfd916ae60f20393cd1673773991b7970c629f19522eafe21086e1c41a45efc20b283a85c3d6cc220ca79a7b
-EBUILD artikulate-18.04.0.ebuild 1119 BLAKE2B 394932d35ece9141d9db95a9544bffa0b86bb114040a05a982d22e365054c05cc7689a29d9a170a79716ab00e79a010e0ddf20a933d24f3e380e397d43ec18f4 SHA512 225511e036aea03d1d495c712cb7f52b42621e803ca3e0bbfccb9e5197a977bdedc8366096d77bf947b210dc25cf50f9bb6c93226100cd58dcd0f77dd831f4f0
+EBUILD artikulate-18.04.1.ebuild 1119 BLAKE2B 394932d35ece9141d9db95a9544bffa0b86bb114040a05a982d22e365054c05cc7689a29d9a170a79716ab00e79a010e0ddf20a933d24f3e380e397d43ec18f4 SHA512 225511e036aea03d1d495c712cb7f52b42621e803ca3e0bbfccb9e5197a977bdedc8366096d77bf947b210dc25cf50f9bb6c93226100cd58dcd0f77dd831f4f0
 MISC metadata.xml 328 BLAKE2B b873dc7a695e90caaffc9b5f3a8e50813d0cd33d651f0e04ff1fe463ebf335d834cc7e62640d172c5df73e5fac828a5c36a92d77c0738d7807b16cc86e17ce88 SHA512 f00a5a83877d21d15842052479a08ca06ea387656644416d7af400c4b9dabd9e928137afcb3f7551817f94a5aae28422842a80c641cd481374ca92e305b59962
diff --git a/kde-apps/artikulate/artikulate-18.04.0.ebuild b/kde-apps/artikulate/artikulate-18.04.1.ebuild
index 9c910d95fd15..9c910d95fd15 100644
--- a/kde-apps/artikulate/artikulate-18.04.0.ebuild
+++ b/kde-apps/artikulate/artikulate-18.04.1.ebuild
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index cc345e99aec4..badb6054eac7 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,5 +1,5 @@
 DIST audiocd-kio-17.12.3.tar.xz 248320 BLAKE2B cc9fd7471fa91c9cc026f9c7b2bc7dd20e8a507ef92a01b170c5fb0f011af31e562eb1f2f848ad6747ccba665c8144e2db01782ea7008eabe5532200e29db5cf SHA512 9d21ba053acd9d9f717aa8e7c3b3021e1f24610762f332584bfd4ce1b4f61b10daf0c6715ed4168f37bb36d4551d43d88a8eea54da313aac7cb6df862680f2a5
-DIST audiocd-kio-18.04.0.tar.xz 248248 BLAKE2B 584dd0aaa316e550dc80edafc19ea74cec3ccd3baadf3ce5cc92824311b866edee515bc47dc4bb57adf150fe62c1b91d6d2baed75a96e752ceb19dece6651f94 SHA512 75b2806de3356533d58e7bef2d2e917e2faad35ffc9a24e8a615e018f227e9fb287793ee479a2c02dba3b9c62ca3e86332bb2e851436a830c352371f60bc3664
+DIST audiocd-kio-18.04.1.tar.xz 248696 BLAKE2B 5de8a195aa0b28049ff573cc603d3aa7413c0eb29aec86f54713f795703d9f68cd42d4635537397a657ed67b5641d8fc484e10c81b911824bfa9b4953e32d2ae SHA512 bbde3170902937a211041cff51d187fc5aab878b8cdbcc64fd17f0de180060a8b91b567f104620abcaa65edc4e754c7e6b87a013669b20f577f274a6e89dd8a4
 EBUILD audiocd-kio-17.12.3.ebuild 918 BLAKE2B 04107dc6d19aa76d37d8d58485141014a54a8615b8e3b86e824a5fba56dd46eafac8282daf3c85ff8a4c7063a75a468a138af2eb18999b66dc2e6b84cde05f94 SHA512 1915e62b9cedc9f91237e26e31a9f16539635181dcf965c5bb72f5fda12b34dd1cf7294bfa99a6a717eb6f26abe8912553b64af7e4af083b3de79468871c9a26
-EBUILD audiocd-kio-18.04.0.ebuild 920 BLAKE2B ecdb36adda2c4ea7c4551405c2f170f7981c17ad04910e3c141ddab9f7db51a6405818c74d66a40110d24b27fc69ffd4cdb010d2d8022a029104b8dc613cd1b7 SHA512 449160c59f5982043e93203e92d8329fbf3aded193adc5d07b55f3b2b5077db596c435c73df58a7cb5123eeffc339fe0ece189c84da48cc868b9345dae195e56
+EBUILD audiocd-kio-18.04.1.ebuild 920 BLAKE2B ecdb36adda2c4ea7c4551405c2f170f7981c17ad04910e3c141ddab9f7db51a6405818c74d66a40110d24b27fc69ffd4cdb010d2d8022a029104b8dc613cd1b7 SHA512 449160c59f5982043e93203e92d8329fbf3aded193adc5d07b55f3b2b5077db596c435c73df58a7cb5123eeffc339fe0ece189c84da48cc868b9345dae195e56
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-18.04.0.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.04.1.ebuild
index 6bd5adfbc365..6bd5adfbc365 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-18.04.0.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-18.04.1.ebuild
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 7050bac3735a..c3b6a220b2f7 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-widgets-17.12.3.tar.xz 151088 BLAKE2B 00cbad49940063cdf3f8b5f6b3cf2c29e81c5c6b2d34de9eef604bdfbcf1e55a2b606aefd6a9616d11dc8ef00c220c7fe7d0da65eacb6b057bb807330cca7677 SHA512 82237401900789b624fd5c7111127e053fad0f13bcd56f9edc063604fd9bb6368de27d5a62fc844c24b0e283da01f5b77135e7a021b880b026931ae1e583a97f
-DIST baloo-widgets-18.04.0.tar.xz 245200 BLAKE2B c4e95e5f75d3606fbff417e4e27f7c5a2d8b4c857fd2746940bdf8adf703251dc70325c6c0566c9bd13bc07b3eb02ba4620c1c4add394ca98dc1e1106c9e917f SHA512 51d9a08e852fc339f81ec59a8ee3fa724d906345b8eb2768b33ddf569b1c12364a20c800ff6595cd7f573ecee559628e4737af2e462fe27e7675e4e22eb32021
+DIST baloo-widgets-18.04.1.tar.xz 244968 BLAKE2B 72ff900b20d436fa27070df67af2564d1ab9d38e663cb8755aa7f7c950f25b877e44cf7429f551a2b96bb989c085d5d86eb6c7a8b11715098170c3fb8145fd35 SHA512 2aa16584081cf411626a131dda920e73d9ab5625d8cd30c55b644e2925efda1f05d716fc1c0fe5253f2a7a05a0ab8b8feaba60ee5d6536240369b017e25ae856
 EBUILD baloo-widgets-17.12.3.ebuild 597 BLAKE2B a074d5793edd74e8ce736898612bb7eac439e782c64f522db5b133b84c7d8c107ad2ac9ea11f7a0a78062940fa802fe3aa94e1e79bfd77c878ad5d80be520343 SHA512 a3905e6ca2dc2ac8a3b4b8f03fa3e335820e9a24639af4cd9ae0586abe4e870223783a027ec525e68cdae9f1de91c8b050bab71c4bd3d49d498924ba7b5550f4
-EBUILD baloo-widgets-18.04.0.ebuild 599 BLAKE2B b4e916fedc42a1a0246c38bd926592d912218660bf1c3ca5bc3656dc7eafa4a2a459e3031e9fe70733a5764bc6cd5808f0c755c24a6b0fbd857bd9ae87aa61aa SHA512 cf7018e39257e5b8748ef58f94b868ea8e57fd2c9cbe46ac0ac232b7e822f2d46462c99bc88304c747ee72d51c0707679afcd3ca85c62d208022017b72faea75
+EBUILD baloo-widgets-18.04.1.ebuild 599 BLAKE2B b4e916fedc42a1a0246c38bd926592d912218660bf1c3ca5bc3656dc7eafa4a2a459e3031e9fe70733a5764bc6cd5808f0c755c24a6b0fbd857bd9ae87aa61aa SHA512 cf7018e39257e5b8748ef58f94b868ea8e57fd2c9cbe46ac0ac232b7e822f2d46462c99bc88304c747ee72d51c0707679afcd3ca85c62d208022017b72faea75
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-18.04.0.ebuild b/kde-apps/baloo-widgets/baloo-widgets-18.04.1.ebuild
index 585c9262ec1e..585c9262ec1e 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-18.04.0.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-18.04.1.ebuild
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index 043a21cc92cd..b24c6f3af533 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,5 @@
 DIST blinken-17.12.3.tar.xz 2505872 BLAKE2B 304cf939db4bd4609a0bda247119803d0cedb276d99bd7c3ea4cc449dc85c2cf5db1a474ffa79dd09087fbb9cf8dd8e2e1405d02ee5d8f5d265202dc898556bc SHA512 9cd1ce9f74f94d7beab0192f59114459d3434f341f3ad2d83dc6b659f70e6fbfeafd21ead5ae22f4f07fc03ed2d9da85ad59703f6d6af879355575cf7db07494
-DIST blinken-18.04.0.tar.xz 2505856 BLAKE2B 9c86433b3751600b01e75736ba600570fa71ffd3737b30614eb64716283fa4ce16ca7311d6a1605b6a303ce05e862b2d2971b2ded97b1dc28a40a573d2dd06a1 SHA512 6e226aea5d94d34b36cb3f89214c5bcd1a37e0c4a8958b8abd243f7c4613dc0860dc084f8aa7d66a44f42a6961d2b12c960ebf4eb4ef7794a54fd5a418153d68
+DIST blinken-18.04.1.tar.xz 2507668 BLAKE2B ccafbae2164063f0e8ab325c12be80d38b1b56c3bfadfd2f49015727a76960ebe681583a5c1ec040fd61c54cc19118c2015394166539539ac03d113162a2df54 SHA512 08eb8734657aed72eb47c5bd8822126ebf39535dc4da38b59b680f68d95d442db0a74a5d717e987f653d34d3beda1cd85dcc88d4810e09f427c0a01a45956c10
 EBUILD blinken-17.12.3.ebuild 768 BLAKE2B 02653f2ed7d6bee097378e0afc3e88947aa978bd9027d13bab05aafa1da424e9ef88a4ace0424f134686a207c4a286cc570f708308503ab525c2dbd782940a05 SHA512 9ee30d940c1a3f3cbf398063047ec11fc7406c48751c8e70abd14a54d6fe3febc25118097734ecdc409f80a856274244453e54ec75ec6b6d702ac6fcf923ecdc
-EBUILD blinken-18.04.0.ebuild 770 BLAKE2B aeed4cf2f1b1f9f4a45a0492985ecae692d19c7cac1a618b2bac55165901bdb580cc6d521ed458f997e15168824b5dbe0f006f4fadf73e5f9b9627d8bfec52a6 SHA512 1dfc596d4fc692fd22b70a9ebb1e62dc8f71794b6edb328438852a46f103873f4c98fa196c61f8657981f51ca9de06aac6517120c78d67b740c0184820a70998
+EBUILD blinken-18.04.1.ebuild 770 BLAKE2B aeed4cf2f1b1f9f4a45a0492985ecae692d19c7cac1a618b2bac55165901bdb580cc6d521ed458f997e15168824b5dbe0f006f4fadf73e5f9b9627d8bfec52a6 SHA512 1dfc596d4fc692fd22b70a9ebb1e62dc8f71794b6edb328438852a46f103873f4c98fa196c61f8657981f51ca9de06aac6517120c78d67b740c0184820a70998
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-18.04.0.ebuild b/kde-apps/blinken/blinken-18.04.1.ebuild
index 691085603aae..691085603aae 100644
--- a/kde-apps/blinken/blinken-18.04.0.ebuild
+++ b/kde-apps/blinken/blinken-18.04.1.ebuild
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index ab425c60ecee..cd83d1eb59fd 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,5 @@
 DIST bomber-17.12.3.tar.xz 753868 BLAKE2B e865f2c565eea5def26687c3dc813aa40aca0468e6754f9bbb349266fcceda609f7f8260eb44e2313f253a893892edd00456b517642939028921489b8bf9d3f0 SHA512 3c792fd103b93a2ec5e9b030382256cdba1c05477e04e8d95d0a331dd630d88137e0079fd1b91f267ccbc1c32a60e4c94f34330061380b0a069f689b90efb6ec
-DIST bomber-18.04.0.tar.xz 754256 BLAKE2B d2b0b78874d5c2e4821bc2e4472d375454ac326a22340240251ec65d1ee0ed819795da8453e0e1a19bff147a862808752aeb2cce2e70cccf3eeaadc118bf5546 SHA512 f3acdf0c910b3ca659cf961aa840d849d6809563026df83fab45b01307ac16b46af9f73c329c0c7958a0b13d13fb0ac1469ee0677064507c5f754053b66c7c4a
+DIST bomber-18.04.1.tar.xz 754460 BLAKE2B f30c17bd23ebe7288c6b6102c21f5ba98e26aa661a168553ac333f89915120f69028b8e4a0c19dceaf20a498770c1c32ddfdd0b4b9f113980ab7b991358cbd9e SHA512 24b97268905abe7a57f77c56eec1c4c63374b024becd1802b0b00378f7f236ae57a2a63a8048d686dfb4f77774088e7447a1aa14e5381aeec5fcfabb4c3878c9
 EBUILD bomber-17.12.3.ebuild 685 BLAKE2B b62f0b52aca8404743df8150b990b75228f9b67ce1aae9345f33ae10f53e15c8617df73966be6c880852c1b36dfc4f2522aa986550edca71274973f42fca44b7 SHA512 2858c6a02e8776a651d23bccad7b432bd4f3bb5386840d39bd11275a0154d65ae73aa0fe264a77f5fa1912b8b57898dc69bf68951ce0aaf265e8257188ef29f8
-EBUILD bomber-18.04.0.ebuild 687 BLAKE2B d8b62bfa84ff255f9a0515589a1f0063674340b0ea87486f1a76a1553b0e016dd32928e36799e3608659479a0ee8958783d8a4679e81679055b48a159b68c419 SHA512 9867073869e50018757499d76f4504588b7cdba026763add11849ef309c3e7e197cd5962b67309c7c153b42fa4388551c2425a3c1f655156f5894245c794b5ae
+EBUILD bomber-18.04.1.ebuild 687 BLAKE2B d8b62bfa84ff255f9a0515589a1f0063674340b0ea87486f1a76a1553b0e016dd32928e36799e3608659479a0ee8958783d8a4679e81679055b48a159b68c419 SHA512 9867073869e50018757499d76f4504588b7cdba026763add11849ef309c3e7e197cd5962b67309c7c153b42fa4388551c2425a3c1f655156f5894245c794b5ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-18.04.0.ebuild b/kde-apps/bomber/bomber-18.04.1.ebuild
index 1131554ae2a1..1131554ae2a1 100644
--- a/kde-apps/bomber/bomber-18.04.0.ebuild
+++ b/kde-apps/bomber/bomber-18.04.1.ebuild
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index f7d210ee7ca2..49b3a966016e 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,5 @@
 DIST bovo-17.12.3.tar.xz 186488 BLAKE2B b3cf4a9d6b168e9197290d9fb50698b60122a07e91a732ba2f75b50ae6821bec9dfea41142c1e40e982db53f61026e82fa9370cfa39cc2edb3d605cac579eb45 SHA512 11b626795fef8bf8bd30f086e759d26a8f63f74c05dd155506121e5251e2f2e07cd67f3f337a6eb0b567b96c73980875cfbf02ebfdec3f5e13062e2aff21fe76
-DIST bovo-18.04.0.tar.xz 186460 BLAKE2B 785c3cb9ecfd90e093762902396c93d31577eb84fb8364de85427dc72ba0214d872d0882d9daa0d81821edee3014daa17701654afea3015702fd6e1f5b01c1bb SHA512 f73871a5a6598e6d33f0b14675f3a2f7bae994c22585627f0c5467ed409d13109d87e72bba132236bb695b49956d0ad60d88188d74e1009a039b562f2e6d1477
+DIST bovo-18.04.1.tar.xz 186436 BLAKE2B 9f5558f34a141e34fb75416ca71bb8f2983706f376c5670e470e9e7ae80ab437e6c29c022e59aacbb3066d6bb981b71628f7111e2c5bc7828b43ca6093f4449b SHA512 e35bccc587f3fbd08eeaea4ece58e3d533d9c3fd4ac587df792a6183c95c9e8a05fc6d2e47b987723360ddbad1c0d8b747de6f3212e10a3c16528a5b1b6a0998
 EBUILD bovo-17.12.3.ebuild 702 BLAKE2B 85a85acba350d651339bf61165f7b0de15cf9bf996f3ae942e6267b0a35ab58a73196f92e5c249ead409f6814f6f16b7de8ac90d451dc3bc0c2f5763e5fc22f7 SHA512 ef0e3d99b0ad580a20be16a3ee18c2316f00cfa8d54c88f2135cbaee3c4c288d10661739afac12f5ca84fa3d77bbeb10896b4d5804e7be3138ceac936b370112
-EBUILD bovo-18.04.0.ebuild 704 BLAKE2B 7abe20171e86fd1c18b0a5ded391057ca3d1e180f60edb47f9daffcc6192412d9b8aceab2458d15cfb7ba20f7bf5f947d7d69ee2433cb4b941751172b2554ba3 SHA512 31fc53db3f3e0fcdf5f240b9e9c935260ea363226881e90b7ad3f59bdd6c3a3cdef2c10d8fbe0be37de10df47bf525e7de58d56a2b4b3e0172d3aa965624bd78
+EBUILD bovo-18.04.1.ebuild 704 BLAKE2B 7abe20171e86fd1c18b0a5ded391057ca3d1e180f60edb47f9daffcc6192412d9b8aceab2458d15cfb7ba20f7bf5f947d7d69ee2433cb4b941751172b2554ba3 SHA512 31fc53db3f3e0fcdf5f240b9e9c935260ea363226881e90b7ad3f59bdd6c3a3cdef2c10d8fbe0be37de10df47bf525e7de58d56a2b4b3e0172d3aa965624bd78
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-18.04.0.ebuild b/kde-apps/bovo/bovo-18.04.1.ebuild
index 8f3de523e8a3..8f3de523e8a3 100644
--- a/kde-apps/bovo/bovo-18.04.0.ebuild
+++ b/kde-apps/bovo/bovo-18.04.1.ebuild
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index c214824b8658..f9a38ab64b85 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-17.12.3.tar.xz 223424 BLAKE2B 57622ccc637d9a41634d90e764f1c9dfdbe60e7a77d13632397e41222dc1cc5b544f268451132a11f8a3118a9042c701e993eef512ef5ac1df05aeea6bc1d35e SHA512 18c8bc3deb273022543c209410403f7bf7a9b13bcbcf9be601ef011dc9ae6c0335d866d1e696b410fcc4751830cb824a1fe530299ae76fe92e2f785f6886bd11
-DIST akonadi-calendar-tools-18.04.0.tar.xz 220516 BLAKE2B 58be803415e1c6ff6f02930a356d3db1fef605bbf97abf0cd8b8ee05596881d173973bcab0af37f5c933f56ee2dcddafcf765e697d8667e94a662a8c304dc20f SHA512 cdbc1a59c5fe85928786ae8645d19322f108718e9c90fd55aa78f48bcceee98ebca328f814630fd188b7e22f1c889dbc112077267523c76adc622a2b8733cbee
+DIST akonadi-calendar-tools-18.04.1.tar.xz 221120 BLAKE2B f36fd0f32dd9554b992efb859b05ec1e09cdc649be12f7f0cd55ddb9b6db814763fa43b191eb3969eb02478ac85b465ab327c94832156e9dbd7c7613e9b889fa SHA512 7c9985a19882d31b698acbdf94eea25d6f572e7fd53927691777a4bf768b86c630c0801cd8118cb0770fa66a8949bf81a032d0c6e4c83b945eb1274cf4ca0542
 EBUILD calendarjanitor-17.12.3.ebuild 1029 BLAKE2B 19aac37a01db2716f31fcd2a6082a68eea84f8b8fb7a35d76721d2d72cacec48e49fbd08cbdafbb74f6346ed4a8f1084f3e0c62450f04740a9112568b73cdf94 SHA512 beda41c1e93490da51240a8abb47d028f2f1a3cb5b5daa6a11fdbe7e61b58c70941a9d62ddd577a2d7921199787e1dc29c15bdc6d10859214e199fca1f5de55c
-EBUILD calendarjanitor-18.04.0.ebuild 1031 BLAKE2B 515efde0fe008e2d1625e3a51f4b3ab5ba09fdf0cf10fc40c64e1010456ce13165f30e5443c29fd8a1804a514c41cb7c8080841b776043a49f4572545a9a2779 SHA512 4f2b369eb174348da6ad3cd3958ce363df5efbd3a2d153ac33bcb259db30cd58fe60cd22b2be8e0ee961033c11a6ea94b4eed67284eb72d4041132d4dcbf01ca
+EBUILD calendarjanitor-18.04.1.ebuild 1031 BLAKE2B 515efde0fe008e2d1625e3a51f4b3ab5ba09fdf0cf10fc40c64e1010456ce13165f30e5443c29fd8a1804a514c41cb7c8080841b776043a49f4572545a9a2779 SHA512 4f2b369eb174348da6ad3cd3958ce363df5efbd3a2d153ac33bcb259db30cd58fe60cd22b2be8e0ee961033c11a6ea94b4eed67284eb72d4041132d4dcbf01ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-18.04.0.ebuild b/kde-apps/calendarjanitor/calendarjanitor-18.04.1.ebuild
index 026dab8a1418..026dab8a1418 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-18.04.0.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-18.04.1.ebuild
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index d9181504e57e..bb6b3eab4def 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,5 @@
 DIST calendarsupport-17.12.3.tar.xz 644864 BLAKE2B 52733e61d06eb1335f5e104daa073be87123c71af99dd2894934275b71b7a61478ac7853954492681327b5047a85dbaf7d634ca7bc53fefd115d3d2148e76048 SHA512 db578210c496c0e127e3c11efeb71cdd1bf56d0e61db6b82528ca036dbe83bb08338598863e51e7c8bead8f83169e1ecfb6080231e2bb97678c3b078fb12ee22
-DIST calendarsupport-18.04.0.tar.xz 644584 BLAKE2B f7fd7db775531e6d081ed0ee44e1bd905f881345cdf12ef669b424ef74a91cf6ab2dbefcac6f7566c42d0bdfbf0d4f59aacf4075aa165136286e0d089b3925f0 SHA512 309075f7b898717bc92194b4463ba3e4a3abca0916f6a4a0c2eaa6d37bc1db84fea99989b3366f914555823657ac4247b88fa2334d861713246de34a1d64acda
+DIST calendarsupport-18.04.1.tar.xz 647072 BLAKE2B ba76da171147a1287597af98e455d0b667971c00e5a18e7c297296af0bbb727a49e713ee400e569af869a979f28610f5c23d80d05818b4e31449f54ceb3b84b6 SHA512 29af53325d69ffae17b2c444e1347fb862e1e35462335b42190f0a0850ad14513273677928f09dd92d24b1a8c2417f1433905295b968a289efb76d6d12d03dff
 EBUILD calendarsupport-17.12.3.ebuild 1099 BLAKE2B 6b8b8e7fb0c51e9820cded52e47369ccf5051aa05b3dd014efbf1536d773db9abc7dab18e9d9e579bdcd5164db30c280452aedeb7def43e6e5a504b6141c8c42 SHA512 5b0abb1569c17da4c776639e006fbe19b52b6080801aa0d4273f48271848d9c4334a2a713b2d08801a64bfe5adb6c47cc635e32629d6fb19b60756eefa927ac9
-EBUILD calendarsupport-18.04.0.ebuild 1101 BLAKE2B 06c987a38a03ce150d785d86eb8a358b82a001501ab1aed6e48bfb8ba139cf82fec277ce8e33d4b158d85a98ef0f4e7c41d5ba0213517b65ff78d5b490cfef02 SHA512 f93a5be882627278bbbb52cb4677308d1999b73d9b08776361ff3d0287d9317173ebf629c3e0e4fd9696ef9c9985414f0317928e5c472a87569b11427cbd653d
+EBUILD calendarsupport-18.04.1.ebuild 1101 BLAKE2B 06c987a38a03ce150d785d86eb8a358b82a001501ab1aed6e48bfb8ba139cf82fec277ce8e33d4b158d85a98ef0f4e7c41d5ba0213517b65ff78d5b490cfef02 SHA512 f93a5be882627278bbbb52cb4677308d1999b73d9b08776361ff3d0287d9317173ebf629c3e0e4fd9696ef9c9985414f0317928e5c472a87569b11427cbd653d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-18.04.0.ebuild b/kde-apps/calendarsupport/calendarsupport-18.04.1.ebuild
index 04abac8577ef..04abac8577ef 100644
--- a/kde-apps/calendarsupport/calendarsupport-18.04.0.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-18.04.1.ebuild
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 0aa8ef323bb0..4109b26eee03 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,5 @@
 DIST cantor-17.12.3.tar.xz 1066992 BLAKE2B fdaaa42adf45b3013337374b83b6da77d6adfd610e233d56a80965f35f3433b412d4f1279a3c2c3e257a57a69b44d7e190f42e325f0fd3fa5ef4223ce6ddbfb7 SHA512 37d080fa3e87cbd105e33c687b5bc670c0833639873c41e1dcc519577103186ec629c85b5a1875af915267eb7ca3d13f170894bb9c0c882c964ccc02a24cfa3b
-DIST cantor-18.04.0.tar.xz 1068836 BLAKE2B 909f78fd5c19f95caa26633906c36e1b75e8009adb5e336e1a065e168bb8988c8875061d3699845c5188edff7db106b79bd187b0ab419d2b327789c44c904883 SHA512 a53d51aa1a095aad1ab0da21535b8409c51e246fa6fc08f30bb641d04e48783e6b2f610d282e1628471c99a547afe0c63bf795b7450bce9f28c8ba7aa2550617
+DIST cantor-18.04.1.tar.xz 1070188 BLAKE2B a5a6dbae3305b00f9f9160e1ab9680e40fadc0bc67020235188c09dc35d5b7a271858746a918c100be9bf180a7aff0bcb728d5a60dfec7ae007fe0c075ec07c3 SHA512 7a5e01ef920f24587009cd58e27428c4e6686250af5a2a0449f95efd6b994d054cf32c9eaa78716b940f9073b04fa0086e6207bb7a30934d1c9f2fcad98fa311
 EBUILD cantor-17.12.3.ebuild 3179 BLAKE2B f65cd049ec6997ea90b23d95ceb780f253abba21471f951cf42c1e9f6d5800261743ff40307c754486ce50f976da3ece31acfa28573bd75ad2834dc86002962b SHA512 6f6c02bceb62668e6deae92804f6de12a842234a8bc2597f65b93f202ae756f18fc91ab4fda4bc82d396030bdc9bbe8b76cb425386293a2f09676c5d12740e49
-EBUILD cantor-18.04.0.ebuild 3181 BLAKE2B 0261eb7e7526a73152dbfc6474218b6ec81eb8a6d612f8de2be2a53e0871492303704b93ee74d57b8ffedd2f5fcd7900f199c2016656693cb3da7fcbcb2290ca SHA512 c6acfee7b2aa258b16d66d885f6ff231ca3eb5c5d58dd4939e15f444bd33273610bada28119e8252e3c5e67c8d9dee81bbf2e4fe0b2a6576b538f1c0ef6e4200
+EBUILD cantor-18.04.1.ebuild 3181 BLAKE2B 0261eb7e7526a73152dbfc6474218b6ec81eb8a6d612f8de2be2a53e0871492303704b93ee74d57b8ffedd2f5fcd7900f199c2016656693cb3da7fcbcb2290ca SHA512 c6acfee7b2aa258b16d66d885f6ff231ca3eb5c5d58dd4939e15f444bd33273610bada28119e8252e3c5e67c8d9dee81bbf2e4fe0b2a6576b538f1c0ef6e4200
 MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
diff --git a/kde-apps/cantor/cantor-18.04.0.ebuild b/kde-apps/cantor/cantor-18.04.1.ebuild
index cd2bf41394b4..cd2bf41394b4 100644
--- a/kde-apps/cantor/cantor-18.04.0.ebuild
+++ b/kde-apps/cantor/cantor-18.04.1.ebuild
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 9fec48ce7b0d..dfa0cdea8259 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
 DIST cervisia-17.12.3.tar.xz 1905900 BLAKE2B 8ada882e8bd19a272eb622a0bdb5e9fa9a20ed0c31c4b05ecde68f969288907ce00ea4ebd1c541aa8f5e51e3ca248b8413cd86611e96ca94e186cd6edd1e70b4 SHA512 fed1fdb51cba8eb2e02139095fc250f4d4cbed261a815cc9e8cb12df193da79440026730aad4fdda73759a4b8571776014a74b5d0517637d2fd2d86432e947c5
-DIST cervisia-18.04.0.tar.xz 1906028 BLAKE2B c53b49084e9ae91381f8b3704e6d6280897d688ce5ef7e80fa34bd4d291410f39def54468d7a1928369cfbc58dbe2a4b0fbd80fb0a32fe6dcec4936ff6611616 SHA512 6e1c83b4cb33c8963f964639cb49c0218d4fad0f2496c57ab9a206105cc26d72de7717c6f95fad8b99e33a22edbc0b1624a2895b635140ad5741cbe5dcdd3f43
+DIST cervisia-18.04.1.tar.xz 1906476 BLAKE2B d004091e1797ddedba6099450c6193456c64aaca3566e5f7d739750cb3344e0ef5a5a44431a16c3282b84eefbfdfcda6a728c8dacf9507c448a3a9fda648337d SHA512 f3f29c277b4ecccbbcdd539d24fc198b0e347bbce3b8704107354e00faaaae385c98c5e2f1a715d59af76cde2012ebf289a7d238e71385b2a2a913b7dad8675d
 EBUILD cervisia-17.12.3.ebuild 899 BLAKE2B 0c84459c973444f7472abf611c52ba0ad9eaea41757e8313a80d925e14d41e50f7d24237471ed4b671cf685f77ddb72ce4dd4e25f41a8a7ddfc67818485855d2 SHA512 32c8623e3b2c9afcc1589a5335d772d057341b36fc8d51e2b23d65c9d9436f229576e2c015ab24843bb01cc5df22e917031b2b044e7a9f320c45f647c4681bfc
-EBUILD cervisia-18.04.0.ebuild 901 BLAKE2B 02b65ad97b02ffb248a9cc1c42ed5a62133a31c558efc84a3c14db0d146c1c5582d06ce2b1954abe006c9400495ffc37d134d5bef38fa87a5eb11a967bde718e SHA512 8f92984ac5c39c53e755a9cdb48951436b49dbb5f2ebdf23d69bc667c398fea1578eaa99d0a1252f9425334e3d477192bbc19fcfb8355ae5724acb60d12a7f40
+EBUILD cervisia-18.04.1.ebuild 901 BLAKE2B 02b65ad97b02ffb248a9cc1c42ed5a62133a31c558efc84a3c14db0d146c1c5582d06ce2b1954abe006c9400495ffc37d134d5bef38fa87a5eb11a967bde718e SHA512 8f92984ac5c39c53e755a9cdb48951436b49dbb5f2ebdf23d69bc667c398fea1578eaa99d0a1252f9425334e3d477192bbc19fcfb8355ae5724acb60d12a7f40
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-18.04.0.ebuild b/kde-apps/cervisia/cervisia-18.04.1.ebuild
index fe35d7708a72..fe35d7708a72 100644
--- a/kde-apps/cervisia/cervisia-18.04.0.ebuild
+++ b/kde-apps/cervisia/cervisia-18.04.1.ebuild
diff --git a/kde-apps/dolphin-plugins/Manifest b/kde-apps/dolphin-plugins/Manifest
index 6fd71e6e6c59..38bb1b0619cd 100644
--- a/kde-apps/dolphin-plugins/Manifest
+++ b/kde-apps/dolphin-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-17.12.3.tar.xz 187288 BLAKE2B 205db4fddf395f5e1c7ac9db123984f712867d2523b916ba0017525872a56460c2540dacc6b4e49cb3e876d3d504f619ef603372e98622d1634804cf5bee4efd SHA512 fe0e2aabea0870e8f3127178a10c70264fd339391f88aa9e2a1a5238cb25a0ef47ab2c66f60d2da0788a41399cdfd4099542c81d47e8db1ea09cf2f5941fdeaa
-DIST dolphin-plugins-18.04.0.tar.xz 190108 BLAKE2B ed2df9a3e07cda89d9d7a6b7cbc2bad0af307005af98805bcd036c80b6024c2e643f5e67534dcbbbf83293ad4bd5a5b3b11a61b527a6685cd00bb79ce95807bb SHA512 26d44264cbf0e86baeb8007c106e23a3282dc3a76186bdf9486e662ad2ef7d5b19dbda567858113e82281444ead3a8b5a1b073270630341de5d840aafc7103d6
+DIST dolphin-plugins-18.04.1.tar.xz 189840 BLAKE2B b7d96426d88e5997661e9ca8adb131ed3122b27ab0f4c2181980660202b9960bca6815de62ae3fe971537226492b5a9feef23b0936e36d092be7882575b26d52 SHA512 83cf680429bff9c6def3cff6135987760e223d22f41ceff385f4e0419f882054f4a2f02193454b9709128cdea8855442bc9f229e913eb2ac91dc5f30073fe922
 EBUILD dolphin-plugins-17.12.3.ebuild 1841 BLAKE2B fae91928416caa376bea9ea1fc58d261665e3777f2d4768b1d2741b1059adc61e58dbd32756301035c444fa21f2f197acc1e0e707cebfe19a2fef8bf07b0db52 SHA512 30ca4eb51eaf61d2bdec582227ff29a1d3ea00264b4f99f22ee593b1a052b3187e75a56792177161d88f55dc677d7e19ef913d08b74086b321080b050b220d9c
-EBUILD dolphin-plugins-18.04.0.ebuild 1843 BLAKE2B e299b83b8d1b9dce59785dc4ee02bf83cec2e48a7708aef8f22d985ed30dac73dc6ab45381d12ab0294569f7b2c7226b55f5c81773692c5baab81172bfb69537 SHA512 8d79773f4279d957f465532c9f3e0fc75d182701550ddc50ffa1989b05747e08d70074ad3593826879bc1000cd800c6e404f84527dcaca8ce87fb98d1f16a23e
+EBUILD dolphin-plugins-18.04.1.ebuild 1843 BLAKE2B e299b83b8d1b9dce59785dc4ee02bf83cec2e48a7708aef8f22d985ed30dac73dc6ab45381d12ab0294569f7b2c7226b55f5c81773692c5baab81172bfb69537 SHA512 8d79773f4279d957f465532c9f3e0fc75d182701550ddc50ffa1989b05747e08d70074ad3593826879bc1000cd800c6e404f84527dcaca8ce87fb98d1f16a23e
 MISC metadata.xml 532 BLAKE2B f874175daea65b92744c45f776610d0f5964737008bebd51e791dcd308126fa4e943ac51ba20bf8d69ef75c0846d925e4e8e724b6bbc03176c407e09a6d636f1 SHA512 9dda51a623ccbdda9ea7f5eaf24ac67df732bd97f510e524dc23f2cf2785d4c3dd7359f1f208520aa09899f5f049ada99f75ec186f4c89f27a18f4f697a444fb
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-18.04.0.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-18.04.1.ebuild
index 125d149d68cf..125d149d68cf 100644
--- a/kde-apps/dolphin-plugins/dolphin-plugins-18.04.0.ebuild
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-18.04.1.ebuild
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 5696cc4ebd29..15b66ef8d825 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-17.12.3.tar.xz 4841752 BLAKE2B 1f58cb0f1663e131a1b8dc58fc47d40a8a68bcb998fd3c6191f99176263523d40c1d9057b569c10c14e2a6b0be91b2eaaf07a54acdd386984d0da167cb84fabd SHA512 44cf8baaeead69dd5529ce7da96d78f507029fa47ac9ac50de9d77cb15335dd0b0e0c916f2cdd0d5cadc465e461115dbfd02c51af38d03da985d66bd22456136
-DIST dolphin-18.04.0.tar.xz 4843460 BLAKE2B 408e0c3797885a80d128247f178e4b966fdd280c5538fcccd40e4cee7bde6d7821616df098e28b79fcd3136a6b14b654ee053ff6bee0c6424613e9560bf55f01 SHA512 9c941c37d8c1b132c092a3c71f75b821427b170ded6be8a0d1ca19a5807c9c2689cd695ee8e953443e2769358e3a28704c1880671a1fa0daaae9c1149cc12642
+DIST dolphin-18.04.1.tar.xz 4849868 BLAKE2B 3335ced611590b51200135207b5bc5e2266504c7d556e8a903b6f3f63131547369d1fcccce8f13f93f4f15c84e695827ef4deb6088e5ec6219c15f85c140313f SHA512 13c9f45282168a4ae68b9d0977b1734918c662028043167ab36bc67b7b7f1756930a613e7bbd25bafc6db7e1591524f2ec3002247838ddbf0dc49037d4c7a0fd
 EBUILD dolphin-17.12.3.ebuild 2230 BLAKE2B 8e3d435eac7d521830bbd13122d7616bc5c54b786eef8386dad3c9b97447058a843d61c060308518c84e776787cdeb0e1b3399fc099f69faa6b7f055eae79c58 SHA512 b3999175d7bf0672fce3b697104b9fb024c9d0487dad8a40d1f37405ca7d611b2981a76629c024eb06cf7503c900a2a2d70c365d718fd8b173562103f1db975b
-EBUILD dolphin-18.04.0.ebuild 2232 BLAKE2B b4f046f19a528c78bf029e0a7834c4bee8759c053fdafb3c7cc199f527981090eb670b70fcff76854071a7fd656bc30da75b96cc60661724a0a54f0d3774a62f SHA512 d1fe6680f462eb3ee58bd6e12d13d0cf9594dbf14b8a4521d241c62e3a2a7d46e74b9a61120450a5037a9f9c61d349b0a0975c208fa0759e667788d4495b7fa5
+EBUILD dolphin-18.04.1.ebuild 2232 BLAKE2B b4f046f19a528c78bf029e0a7834c4bee8759c053fdafb3c7cc199f527981090eb670b70fcff76854071a7fd656bc30da75b96cc60661724a0a54f0d3774a62f SHA512 d1fe6680f462eb3ee58bd6e12d13d0cf9594dbf14b8a4521d241c62e3a2a7d46e74b9a61120450a5037a9f9c61d349b0a0975c208fa0759e667788d4495b7fa5
 MISC metadata.xml 331 BLAKE2B a91c4bcb2198a9547445e94220760e327f2cfd2225e4189b4d5ec23ade31bd0c2560403cd085d91430fcde303df0cf25477b840aeda3010f332a3f053aa5aeaf SHA512 2946556cf6d92f1d2c33c44b4b261003d6e26f2829944082422afceab77f7a504dac7cc945fddaa0539953884b57a41dcc8f2f8b972b48fb4dca502b8a92d367
diff --git a/kde-apps/dolphin/dolphin-18.04.0.ebuild b/kde-apps/dolphin/dolphin-18.04.1.ebuild
index 256cdd947622..256cdd947622 100644
--- a/kde-apps/dolphin/dolphin-18.04.0.ebuild
+++ b/kde-apps/dolphin/dolphin-18.04.1.ebuild
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 04e0bb2bc8f9..2af127197081 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,5 @@
 DIST dragon-17.12.3.tar.xz 1464016 BLAKE2B 54360c45227c2260b4b401978e902de4777a5357812f93d73952938e6400196369e4b41777809619aa8cf2c0bf9a840b47ab71fbd3348e61f37de8943d1fd227 SHA512 0ba2e1845d6b6fcb3885e340160f37d924afd5d5b1a8f1f3e196ad5b04db87d55d1460feb447e0845802757e3b81d550fafcfca2e91bf334209953fc4466eef8
-DIST dragon-18.04.0.tar.xz 1729408 BLAKE2B 2351cc4e10cb4836a76f9b4c02f69412d184439dcdce3640a029a1e49387855038ab269fe2e75975a82a270b19fd0d0b301846ae316321f539e997315e39da1b SHA512 734ff41eb868d8e1439b07c09e3bb705a691d5ae182968fcd507ed48c5dca2b4ebdfd36042f666968b31de6acddfdcf14827d24587051f21f8bae6dcd346c45c
+DIST dragon-18.04.1.tar.xz 1729096 BLAKE2B a6bdf6cbbe85c62abd319643b96888a0396e4b8edc7c70217b91eaa66d7fc39f34124372e666ff18738829139251074f31f63f9fd1326639811f92a5cdbe3ad4 SHA512 8ba785d3ad30e4adc2bc63e9547945799074e49c14fd93b20923fe2c7cee7f0f7afd5b5477582f700c729e3e36fbdf3cc334e16e79735b2da574e2e53f0368b4
 EBUILD dragon-17.12.3.ebuild 994 BLAKE2B 6178094991fce897fefa9626c65c630fc62aba9c716096bd77f74eb7177677f421a4cd6055c4d88d7609730398f9b4d5464d593ca5daeb811306664a07c2fb0c SHA512 adad2bc72bbb13147c70f8bd7c7cf8cc73b9980473f6f7691676d448848307c637b13a5895feb06804888b9827e1d4ed4de97de3c729eda20456667af73d1fc7
-EBUILD dragon-18.04.0.ebuild 996 BLAKE2B afbf32c22cf17e0b45aa6b44b60827253d0dda4566ae1095043e1c37f9b7a7478ac12ba8a0f7003cd07fbbc9eb7ec756728c7af77dd9a128bde9fa1ea85d06e8 SHA512 ca172c2c600e8090fc60e5495cbb1bc23857fd3e536122ee6e4de6d6cc505c0691c2139242f58ca42c7e16ad3ad787090147fd516e1ef3a346c6e2d7499cff01
+EBUILD dragon-18.04.1.ebuild 996 BLAKE2B afbf32c22cf17e0b45aa6b44b60827253d0dda4566ae1095043e1c37f9b7a7478ac12ba8a0f7003cd07fbbc9eb7ec756728c7af77dd9a128bde9fa1ea85d06e8 SHA512 ca172c2c600e8090fc60e5495cbb1bc23857fd3e536122ee6e4de6d6cc505c0691c2139242f58ca42c7e16ad3ad787090147fd516e1ef3a346c6e2d7499cff01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-18.04.0.ebuild b/kde-apps/dragon/dragon-18.04.1.ebuild
index e97559abf858..e97559abf858 100644
--- a/kde-apps/dragon/dragon-18.04.0.ebuild
+++ b/kde-apps/dragon/dragon-18.04.1.ebuild
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 32a4645f2578..eb4df7bb5ed0 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,5 @@
 DIST eventviews-17.12.3.tar.xz 437868 BLAKE2B 294cfcbb750ae81714257b56dd7f2c7817be8182331ec3517c96e17858997f1e3c49b3ecbce27e906c9485fdbc2f2bcab94131fc9365a0fc484b799ef2e29877 SHA512 6a51eef25eb9ab0522c95ec4ed800af94e5a1243b597e7aee4619a1494bdcd26b08df4d42d04d837c561f5c0d3434edba9f4a72fdd2433816ad3e9e0e6b6bbae
-DIST eventviews-18.04.0.tar.xz 441120 BLAKE2B 0d9c0b850800fa4647e85b3f9e41edb9a731332429227d87ce909007ed1978e227e9d1864bcd7882e442e0370143b653c4d5335c26696f82a83ccaabdda02279 SHA512 c228cbb8f9d09fea8c826eb04a24d6979e63d78c881b9c515151906e6309f8f86e0ff758f1eefbc4c2cb1f233616ad8eb6b9ffcc04b6d65d0068b67747b79ccc
+DIST eventviews-18.04.1.tar.xz 441512 BLAKE2B 64cac1d26536fccf25c2ccfda225219c21c2a13a4952684c5ca5a532ddd35fd23f0e95535639487f94029b3e6809bfd025e312c8e5b1ef88437b2cd3c4d3b15b SHA512 a503cf9cb0700685dd7b0348543ae9e95b9e3711889fe10365ec69e4b63e58664a12761071e3738ba868f2725f2195472489194521fa563b899d54d7591df091
 EBUILD eventviews-17.12.3.ebuild 1028 BLAKE2B 9cf70479a89f325ef19a53ca963c62807f1cb7256be93e36ba22c37f4d2cb00e222152a2c211485303cce829a3f78e700665f2ad3f354b715c9fd68e90d07019 SHA512 d48878283f9480486e99291fe6ac62bde34eff6f51220abb2cda9a25f09e89c85be22692095904feeed1db7e3d3e5ab83ef7fe0a383fa2b76480f65c920a74d2
-EBUILD eventviews-18.04.0.ebuild 1030 BLAKE2B 41627fe735e93e3eb21510097bba83d17b3bf65a9aec177e1df89c4265bc535eb4cb636895d235cf954040748d0abb432b8662334772058ce982bca7046319d3 SHA512 0d47ceae795d0b382eafa7be4a75e6e1a611a36bd94e0cd5a15dc72c698d8d2ab3b81e8f2c5e94fbcad7a0a47921a0f4906f54a48904bb8c8e9d75fa394cbede
+EBUILD eventviews-18.04.1.ebuild 1030 BLAKE2B 41627fe735e93e3eb21510097bba83d17b3bf65a9aec177e1df89c4265bc535eb4cb636895d235cf954040748d0abb432b8662334772058ce982bca7046319d3 SHA512 0d47ceae795d0b382eafa7be4a75e6e1a611a36bd94e0cd5a15dc72c698d8d2ab3b81e8f2c5e94fbcad7a0a47921a0f4906f54a48904bb8c8e9d75fa394cbede
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-18.04.0.ebuild b/kde-apps/eventviews/eventviews-18.04.1.ebuild
index 8b6b5841912a..8b6b5841912a 100644
--- a/kde-apps/eventviews/eventviews-18.04.0.ebuild
+++ b/kde-apps/eventviews/eventviews-18.04.1.ebuild
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 74e03b022585..18e315e1a42b 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
 DIST ffmpegthumbs-17.12.3.tar.xz 21100 BLAKE2B 6f0ee8bd6c8d775c463734e83c44ee6a59cb52d7d8a622aa33b10e57b944f26aee5f453fc2cfe153d6d970114b19d524811681447eb01f5d8b16bd90e1897bcb SHA512 923bd21bc7e27c3ed511c987ae8011066b713acf6f14794c00cb26a0c6c3d8859a88db02c88ec5cfbc4210dd4a252dddcbbbe6e768d386617b26af3ea9b5184d
-DIST ffmpegthumbs-18.04.0.tar.xz 21092 BLAKE2B 3c60565ff1390b1efd9598dd6ef087c0f6a6231d1f1587dbfae63143a8d9771487d663413aaa038565390758b4048c83b941a46a1c7a3dfd130183a602249f8d SHA512 3e8e3067b4e93478a4cd25a53c4f6d7858291b4e47ad9b85b9459838bb3078e7ea541364dfa2db7e48168f3211d3dff78d9a17d5b6349a9d9b1b164504b2be7a
+DIST ffmpegthumbs-18.04.1.tar.xz 21228 BLAKE2B a80534367b76b7ff0f696e1ee461cfa77faf7cc1ef7d1b68bb53eb914165b233972230b369763819191a502fad090539e2172772ae528e63c77bdec54e99ebaa SHA512 4997043e9686d48e2158ce599699750c856a1deb0733083f00cfc741313177438839680cfc8b92bbe38855f13dabaa9e8b2c638c38136dd8f1f105913cfba9bb
 EBUILD ffmpegthumbs-17.12.3.ebuild 436 BLAKE2B 1cacb9973f50bbe7d728a2f5cd98e4069db65f49ef979724130fc1c44e9008a400cb963c348763fc43a2d5baaa989ce6874f612a824d98edc45d9e3c155de843 SHA512 036321d6c9cd10f8b118916926aaef81692b73ee07954c6548af423d03ef8c7ee9f6e07bc1cb533e6ea351c4450f798d97b5838b6c07a77dc097ba0d943f31f6
-EBUILD ffmpegthumbs-18.04.0.ebuild 438 BLAKE2B 7f5d2339b4c958231a44f54a6ad61e538d9872e3cf51f464778d6629b2882373ee5cd5f2f2f6408a700c2f11d88a52bd71522720d71a3be47d42e70cdeebc17e SHA512 3fd443e1dcd4ff7800067f636fd464d11f59798bf715fae3c12697443d1012a8a6f7e39ab350de8e32fd7661dae42adb36790ff098902b0a90c88055a689d8d5
+EBUILD ffmpegthumbs-18.04.1.ebuild 438 BLAKE2B 7f5d2339b4c958231a44f54a6ad61e538d9872e3cf51f464778d6629b2882373ee5cd5f2f2f6408a700c2f11d88a52bd71522720d71a3be47d42e70cdeebc17e SHA512 3fd443e1dcd4ff7800067f636fd464d11f59798bf715fae3c12697443d1012a8a6f7e39ab350de8e32fd7661dae42adb36790ff098902b0a90c88055a689d8d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.0.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.1.ebuild
index a00942c7569b..a00942c7569b 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.0.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.1.ebuild
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 3aec38166168..2f4d854107e1 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,5 @@
 DIST filelight-17.12.3.tar.xz 654916 BLAKE2B 3543b15b6a1c691769c01aa24bcb8b8b3f1b81d0060ebb7409e8f22749fa6b08cd5ca0eff94e6a950c6f027bf3c56afcf7f43cee27192a34284509e3d6a8d670 SHA512 6c8efe81b54bc5fa0111d94c65a15a6a2beb079790bb741a38f336baff417eb5c8d6d133063afbd538378b5aadea08d221915cfaab8430fc4dc32a889c2057bc
-DIST filelight-18.04.0.tar.xz 657908 BLAKE2B 94e8ce3c4ab5610e33c610a435919959dd2eefae3d08cd429511be80be9c896b52bd7c9c5d3a9f2e6d63c5866b5da6089c7dbd7851a3c6d76b53a67968593f78 SHA512 ec7a1985ff60b4553b365094de42fd961c44ed9b2f527bf8a7dd8b99f7175b7b29435d296d2933132b182320698dcb5b79e37458ec17d6dece4dd2af43c75864
+DIST filelight-18.04.1.tar.xz 659056 BLAKE2B 90ee5a918d0bc729e643da1351bb5222469a4448926c6980fd412e634b2ecb40fe098f8dc6ad13ce49ed4e15072f3c2cdcaf21fd510d1b64d90ef4063b1f1dd6 SHA512 265cbd30bd87a9767680657e4ba598de7395db5ac8583c636564f82f55dff416658aacf66691507945acfbb019e48db8ddde94d325ed623b80faa42db2a53b57
 EBUILD filelight-17.12.3.ebuild 697 BLAKE2B 325b5ffebbed3e5cb98173fc20fb6a048d35de8cddb9ec8956823e59fd65fa30cc8a84a49ad8fa1f1fa5335c4c2c52a6a22e403571996babb6607ab356468e49 SHA512 6c9e6f0e094463deeb5d1132bb5c66fe5faaf249a80c11e8b5e09f84e89dfafc6b1b610e329c97beb8f7e06b04f562911474b1e0d22978ec8c6f80a4886eeff6
-EBUILD filelight-18.04.0.ebuild 699 BLAKE2B 6e9b88c7f2f2e90a799caca7ec74a45f4132600c0b0a35a2074e7ffa7e5b9a450b839ac83be89045da2f79f9c4b47443630159117d7847010a817501eb24b7bb SHA512 e1045b8e20af7a4394d171aed98c14f371198e394863bf13e8eb3aecab2ff8e3d653f396c046e06f163a7ef0f687699991a91ed207689670d65d0c9596f0adf0
+EBUILD filelight-18.04.1.ebuild 699 BLAKE2B 6e9b88c7f2f2e90a799caca7ec74a45f4132600c0b0a35a2074e7ffa7e5b9a450b839ac83be89045da2f79f9c4b47443630159117d7847010a817501eb24b7bb SHA512 e1045b8e20af7a4394d171aed98c14f371198e394863bf13e8eb3aecab2ff8e3d653f396c046e06f163a7ef0f687699991a91ed207689670d65d0c9596f0adf0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-18.04.0.ebuild b/kde-apps/filelight/filelight-18.04.1.ebuild
index 03b58843a55e..03b58843a55e 100644
--- a/kde-apps/filelight/filelight-18.04.0.ebuild
+++ b/kde-apps/filelight/filelight-18.04.1.ebuild
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index c7086b48beda..a95303f6e527 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
 DIST granatier-17.12.3.tar.xz 1959944 BLAKE2B 8b25ade780f0679f722eb3a4e323adc73c2e3c3d774595a934bdb2d6017eb0588e2163b0610bb90dd2277a0dbd9e6df590c2fdc238d36d80e50b335abd8702cf SHA512 9d3b8f53452a345a3c48547dc04bb1e58ab35f8d25b0e7611fba4adddefd04b705b681aa24e7e504e742a65b025b0ef5869d1959de9199f2f6d5681bbf7290fc
-DIST granatier-18.04.0.tar.xz 1960192 BLAKE2B 73a21bc59b32cdc5892566331af04f5ebf7f206a6f0abb729b5ce86bcd4c11e6d027cb5a4dc3e671bd6f48cdc0b0a56112ade691d7c6b70f111d95e8aa8af381 SHA512 826e2b0db5ecf19657f260bb1e405604c97f8264f974482f68a25c3836997bf9fcb05379784925c753b2fa39352e01639cd6e3c8218e3bcc0d172212f00d4b21
+DIST granatier-18.04.1.tar.xz 1961324 BLAKE2B 5ca0d7f736708dd1fd909d634b97b83543418ea2c1977763118ef551f1d8ad4091a963acad4390fcf5446af1ced498ed666b48d98e33912c679947a18fdc641f SHA512 8a752ae32bdfa3c3c459f7ed2fb80883494a03eaebac8555a18fd3bee823894a47c5802b3e9da17ee050c02f927bb2812e449e4651d34f9bf367213962b7a0a3
 EBUILD granatier-17.12.3.ebuild 734 BLAKE2B 317d5bdc8e04ccd6efc3d3133e84967c29bb68ff65c6ad3001e9a7e28a62495f1db35d5b1ad345eb966b37f06fb337e1be2db9d539d4c10d6ee354424c381c6f SHA512 b3c19a91781523d509800563c93531106cb8455eb02bcc4c6a8bd1efbfcec2c9a3ea1c4fc4b622313e8f85ccc4cd3c27ea506fa5fe4c6b6fc0c4dbed72e58904
-EBUILD granatier-18.04.0.ebuild 736 BLAKE2B 8dcc7076fb8e0969030d2221fada5003c4ec9dee303883c19075ea90e2381c51f0eaeaf669c588d9d13ee365723ddd28ec8c9f55909dba8e808af15d7430890a SHA512 07cdcde27cbab58c48e4f68ba9817677e049cc872a6e0223183cceafc29d47f1492e1bb35c77a55c023d6fd396b1fe83c151f0546d318c8d63ae4c0329b8dde2
+EBUILD granatier-18.04.1.ebuild 736 BLAKE2B 8dcc7076fb8e0969030d2221fada5003c4ec9dee303883c19075ea90e2381c51f0eaeaf669c588d9d13ee365723ddd28ec8c9f55909dba8e808af15d7430890a SHA512 07cdcde27cbab58c48e4f68ba9817677e049cc872a6e0223183cceafc29d47f1492e1bb35c77a55c023d6fd396b1fe83c151f0546d318c8d63ae4c0329b8dde2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-18.04.0.ebuild b/kde-apps/granatier/granatier-18.04.1.ebuild
index 28cef3517e33..28cef3517e33 100644
--- a/kde-apps/granatier/granatier-18.04.0.ebuild
+++ b/kde-apps/granatier/granatier-18.04.1.ebuild
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index da524ce620ae..2ef0f34c2f85 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
 DIST grantlee-editor-17.12.3.tar.xz 110752 BLAKE2B 2d0e60207bcf1edd1bd4e69e7a959c59e0e63b14117bafd402f8fa57aea2a1c1eb30c152ab3a70498691e854241046d6ca1ee9ffb3c8303393c6a629244c6be6 SHA512 722db8e101c7132717840137d77dc8c0972a2f1692b4b0d8be3e33c296649d0d5f30f55b4cc6e1dfa58778a3c470c93baae0b060d234a99f967e87296e947f0b
-DIST grantlee-editor-18.04.0.tar.xz 110608 BLAKE2B 08450ee2612c0ca45c026d0ec25a03751721542b4286dd2ff367c722b36ad25e58928f0d9339a99b8f0468f3f01b0259f01b2570425c412ab837b290475a585a SHA512 4391b4bc42f2ba27909a9c2b65f59523322a79804d6e6816f4d7fd563c5b1aad029a773ebbec15c4da8257f8f1ff48080ea0cbe7f4771b693ad47f05c7430cae
+DIST grantlee-editor-18.04.1.tar.xz 111092 BLAKE2B 69127778d79311b0a883ee6b283322f6c198f452df04d084d635c4e9e345d9c03ed211afdcb5db6941ac6fa57e9e2bed6a764b4a1eb821db046c33f0a6217e94 SHA512 f7205792e882391db8edd2c22022a3fd8bb24a45d32576e4bcaa80c92d4ff7d8f22313bcbe0b8447b707a135874546848cd42600a393c80e290d328cb97f0c39
 EBUILD grantlee-editor-17.12.3.ebuild 1166 BLAKE2B 2ee5e6679257691d98d7a03e2972fdf33724487bbb69fc3c6aaa3dd7d2682dcff05cd51452f4f276e13e00a6b37d11c8d6ef0a92dc2f715d23886c63b21be55c SHA512 4ceb795d35dc12eecc2dbd69ccacd361aba00b18461340f9a867a0cc0e67fa7187d83e1800f4a8465e1fc82674401145e09585859b0b3b21d07a03227a1f68a3
-EBUILD grantlee-editor-18.04.0.ebuild 1168 BLAKE2B 4afa0384819169395f10f3744458a899afcbbb4c249e3af665da9f5cb33abc1577fc673702698cb0f6e2aec6ee9fadc3c7d0b8084411b8dbc7eed83a51ead388 SHA512 63f60380af87437f2e2005a896d07712278f3906e703c3a093caf6a703ba40077790dcd112922351feb6d093b4be5c7baf14f0012f10951b66dfe8fec7e623a7
+EBUILD grantlee-editor-18.04.1.ebuild 1168 BLAKE2B 4afa0384819169395f10f3744458a899afcbbb4c249e3af665da9f5cb33abc1577fc673702698cb0f6e2aec6ee9fadc3c7d0b8084411b8dbc7eed83a51ead388 SHA512 63f60380af87437f2e2005a896d07712278f3906e703c3a093caf6a703ba40077790dcd112922351feb6d093b4be5c7baf14f0012f10951b66dfe8fec7e623a7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-18.04.0.ebuild b/kde-apps/grantlee-editor/grantlee-editor-18.04.1.ebuild
index 53bf85082a4f..53bf85082a4f 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-18.04.0.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-18.04.1.ebuild
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 04082e6559c9..9f4ae6caa972 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
 DIST grantleetheme-17.12.3.tar.xz 51348 BLAKE2B 89055379524d9273b2db9185c1f0116638e5f45414ba674cb7d2511e9539d556daf489e9a54f39a3c1197a8b1939076ccb7bd932d336c0769b97d2c7e59a8062 SHA512 203fd80f303d4c2c76b9375179da9aa7f040416b397ce576ee5836b2bc8d04109601275bad843a192317971852f97c9a7fa83b48401da14ec820f11706187928
-DIST grantleetheme-18.04.0.tar.xz 51360 BLAKE2B afb7c40c82c10d240310e28200b9460d72b7a2a4e76765b97071b47112cd66bbfcd9e069b7c46af374098cfb4dda23bd2776a0ae9da3c37ef95496d331c97eb1 SHA512 af4f4db9b25bd8545e5145d0167af0ad0f0b2527054e4f4f26c7073631d5d359b375b149aa72c096c36b1bee23ad0c4c7ad4a031a15196decb985b53573839d4
+DIST grantleetheme-18.04.1.tar.xz 51672 BLAKE2B b294a0c37a1ba798a1c5458aa0b8ac36aac12e39d984317abde923e9e7d08bd527fa8aca3e9d9ca4180634887807596e26db831638e4c1126076bad6613ae582 SHA512 5e223abfcea21597d353816b82026be66468c3b267b0760347ea6120ece86ef7ab8163d043010bd7064b841361eebc3d6691ef9defa76be134e23a5c20a18477
 EBUILD grantleetheme-17.12.3.ebuild 735 BLAKE2B 01da5ebbc4f0fd762fd77fc496ca81622924d98e60749f366d4ed068ffca33dbc6111433aaf0b057701f6b683eeeba5a3f1a0c552b34fbce741128f4882c427d SHA512 1ea754208f4dca36e52ec2f2ffa5699350b6de9b19106cbfa00dbe655377bbb596aba4d31f2b4a17135bd48673401a4eaafd2a7d6efc3a9a5b46fc8652bcfa0a
-EBUILD grantleetheme-18.04.0.ebuild 737 BLAKE2B 6134740a08dec66d4e42a7ec86acfe10733ba8e26fe5cc86a1592b01bcf5c57329e75229eec68f909f690955fe57bc8e47ddfd1287978ea8f5f939381531c6a4 SHA512 02701da3f71bc003c95b4d9d9487620e83f6fe0d9915c24a9178e6f59433c2be86b809fe5db82d08b17ac795ca59c02ac04c28874816457352c67985167a9866
+EBUILD grantleetheme-18.04.1.ebuild 737 BLAKE2B 6134740a08dec66d4e42a7ec86acfe10733ba8e26fe5cc86a1592b01bcf5c57329e75229eec68f909f690955fe57bc8e47ddfd1287978ea8f5f939381531c6a4 SHA512 02701da3f71bc003c95b4d9d9487620e83f6fe0d9915c24a9178e6f59433c2be86b809fe5db82d08b17ac795ca59c02ac04c28874816457352c67985167a9866
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-18.04.0.ebuild b/kde-apps/grantleetheme/grantleetheme-18.04.1.ebuild
index 605753b034bb..605753b034bb 100644
--- a/kde-apps/grantleetheme/grantleetheme-18.04.0.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-18.04.1.ebuild
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index e4a249f3ccc2..1c41ac0f5ca4 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,5 @@
 DIST gwenview-17.12.3.tar.xz 6021476 BLAKE2B a4142239cfe4d82b26977d788a67286625d7469ce4722a1c091691c02abe75ceb5b852e4754b6c3809fc96219b0a967595cd83910e8b809c553adaa0397ee939 SHA512 7691e07f6ec572a46a8b0c3e63aba93d7a3c2886384370d3d77299c94e7f9cc5f7dff4e45390cc6871bc003da27ce0f90d85d8108a7302657bc3f0175e609abf
-DIST gwenview-18.04.0.tar.xz 6050924 BLAKE2B 43b57bab1ca7b303af48b704a42ffe8755399e1d441db441a37a8fee445ba53797b0f6217aabd9c24a8182964889e541b31e4f50302c6a6b21be4011dae15f6e SHA512 fa2b9cb4418907a7e73d21d9e61b0caea7143847af1c2ee8d8474062b2f46ccd8a0f4eaf01f39c7e09ecacf0950372901ab79dcc3846c8572bbde037473c1b36
+DIST gwenview-18.04.1.tar.xz 6054732 BLAKE2B d948ea9e2960fa9501805061cda18ebc7e3c00699143d6da34c8d3dcfdad7dc1658a3288223361d34b60ad83002bcbd8eb7dcb2a560fbd9f510c6395b38a0568 SHA512 cd26954dd050fa2b5e0750c7c07067f86078e7b249f827b2de31c185ac6a2569a2401a70a5c71526af3ab052ddef6be8138d716f5d861cd0adbe947428424364
 EBUILD gwenview-17.12.3.ebuild 2413 BLAKE2B fec0d82754f8e01f85946c5d9dd3aaeba2d4b7b934327f8bfd37e3c7cc910dd675d3d5583110088a21a07e780e3a25cfa25f03cf4d866a0d0d05b535922b0ddf SHA512 2dc8646d06e47db59f8ca63b89d73a50b70e00ff33e9f8a04043017cf84579ab0406dfc44ca258fc8d722a2e3eb00da00583ac42895985280e380b9322366d64
-EBUILD gwenview-18.04.0.ebuild 2415 BLAKE2B fd42f42af00e5afa906b6e195e55a940642ef9f50fc856a2b33276c41dd527ec2f038b0541ba6af1931d2cfa39634d7720423d15514bf72ca2f366cc05a552cb SHA512 6d41d0865b4f50825bcdc1041e21b69c00d42fd9bc325b2f0a29e8750c14b7c7d57fd336a6abf7f61d115668dcefdffb0578503730de566c23edae58df008497
+EBUILD gwenview-18.04.1.ebuild 2415 BLAKE2B fd42f42af00e5afa906b6e195e55a940642ef9f50fc856a2b33276c41dd527ec2f038b0541ba6af1931d2cfa39634d7720423d15514bf72ca2f366cc05a552cb SHA512 6d41d0865b4f50825bcdc1041e21b69c00d42fd9bc325b2f0a29e8750c14b7c7d57fd336a6abf7f61d115668dcefdffb0578503730de566c23edae58df008497
 MISC metadata.xml 423 BLAKE2B 2e0463d65a7476da0e5a28420f235108b3367b9adfcda7fc2d47c1a5ae0e7f1ca49859d7ac213e3434c7d846c78af041d90da5767bf68e24be5a3e8eb80ad37b SHA512 19d70c59c116bfff13a062076e18d094d77ff06e30a01cc2c1439d464439616f2b758a250ff45c5a792926800906f1de8588a752317b7272e3a1223e543ff680
diff --git a/kde-apps/gwenview/gwenview-18.04.0.ebuild b/kde-apps/gwenview/gwenview-18.04.1.ebuild
index 87a4835bbcaf..87a4835bbcaf 100644
--- a/kde-apps/gwenview/gwenview-18.04.0.ebuild
+++ b/kde-apps/gwenview/gwenview-18.04.1.ebuild
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index 609d26aa43c1..9795e146f2ee 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
 DIST incidenceeditor-17.12.3.tar.xz 517144 BLAKE2B edbf3e6b3bf7027ca8399d42cb59e5122e8bd85b2fdf0de5e6932bba68fdb1a8b75cc38b20022f8bf3712ac0ee6ac4525b709a0e24609d634cea83d2571bf57c SHA512 b800a3f1f62a195e515b1ff41aae801f17a983549499c2e694f5ad8690bda1a7218aa7ebcc4908b288ee97c6d335df729348d9a34df4400cfea86d4501af2ba3
-DIST incidenceeditor-18.04.0.tar.xz 527148 BLAKE2B 1539da04ca67fa5780af112894db5c4687e8d57a0c24dcb4e7849433838e10392303a71ef67df259ad40edd4e021ed38180b3f92fb8b0ae221b1849b239ce582 SHA512 c10cc3f4e91846c7d28218bb9475094d4fcc69e491150f1af77a283ff6b24731f74f3a367cc601cf6095c6006566bff940361defb72f89773a4bb20f94f78fc4
+DIST incidenceeditor-18.04.1.tar.xz 526728 BLAKE2B 940c2e2bfdce49d9b5bafd164a4a95cd85db6342df96a6aeae5a4ea576866b58b10df3e15f16742e245689dd471849e3c7cc739622a1a9b7a3af3b92c3c69089 SHA512 7e3e649609929ba7e912f7cde4aa96fddf9270046a7c40db4feed53e6858727da31413853d00091d7682b8b7f7d5397932eb6beef604783a7ab1fc7fe24987a5
 EBUILD incidenceeditor-17.12.3.ebuild 1393 BLAKE2B 5a1a0e42a5a0b48722407844edf81d56d9ac339aeb509b9d12f37dfd6adcfe9306bbc1bd6ad2ba09cc4418aa5fd40550bb7872c5fead39dc2e3195b55647a7d7 SHA512 244023eee75d28a4cea19b01368bc6fd2d6192cdebc1f71dbaeb029a8d7b0088059084139e80a6361d136828c1553b8a0563c3c6cdcd3158f2d57bedd2ce23ea
-EBUILD incidenceeditor-18.04.0.ebuild 1395 BLAKE2B 1bcc6beb89ab64942a405802b1aa18c079f537e027f51decbff9d491687c9585e25b653d93b9da32c6e4e2697482b0ba5a7cc57efc4c71e282baa384281285b6 SHA512 6fc54dfd46dd7210bdba607ed93a8d22da85eae56aa3e718cb151243c4e373eb69d9afc96d3be12cd9c140c082f590e1eb6578b93bbdc3c1c73da16448f9d6af
+EBUILD incidenceeditor-18.04.1.ebuild 1395 BLAKE2B 1bcc6beb89ab64942a405802b1aa18c079f537e027f51decbff9d491687c9585e25b653d93b9da32c6e4e2697482b0ba5a7cc57efc4c71e282baa384281285b6 SHA512 6fc54dfd46dd7210bdba607ed93a8d22da85eae56aa3e718cb151243c4e373eb69d9afc96d3be12cd9c140c082f590e1eb6578b93bbdc3c1c73da16448f9d6af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-18.04.0.ebuild b/kde-apps/incidenceeditor/incidenceeditor-18.04.1.ebuild
index 8cdf4d1b3dc2..8cdf4d1b3dc2 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-18.04.0.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-18.04.1.ebuild
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index cd186af6bde9..b3b2670c68f6 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,5 @@
 DIST juk-17.12.3.tar.xz 1868428 BLAKE2B e88f8607aa360751cbbb8c72fe04ad52f1d3f66679515cccf048a3802c65212c66e53936c1826c121ae9dd728ace46dfa5d33978818b8c95d088760e2e0a34ea SHA512 b86e8eb68dca55a9a321cbcfb0172a95a4e1536c3959390f62e3e519862c9de32f327db04e55de39ab194a5e46c228614333b22886b5bb2b4578f0f1d6b5cddc
-DIST juk-18.04.0.tar.xz 1869228 BLAKE2B 84e1be161a460c8f212d233d653d390e8921459b5b77186daa45d6372fd81a8948963847c393dfc4849b62446e80cf4f1f3379c1b48482cdf5df8d3a8dc3a7b9 SHA512 336cb88c85ad8b79da009c437eda83c16b14b54113f5db0809c04ae58e669cea41b8ce4df8c5cb84e2315cde02ad697f4d2310756f44b1784f2293e398b9ae02
+DIST juk-18.04.1.tar.xz 1872276 BLAKE2B 30ffa608ca27c87a20edae3464f0664d5d639d836920178710e48339fc284444eca60fc848de635e64be5893971cbd6cc782701258784781aa07132aff4937b6 SHA512 2d460d212fd20edd50c2c48d690fc58ba616686109c9392a8d85daa49c299dbde72152500463b571979e1f6cec025219546932678effe362fe0884373ab3f271
 EBUILD juk-17.12.3.ebuild 1104 BLAKE2B 4158dca7ff9846b19c1d4330752ce8da36159dcee898b83732b56dd258dcb8909001b25db96b77d95d3e08020a47b54394f5c7c30adab7fa4787f58367c835b2 SHA512 3888df6be004639a2e0b32f3bc68952c41b3da0182417511a2623960efc959cb0c12b10c4552a1a75a1ff243b8c70a3e50e2c272a6a70ca10ebff99705691412
-EBUILD juk-18.04.0.ebuild 1106 BLAKE2B b8c9bb34ba9e7b5f2e93b171bcfd425bf88fb11e881029ac2042bf635abd12751b4aa68f9331e39aa6aea969102fdf0229294aa09d7522e5c2c635d749657822 SHA512 f27f6a8d0df3b89d37a18123f42fcb0e16a2ff4bdbbb8d17c4a1cfdaf930e865cefdb4c55604f88d13994c7c72b37da6bca575472870e3fc850120094ba55578
+EBUILD juk-18.04.1.ebuild 1106 BLAKE2B b8c9bb34ba9e7b5f2e93b171bcfd425bf88fb11e881029ac2042bf635abd12751b4aa68f9331e39aa6aea969102fdf0229294aa09d7522e5c2c635d749657822 SHA512 f27f6a8d0df3b89d37a18123f42fcb0e16a2ff4bdbbb8d17c4a1cfdaf930e865cefdb4c55604f88d13994c7c72b37da6bca575472870e3fc850120094ba55578
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-18.04.0.ebuild b/kde-apps/juk/juk-18.04.1.ebuild
index b5a9daf6e7f6..b5a9daf6e7f6 100644
--- a/kde-apps/juk/juk-18.04.0.ebuild
+++ b/kde-apps/juk/juk-18.04.1.ebuild
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 7326f99fdc95..5b9c297c675c 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
 DIST k3b-17.12.3.tar.xz 10573616 BLAKE2B e5606f7ef96aa34cf2aba068cd7417bd1783910f759dffa2bb4edab3d2e921788513b22839c8e6156f304db4e81b3a6889d1bdf7b4648f64e2cbd383fe032705 SHA512 05cd1413d99f55c4aca5b75cd51691fa0ca0a975660168ee3effa39774deab36d28ef3e7c71860c726d1e7e02b3ac12e6372e2e47bb64d5fa5e21f58540d11e1
-DIST k3b-18.04.0.tar.xz 10588096 BLAKE2B 6f5d0cdbf537e4bea514c04951ee5ea5e7d8db5f79ac955d5943ebd5b89a82d7441c1fcfceb389d6b14c5858946ceaeaee2341368147ce0c1a135db791ba65c2 SHA512 3748d5a9100091ade797f1bee61f5f04ce9ec9e29d265977ffe2e0dadd25d37ae1c1cbe14de9c0229f775ebba1a107ff5bcc9aff4d67cb4cc8e446345b7d48d3
+DIST k3b-18.04.1.tar.xz 10596384 BLAKE2B 0017f69e41be6e1d2f46728faa0bf9fee0a81de4eb2afdedc2c9a104891c47e7ff414ceb33bc95910a610c885155fb41820636b346303c649a73b352ae44a294 SHA512 72aa4ccd35569fec686f74a613ab70c6ba472e9b6358269f7ce59e9bd1a1a7ad90187a757e3f01216f1bddf15190d7bcc8488a96064d00b3e368e8e8bb30cd7f
 EBUILD k3b-17.12.3.ebuild 3334 BLAKE2B 251c4e4a2a963bad70819c3254a22fc55769635e45d04fbec4bf3bfafc49add2323683a2aa32928ead05075c7d394ee35441a471ce6c3fadd76e3c5a883c1e0b SHA512 eb77b10c097657db00a73a3fbc9cec6709ac4886eb50c538c2d8ee1d7a976ecd6219831c884c7bea49c00fd62ba9a86a9dd9fb6dceb79c421dbad32545876fde
-EBUILD k3b-18.04.0.ebuild 3336 BLAKE2B fe17d3a2c96208ab7b4c2b76f3b4be7d9e306da7117295587b353a0362feb3d004c9e03f166d90d79c691499f488c78e17aa6b671dacdfb2f6eb21f3ab119efd SHA512 5816ea681d2966021098d5f85a5c484d59fef6282093528a9cecc3114845103df157796bd1d9edd8669444b2e995f59b1ebe42ed248a469c6f1666c0441933dd
+EBUILD k3b-18.04.1.ebuild 3336 BLAKE2B fe17d3a2c96208ab7b4c2b76f3b4be7d9e306da7117295587b353a0362feb3d004c9e03f166d90d79c691499f488c78e17aa6b671dacdfb2f6eb21f3ab119efd SHA512 5816ea681d2966021098d5f85a5c484d59fef6282093528a9cecc3114845103df157796bd1d9edd8669444b2e995f59b1ebe42ed248a469c6f1666c0441933dd
 MISC metadata.xml 334 BLAKE2B 0af18188f4b2d7ffa34ad43e06154f943c5da262588331287f89c34f737b435ecf6ac092424057440c9de9ccef1228d0d3c0978d457b5bbf5bdfeaefc464863e SHA512 16203cd75177004bb4844f67659dc7370c12e216871272ff8f781ed11172e72271b15f347ad6d59354ef077ebab1fad2bc150f3e2388f370b660b2d2adcb0faa
diff --git a/kde-apps/k3b/k3b-18.04.0.ebuild b/kde-apps/k3b/k3b-18.04.1.ebuild
index 33ccd3437be8..33ccd3437be8 100644
--- a/kde-apps/k3b/k3b-18.04.0.ebuild
+++ b/kde-apps/k3b/k3b-18.04.1.ebuild
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index a6c2f5a85377..3ccd39f572f8 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-integration-17.12.3.tar.xz 70824 BLAKE2B 1299d25ac8852362a346edecc9f9d6554cd05e5554dcf58b735bce3b099074de4c0b2f8d77566075d90e775bc7e8a6c5cdac2bcb332207d808641163bac5cffa SHA512 239e273496c6d190a5c07f4fb98d718e435d0d4864f2c58877e90824d8f4fbbefcc4a057bc4a1ea25b4df77da9a111711d18a6111a58febe932844befc0489dc
-DIST kaccounts-integration-18.04.0.tar.xz 71444 BLAKE2B e12b2a962dbee6605cac07eecce2ed41ee110b71ac79683db6fa73cc82871c80e274cb636c2ca684d0b2187cf8798ee9bc82a7e5d24a1316b2189b25a0d0d059 SHA512 b16d6b8146c859451852ce78b7f47f6767ef6dfc7561685928102f8e57d339818cad10474688e4932154798eacde16553b40886b4b0cbe63553e9a58e1382c7d
+DIST kaccounts-integration-18.04.1.tar.xz 71596 BLAKE2B 5970042f217ffc0d525b6cc70b964afabe42ae10d80489bc88c8f6f6838130dceb64be10437b4218dca515ff801e8801c4265afa0135db91a345979566ae6a76 SHA512 f1783daf3bb1488baf9cec78eed9e344d5d185defaaf0635545b68e824a743c5cefb51c58370fd4c3518fbea3b21a59c9b6ab3041cf532076009aea7850cac7d
 EBUILD kaccounts-integration-17.12.3.ebuild 898 BLAKE2B 9475ceab418eda41c61d749e0a68f555b7885537a8ea181977a24e45ba2070333db6221f44a3489eb531a0a4b06332e13ba8826feeee7e82369599b1e2c8dc5d SHA512 a0cef7b698fd7a977159f8d9ebc10bd2fa99708846486559bb633d59dbd425fa73bda05efe6e4ff910a2bbcbd25edf3168612d53849461d13ce35eac6195fc55
-EBUILD kaccounts-integration-18.04.0.ebuild 900 BLAKE2B b854b476c9fe33b9c4d3baf1bb9433817e17e29b0b9f4870a4af8fcb24e9ad07eb96e85ef68a5e0c8412c43c0fb94423c02d515f5971b719a6bc8a7bd3b33ea9 SHA512 de398edd8633782c3c32cfc218a29199d5017024f6c417110770db2af2f5bfda5d8a56158bff025694ce4dc16ceaa7cc7b4cb2ca1eac51a5784c786735a867f7
+EBUILD kaccounts-integration-18.04.1.ebuild 900 BLAKE2B b854b476c9fe33b9c4d3baf1bb9433817e17e29b0b9f4870a4af8fcb24e9ad07eb96e85ef68a5e0c8412c43c0fb94423c02d515f5971b719a6bc8a7bd3b33ea9 SHA512 de398edd8633782c3c32cfc218a29199d5017024f6c417110770db2af2f5bfda5d8a56158bff025694ce4dc16ceaa7cc7b4cb2ca1eac51a5784c786735a867f7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-18.04.0.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-18.04.1.ebuild
index d30f9c20dd11..d30f9c20dd11 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-18.04.0.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-18.04.1.ebuild
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 494a2f898418..989038127310 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-providers-17.12.3.tar.xz 31740 BLAKE2B 5518d40bbb28a7657ec406b76df35faefda9b6e9a3e8a2c31b27806329b66487d54c8a72fae50795bfcde519fbad96059b58466cc62b1197b2f7e4f2bbebfb93 SHA512 c8eba2caaa4cf3e33cf86b8a8713292be9666d3eca75931a493206317735b1938b0d36e028461f16229e26f38039d54d25b7c2e5ccdbfcfe5a68adbea69ee756
-DIST kaccounts-providers-18.04.0.tar.xz 31856 BLAKE2B d2c27f5b9e669d9a6d2cce81fad7c45ffd6f9258df79ce343b0ca2f6809fa761338637e6bee46837e63f1b1be2ef664f6d99258358d1ef7956cc7aeb2d208921 SHA512 a009e410a1001f188ef4950c4aafe778f045f56dba0049d5b9a1646c3fd6000e9c4a308c759c338849d23542cceac72283301f6d82cf0368285be98d43cee90a
+DIST kaccounts-providers-18.04.1.tar.xz 31868 BLAKE2B 0ff64d3b7cffd396fcc3cb1e91b0216022fac22a598fe0575d9353854b0b9e3bd785f40be8ce052efbbdd99fc77e153c6c99499ae653839e59df106d5b8b670d SHA512 b323d1605aea69c3de86980b82d6166f12675debf05d3622806fe528c19ef9112c9e66060e2b65dce5797f77517f164d89f6587792f1e032f660e685ae9e35c1
 EBUILD kaccounts-providers-17.12.3.ebuild 666 BLAKE2B 859261416a66ffe9af1eb12195fb85bf5f63b2171055fd65cb0a2eec94b24071619e58cfec724842fdb3b366576aa46c11fcde9867f06b6c334a8dfc7df3ded0 SHA512 5a2fbf17eb6a9cd3ff593ad6d4507c796198390c0ac552950098ad50991b78ab02e23fa7a722fd96894ce03b0ffd1c2200d9ddfc536e58c3aaee4a98650bdda4
-EBUILD kaccounts-providers-18.04.0.ebuild 668 BLAKE2B f56d4db5a9321690909cb3ea6f960018c914a86f484fb62a17997d6afb7ff2970a4a8607026b9b876db5021d73fef7e2056da516151d20f7eecfc018d61e0217 SHA512 50f2c4f6102995d364559f04e6cd20ab3ec9f5dfbe30c2f04977137b5705efec0435026392d59665e6e5d1410e6a85971738acad7eb1bf3ea457a825aabfb554
+EBUILD kaccounts-providers-18.04.1.ebuild 668 BLAKE2B f56d4db5a9321690909cb3ea6f960018c914a86f484fb62a17997d6afb7ff2970a4a8607026b9b876db5021d73fef7e2056da516151d20f7eecfc018d61e0217 SHA512 50f2c4f6102995d364559f04e6cd20ab3ec9f5dfbe30c2f04977137b5705efec0435026392d59665e6e5d1410e6a85971738acad7eb1bf3ea457a825aabfb554
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-18.04.0.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-18.04.1.ebuild
index da4738ab4dba..da4738ab4dba 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-18.04.0.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-18.04.1.ebuild
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index dd13ec2aebd8..6b805b99ff1f 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
 DIST kaddressbook-17.12.3.tar.xz 544148 BLAKE2B 9857bfaca4f94e6108066d4a6270e6e959b110f5a6ba9219cc371665d36b00d445cef0723ea118c285bee7971a9fb480d8851e4eb569d474de29161f37b90915 SHA512 0b498c7ebf49a6a4df3c24b185ae9edd2d53a80fdc6d84c6ebc6b9f5531766dff579ca7240f6c4657bc113b872811de941e75f7f4d171d3cbd08a0e9afb2a054
-DIST kaddressbook-18.04.0.tar.xz 547224 BLAKE2B c92377db92348806f529d84d99d44c972f4acfaae93d2137042058eb7f6b9aff8983661c522013722463856a841f9fe8b1908bcfe6a228a2d662bd9bad622b5a SHA512 3ef4161e1f8d24b5baf65667f5d530ae8c494180793b895eb6edea6648383397238aac11f1728edb61897d7a3dd00dda41ce77c652bc099de75916cb15539145
+DIST kaddressbook-18.04.1.tar.xz 547896 BLAKE2B 36dceea12aec6b1e7f8c2cbbf7371a86252c77931d5ab88f0af76661067977ac7dbbee89f652c56b7f07f5526048bb7786f7f983bd33fde80622b936734a6759 SHA512 8081071572c9ee39d4030d18844310bc2677835e9142e61f21e2f8d1ea07605c9ad2d7d0f956f48233cdd13d6fe4504652308d6c4e3c16eca43f0c31a036c2aa
 EBUILD kaddressbook-17.12.3.ebuild 1706 BLAKE2B c6d7559fb3fac56b6d259836e03f72003d4f89921ae5c4116571ccf80e753fb8c07aa3215ef3e2aeec9eb30d13b7bea139c0ae11a9ef15db77162315587e8b33 SHA512 edecd0701d2519f20045375486ce5f16460cf16879c8c1f76403a4a088cae89a6d68fe03c5ae1183753896d496a6c6056dd93a4651088e929faa9ed897913621
-EBUILD kaddressbook-18.04.0.ebuild 1708 BLAKE2B 519004808433bc563ce8368db1e4ddba8955f50cda9173022563ddbe06cfd232c6b2252a62de76bd57d1d15bd088ce29aea8c68efbd949d36d69f4d762fb1dbc SHA512 a04055dd89f4a29df33b1df154b1841518abce13bbd6fa4b228c0110f906f6a215d2502c901cd2c8e546cc1ae217c97c5fdd22581c81fb612a6340f545fb3a50
+EBUILD kaddressbook-18.04.1.ebuild 1708 BLAKE2B 519004808433bc563ce8368db1e4ddba8955f50cda9173022563ddbe06cfd232c6b2252a62de76bd57d1d15bd088ce29aea8c68efbd949d36d69f4d762fb1dbc SHA512 a04055dd89f4a29df33b1df154b1841518abce13bbd6fa4b228c0110f906f6a215d2502c901cd2c8e546cc1ae217c97c5fdd22581c81fb612a6340f545fb3a50
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-18.04.0.ebuild b/kde-apps/kaddressbook/kaddressbook-18.04.1.ebuild
index 23715c549f96..23715c549f96 100644
--- a/kde-apps/kaddressbook/kaddressbook-18.04.0.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-18.04.1.ebuild
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index b7c86c3a7e13..06486852352d 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
 DIST kajongg-17.12.3.tar.xz 4238944 BLAKE2B 5b953695413d8486468be2e83d7326199415a1cfe3f2fdba834f0ac3be841042efc73fea11d0c2e0177573065b0576f058e8e3527d7186c02e37986c86bdcb5e SHA512 c1d8a0934952cf11d3de3bc081cc7b33b42a7707cc0cdf91a669087f6707108aa6be25a34a065128afcf63602491096f8533bbcebc8ba89a37f310caab9515b5
-DIST kajongg-18.04.0.tar.xz 4239560 BLAKE2B ac2446899ab68b967ff64ef60459e9fea2c41a579fb418bde429dcc65c1d3d505973e7b4d3e1b2379cb79ba64b68e9f069cbdc64c71b7abbbf9b5dfdec4d0cc6 SHA512 8f02f4011e1329a6903cbbdef7d88d3338c44356b38c853495cf68a722c111ae5e27f9eb1e43e2b8493f8f6fda7ddcf5c4506e5339c460ab350833fab6966c02
+DIST kajongg-18.04.1.tar.xz 4241840 BLAKE2B 84af78f329c753fa29df4af225dfe44fc6a544415d9b91b7a2eb6a50ffc0ff43faf154d002966cbbb47890263344f5ec38bde961e07b41178ce4af1533623770 SHA512 5d4b7dcf08fee5869d81edbfc87c80051d7535a34eb492c30308042ac035c38628f718719fe63a7a8b6b2f33f9cb6f80952e52c858e68b2593172e71ac4f9bf2
 EBUILD kajongg-17.12.3.ebuild 1280 BLAKE2B 1a60ed7e29724456829f6b27689bc3e9f0be2f3433da605a45f55b2e36d9ac1c5436858225d796ba41639d66c71a20f220ea588716942d4644bce613461f10cd SHA512 60c40554e4d71fec23832d1097e568a4727a38b8dd91b4e89210d1c6a7c0b219ca1de171205dd7650b179474e5c277280800d0975d876545a9670b0794b44bf2
-EBUILD kajongg-18.04.0.ebuild 1282 BLAKE2B a2e4042d2ea6c95c2ec2245b43130d69a3edc75be2c280e5cfb8f3282aa02e7008b77a8b069d18e82f24918ba8658d3fab280520ba30319682131e776ab88e72 SHA512 b6fe89aee6537ff838da6682bf2a9ad59218b8fbea752857c54e0552d5fee10fc9501e8405e53b4d7a3316d24051eb20a70e10c98a3506a79ccbe8041c159c1e
+EBUILD kajongg-18.04.1.ebuild 1282 BLAKE2B a2e4042d2ea6c95c2ec2245b43130d69a3edc75be2c280e5cfb8f3282aa02e7008b77a8b069d18e82f24918ba8658d3fab280520ba30319682131e776ab88e72 SHA512 b6fe89aee6537ff838da6682bf2a9ad59218b8fbea752857c54e0552d5fee10fc9501e8405e53b4d7a3316d24051eb20a70e10c98a3506a79ccbe8041c159c1e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-18.04.0.ebuild b/kde-apps/kajongg/kajongg-18.04.1.ebuild
index 1c531f3048e1..1c531f3048e1 100644
--- a/kde-apps/kajongg/kajongg-18.04.0.ebuild
+++ b/kde-apps/kajongg/kajongg-18.04.1.ebuild
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 5a29dba749f2..b942be24ecfd 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,5 @@
 DIST kalarm-17.12.3.tar.xz 1797760 BLAKE2B 9ba94eb0dec5b6b9d55fdeac4605ed3ea12668c3d82f530072187b4c5010f8b2d0e4042f7a9b64858a353e7d588afc52186e899479884bf78b2ede7807e61625 SHA512 21f5187fbec15e49b9e51b062b1ee1e424c6dd73cbc9c7871940a8441da5faa15d3344b7adfd1795906907c6ea8b469846f1ad1371d9abfd0e1e4df84daac892
-DIST kalarm-18.04.0.tar.xz 1793544 BLAKE2B cc5397cf551b1792433eac472e84953bfa745e9ce07e525080f1c42480406c75bf46cc6e94ac5258f393ef0a837ffb2c00be59c35d34f772389b19184d94e58e SHA512 a298063d4ec52d14119c4da6925d918e1f1b0c917d9024066259bf25e5dd5ea88bd4fd901dd9e656ec9b4f5a2047ac5c7e587de2cdd6d184b75ea17643f91aa0
+DIST kalarm-18.04.1.tar.xz 1796136 BLAKE2B f180475c9200a7d1118666b69b0b3410a3e912381acc55315bc6aa16ee5ab56d2949a6d2d0710cbd0746634ca01f378a0d7f63f438cd82da0d8ccec5a17747a8 SHA512 a23cd097844d5c7e753140417d328b1bc9997f9b3d9b1eaa609dfdcea312ea8e850123799f94effa66107df3d2ddaab8c6da597118c961d05fcfce3ee6e9f1a7
 EBUILD kalarm-17.12.3.ebuild 2062 BLAKE2B 51f37557c4d354d47e423338cd0dae03cda913fc90caf123dfce6cade8e1b68e2f806f4153bfcbe9c4f2099665c42fbb00b7dd78b775b046db31fdcb4886b338 SHA512 b0fe838ed717f8c68454f178a6303c135882e5e82c436a8bcd3570aee33f40ecf2b5b4dd6d457da6f02e30ca4bae491f172b4f9f5f8fa9729f957ad2834e1aa1
-EBUILD kalarm-18.04.0.ebuild 2064 BLAKE2B 7afe46797d3a943191a8480cf1f59550d4aea809a6ee8826fa5fc41a8713f79aa5b10d873e43e25e791e398c76696448463f2118822e710059f2e6f1116e4732 SHA512 9a2ff1b84bd084fd6ec98b3990df5ae54ae6f5557da53f850b0cde21869758f89c61d208f89d5baafd72810ad81e3d7613f18597693cff0650586d6ed7283f93
+EBUILD kalarm-18.04.1.ebuild 2064 BLAKE2B 7afe46797d3a943191a8480cf1f59550d4aea809a6ee8826fa5fc41a8713f79aa5b10d873e43e25e791e398c76696448463f2118822e710059f2e6f1116e4732 SHA512 9a2ff1b84bd084fd6ec98b3990df5ae54ae6f5557da53f850b0cde21869758f89c61d208f89d5baafd72810ad81e3d7613f18597693cff0650586d6ed7283f93
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-18.04.0.ebuild b/kde-apps/kalarm/kalarm-18.04.1.ebuild
index dd0bc7c1fc8f..dd0bc7c1fc8f 100644
--- a/kde-apps/kalarm/kalarm-18.04.0.ebuild
+++ b/kde-apps/kalarm/kalarm-18.04.1.ebuild
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index adfc88954fe5..4529c3a81e8e 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,5 @@
 DIST kalarmcal-17.12.3.tar.xz 494884 BLAKE2B e13c2d013180129eebb497fc26634f53d80cc88b23ea0bba9b5fb775247921e28408ae877651483d803743d531674b4b06ef42c4b33fe87b51978e772714ee80 SHA512 444edd565287441a53da00520bba9b4a22c155048c504a1bd1c0a25f066ae12bea63100589270cd93c26af18cb6e4686c7a753199d10980db638c5a14529239c
-DIST kalarmcal-18.04.0.tar.xz 546548 BLAKE2B 80ca1b5ed880ca525457ac6a7e347ae286d20c481d69a5887fd1040221547910e9af785f2996a6f9cb0b310a2af80214d6c7c5f6ad9b9268117e8a7efeb15c85 SHA512 7b85eecffc9fd77adb966d46a41a133f95b3ba7c57d941e2a8a82551c7d2e48b34be3e78b01b5d66296ec568e96c590484459af585c26772c733c1f53718de22
+DIST kalarmcal-18.04.1.tar.xz 548224 BLAKE2B 62b0301fb8ac7cf8ab5a2cca287ce63aae9057e2983ac949dae6b34ce16469f917d89fe37e2b1f2d8e69882e05f2771dbad10c49e1bb09fb513f8670c2b24bfe SHA512 d2e03a8630850488246f3bcf1dc6d4aa808358096dc08abccd33992bac7d1587137eb78a8772cef0b488a69b582d6084c7c23acdd88d54a9dca0fe641b4094e1
 EBUILD kalarmcal-17.12.3.ebuild 537 BLAKE2B 2902310cf6e87a09c6271553dd4eacf94dca96c77ebadc7baf34122f8b13b62550ba3209c940805904d0200e06800256e208898c5170b5d6a51fb75bd22b483d SHA512 ffb7a34980e86816df0216a1162323b3e07a0375becbd257ec7484e57aba1ebeb728c9c6ede1035454dad83dc9adf00fb7794674b05c5526066a33198ffd22e9
-EBUILD kalarmcal-18.04.0.ebuild 605 BLAKE2B 736f8fdf39351bcfb5b0f241b7343f9a0db3656f60a8b915990c0265d6d6bf90b3373126e8cca5396c47bf2cf71d913ed6e3b5c8e6cc614751c58b7c18204497 SHA512 474e798e2dc264f7e1fe49613908b4aeaf6b0443d9bfa65598f9d07093a0ab8c494523de4870ec1173853b722325c7f55a1b483600a4f0cec501d1b927a37c2b
+EBUILD kalarmcal-18.04.1.ebuild 605 BLAKE2B 736f8fdf39351bcfb5b0f241b7343f9a0db3656f60a8b915990c0265d6d6bf90b3373126e8cca5396c47bf2cf71d913ed6e3b5c8e6cc614751c58b7c18204497 SHA512 474e798e2dc264f7e1fe49613908b4aeaf6b0443d9bfa65598f9d07093a0ab8c494523de4870ec1173853b722325c7f55a1b483600a4f0cec501d1b927a37c2b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-18.04.0.ebuild b/kde-apps/kalarmcal/kalarmcal-18.04.1.ebuild
index b1578f2d4290..b1578f2d4290 100644
--- a/kde-apps/kalarmcal/kalarmcal-18.04.0.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-18.04.1.ebuild
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index b68c0f992975..2054ad0c18a9 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,5 @@
 DIST kalgebra-17.12.3.tar.xz 690480 BLAKE2B 996b66e256d3a87181d03d6fdcd35df9322baef6fa4b6c7a28db8e8641dabf7c33378b632b3a676f983cf25f91377ffc9c98b95553e61805bd1d72ccac958702 SHA512 7062ab6c6a2fce17e313ad16535f51b5ce893384499971dd05e9a256b00e7172b1b83dd3fd4cee76406b32e6abc2a16fa671eb5b95cd8062c760968ede44c62b
-DIST kalgebra-18.04.0.tar.xz 707480 BLAKE2B df10d71df0fbf2228fd986b7b47e42ec0cc0ae66876a50be47f05db24df5019be8b4fe6cd3a8efd1bcfc873bc8db2666f08efca36c0554c97c02a732a91926a3 SHA512 6adee94137b19b631fc05a8be9dd752fb9661126d10ba309b1a9d53f0c3205de4c5a855561004b83838f8e3b592d8d57a2da95afbef6da6c0dceb7e1b62fbe8b
+DIST kalgebra-18.04.1.tar.xz 708588 BLAKE2B 9095fb6700f4e51979a38dc6e4bd84d01b5f54e99b803d3d3ea0a9981acf9c98b7ba25f3758ad0562e634e618f961f77e7121c2cd3db4c8cd88455a1d4f8fb39 SHA512 2a32ad208eb452335ca21a27ddf37e751d57ef2e9c639eac6cb44160a7b61586c06847b473675ce1d8b1435b30267acef3d02d14a3d2af3d003d5023fda4e658
 EBUILD kalgebra-17.12.3.ebuild 1007 BLAKE2B 9e112544f4654c52f84734458795bcfa4160f0e571d78be02699ec0e85a8839d130f23ca47d312534c1470dc292dd4cc3c7fa32ce6cafc09985b5a41d1a152fa SHA512 c895f264c4ca7472998cc1890e7b446d8ba05008ca97ad3d572bea333ef6a00030e872b78f487c0a21fd80c42f4f0d54770c706cfe8564e9127ef66654c1081a
-EBUILD kalgebra-18.04.0.ebuild 1009 BLAKE2B 4d7166da92fca274a74aebae0c802c009d8a42573b1e8b2a7f3235c955be49a499fd883e8856f3dfb00e199e41b41a8db7c7af9d1d6ede56b63bacca984fd635 SHA512 7e47687b5b3482e1b147f0c8978c24d9fdd43b3d10764ab5999fe35f0165b33fcf9b8946fe57210431935347534745966bd59859d0f8f6823532e1c0ef7c1fef
+EBUILD kalgebra-18.04.1.ebuild 1009 BLAKE2B 4d7166da92fca274a74aebae0c802c009d8a42573b1e8b2a7f3235c955be49a499fd883e8856f3dfb00e199e41b41a8db7c7af9d1d6ede56b63bacca984fd635 SHA512 7e47687b5b3482e1b147f0c8978c24d9fdd43b3d10764ab5999fe35f0165b33fcf9b8946fe57210431935347534745966bd59859d0f8f6823532e1c0ef7c1fef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-18.04.0.ebuild b/kde-apps/kalgebra/kalgebra-18.04.1.ebuild
index 8cdb5cfa3a59..8cdb5cfa3a59 100644
--- a/kde-apps/kalgebra/kalgebra-18.04.0.ebuild
+++ b/kde-apps/kalgebra/kalgebra-18.04.1.ebuild
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 96fedafd42eb..1d62037c0bbd 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,5 @@
 DIST kalzium-17.12.3.tar.xz 24447404 BLAKE2B 48e99e119bf3bdf38603e6fbe942697fdee28c9decc38aecde525b7d0bd4a3b9f8a8084cd13a238b0eb356ebc179f355783d4937e4317bd25dff138d433ee92f SHA512 989e35f617ef019036571103c1fa4df7fb64238fd2cb7c909798b7baaacb1ebc64d6c989c07040a5c46f3db240edf2e415c11ab4a480eb2f532f1ed992af4fb1
-DIST kalzium-18.04.0.tar.xz 24450360 BLAKE2B befcff1cec71feed4887be51d24b0037a88a630150013f09c2376a9cd8fad98a1b1b9b808c31349ffc8d7436758da7cc0aebfefea772d52cb58eed0c66efc3af SHA512 38be9de3fe37be940f507f1b286e856e95fac0468cc9d0e650059345d4402ac9b0ed82e99288af0549335413467ee8a96eca67cc3734814ef34944f71f9cbcb0
+DIST kalzium-18.04.1.tar.xz 24458824 BLAKE2B 4840f5a60b10e3220e960c763c5e427b7e630042d31350e3179212aa6d34f0714632923df889244852c0f229549af7ca6af7fb63ed84400d430becba8f0ed515 SHA512 e98aa1e097cc47d87c37dcc4837afbe0721296c6df14924e13f5df9d9fe180e8ffd67e3f44dd6b524a797824be682d447dd3b4ea98f1a5fbf96ee0116d9bc5fe
 EBUILD kalzium-17.12.3.ebuild 1563 BLAKE2B 57daa08a596f0f0111aab8f1f7029c78a613c68d2ed81144fb18ac1da44dea82f2272d7c99e793203c1a50cb525604813b662d92a2b29565a0b57339c3cf52c0 SHA512 17c4a6947d2f9ae967c5febe6c29863a877fcc591dfee9e6c39cc0999894ae0c7b5f3ec99cd06312ed7f483b0da14e82e86dc615db77868accb7d82d9e568546
-EBUILD kalzium-18.04.0.ebuild 1590 BLAKE2B 754eec33e98cdc59f42bbd535d644be0db08e26724a8aaf30d32183bd518edd34b375b5ac9d8695626e661f86f33de818808034276c61a8ddd708b4b3970a868 SHA512 b0019a6be3fc2d95074c64f84246d0cdbc9455be0893fc219676b8f7c62909f95fd23bf2f9adf97a0947a31f167a417e7693326c4be08947a59cf1e10199ce6e
+EBUILD kalzium-18.04.1.ebuild 1590 BLAKE2B 754eec33e98cdc59f42bbd535d644be0db08e26724a8aaf30d32183bd518edd34b375b5ac9d8695626e661f86f33de818808034276c61a8ddd708b4b3970a868 SHA512 b0019a6be3fc2d95074c64f84246d0cdbc9455be0893fc219676b8f7c62909f95fd23bf2f9adf97a0947a31f167a417e7693326c4be08947a59cf1e10199ce6e
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-18.04.0.ebuild b/kde-apps/kalzium/kalzium-18.04.1.ebuild
index 6ead311e558b..6ead311e558b 100644
--- a/kde-apps/kalzium/kalzium-18.04.0.ebuild
+++ b/kde-apps/kalzium/kalzium-18.04.1.ebuild
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index 1b0f1076f4cc..3b9b3a3c34ff 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,5 @@
 DIST kamera-17.12.3.tar.xz 96720 BLAKE2B 8f0efe658f007a89fb946be9ead52bf3492f4fdf8684899722c9d6a7273d921b64333e576158ad34c4facb477734b355453ae2379b1fae5db1f11cd5390c6393 SHA512 498ebef75fe32e1ea7a4eb048f6942ab1539db870eecf0550f1f04ab85bbe36543ffa864cd658988110540cc3d8a0ace442c71d00bd9a04497c221bfeba24376
-DIST kamera-18.04.0.tar.xz 97084 BLAKE2B 32e2558a164222229ab3a2dc5c2ac3aaaf815d866320654e84d204c7f1738487991d0188e19376f46564060a1676d49bbdfcc216674e2c1ad10f0d24e1660096 SHA512 5ab86eec149cf7d406c943d8c8fc839fa5ed46450207a16887f9ef4ed7dbefb0cf4c76d3f07f882e0e48078aacc772c101aeb4875d8ef6f12fd957666401ede7
+DIST kamera-18.04.1.tar.xz 97416 BLAKE2B 21a67d9ab3d718a7f0c617715292bc0c9aed28f74decf27fa93c49cd907d0226609ce6ea59b1f9019c5a4f52d15f7e49815b154a7993a33c511a931b73d06e80 SHA512 5ae3ad32d71b79c0c6b3a947231835292b5238e58d01481eaee89ab61a6b93aab35c183b8fc86f142cc947e4064771f137a3651f72bea464da2e0a113281f000
 EBUILD kamera-17.12.3.ebuild 633 BLAKE2B d95148be451dbeb507d1032e69357812ccf0e7e4af0c127ef7e97deeff878c441dbaf332ad5f07f9ea472c6d829e54c57dc579f3d4c38dee64af53dad982e55d SHA512 ca69f736ddb956d31ee251b254959e37c924f9f4a79b91218bf2177ec6c681a405885b6d15058517d9e07de6e153e776161e6edd75d173c544f73f411a6cbe67
-EBUILD kamera-18.04.0.ebuild 635 BLAKE2B cbb7cff569e8363c4890f8650d00abc5b0eaf13c99f6c1e6cc2642dccb428e312061d12c51f176bac0e13e18fa089e94dce086f8399d1280b15e124050a8f709 SHA512 07aeb04539362960a5644022defb5ef6693b6e559099fbe13d4e66c278ac84f7afc2cac57130d9498188f735a622d19c33488ed236727e4f943e92ef28d1dec6
+EBUILD kamera-18.04.1.ebuild 635 BLAKE2B cbb7cff569e8363c4890f8650d00abc5b0eaf13c99f6c1e6cc2642dccb428e312061d12c51f176bac0e13e18fa089e94dce086f8399d1280b15e124050a8f709 SHA512 07aeb04539362960a5644022defb5ef6693b6e559099fbe13d4e66c278ac84f7afc2cac57130d9498188f735a622d19c33488ed236727e4f943e92ef28d1dec6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-18.04.0.ebuild b/kde-apps/kamera/kamera-18.04.1.ebuild
index 8e527cf2d876..8e527cf2d876 100644
--- a/kde-apps/kamera/kamera-18.04.0.ebuild
+++ b/kde-apps/kamera/kamera-18.04.1.ebuild
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index 292e67bb1b6e..62fb1d8ea881 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,5 +1,3 @@
-DIST kamoso-18.04.0.tar.xz 185568 BLAKE2B 4338f55932c69ff14304ec93f8a1b0e2d0848d61917fd5ebe6bb9903599afb40dd29ff816f3312a239a789b9d267a3b2d606e36905030a6af94ef5a96de2cefc SHA512 f4b75aae061131f8a64043efa8f09250ed3591506aa4f24b4bc922db22d394b8f1ffbf19499d3895eeb6e1f4b24067ec2b67b2512c5e618b85f6a0a61b6b304b
-DIST kamoso-3.2.4.tar.xz 178976 BLAKE2B 2e2bb53fa18f9a1a92653ead8175a01a10409021bd04b2f45cb4bc603d931f93176e6215c1d85a8ac667602fbce1c1c3a9123a078c08293496d9c5cf137e298c SHA512 5665887e00e61c37a6079ad4fda800a507a57c3da6ee76daffb63e59d23c69e8b76063fc1383f5ef5f8c7fc3b91fee2f6e8ebe41945ca26a6a12e07249bacf2b
-EBUILD kamoso-18.04.0.ebuild 858 BLAKE2B e37f878a5459dda444e02dee3d260e8bea1e6e514227b72bc339cab8df1c257875d9c956390a12b2f92df78bd1f8a864f5a0d6bb5206716e1ffe4ea90448ef9d SHA512 138f4d34c41a9025db59e26119c095b8f602bbb36336437054738adaf278aa6a1fad4917034ad7b9aafed63c86a9f278b362cfad92ae0ea9d88284f1725b7151
-EBUILD kamoso-3.2.4.ebuild 827 BLAKE2B b021f5a94113bb300679462f63765132f8e98e1764f5f0917f55d07042fc6c1b224f3c5862b0223e4d62f58b1e083e8ebc7667ac8ef0d6cc61b56d0ca787cda0 SHA512 54d7ba4728be64c6a859ccfbbb19ba3c1bf9f189b282cce54144f6edcca1176874af7ff3ef6da0f5925192d8e4d881e8cc0f9c9b2cff71e84e6f91a1867dd229
+DIST kamoso-18.04.1.tar.xz 185156 BLAKE2B 3e94399570270dae03605277ce70cf4586860f251daed9f40a5158ad4e5b71b7265773acab2215de81425f909977afa643d31c588aea3d13f842e9d8ae6cb97b SHA512 4ce625e168015b747f986385bfdbbc01f7a87ae1214e8c202ca8683fec317907f7de668a1e92b8384901c3d3b9a7e0432ae580c50f8f94a73fb182f7312728ee
+EBUILD kamoso-18.04.1.ebuild 913 BLAKE2B 7fc5b68ffc45feaa668e0797bca35835d8919a07698e1faa11e75c6cf1438d6757120c9a07f3569936bc041dd083256951bde546f5ba873d4c7a02b9f5dd7d0f SHA512 4c0afff50e66021060b9c7b55c6a58d631d143a264c40954fe612147e8d013c0b92f1af1ab8274ed0b5c38bdf367d51b13609bb423ca9e344d952f08d31af13f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamoso/kamoso-18.04.0.ebuild b/kde-apps/kamoso/kamoso-18.04.0.ebuild
deleted file mode 100644
index a10b83fcf7a1..000000000000
--- a/kde-apps/kamoso/kamoso-18.04.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
-HOMEPAGE="https://userbase.kde.org/Kamoso"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep purpose)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	media-libs/gst-plugins-base:1.0
-	virtual/opengl
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtquickcontrols2)
-	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kamoso/kamoso-18.04.1.ebuild b/kde-apps/kamoso/kamoso-18.04.1.ebuild
new file mode 100644
index 000000000000..78cb89ddcaa1
--- /dev/null
+++ b/kde-apps/kamoso/kamoso-18.04.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
+HOMEPAGE="https://userbase.kde.org/Kamoso"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep purpose)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/glib:2
+	media-libs/gst-plugins-base:1.0
+	virtual/opengl
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep kirigami)
+	$(add_qt_dep qtquickcontrols2)
+	media-plugins/gst-plugins-jpeg:1.0
+	media-plugins/gst-plugins-libpng:1.0
+	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
+"
diff --git a/kde-apps/kamoso/kamoso-3.2.4.ebuild b/kde-apps/kamoso/kamoso-3.2.4.ebuild
deleted file mode 100644
index 2f478690572e..000000000000
--- a/kde-apps/kamoso/kamoso-3.2.4.ebuild
+++ /dev/null
@@ -1,32 +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 versionator
-
-DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
-HOMEPAGE="https://userbase.kde.org/Kamoso"
-SRC_URI="mirror://kde/stable/${PN}/$(get_version_component_range 1-2)/src/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	kde-frameworks/purpose:5
-	media-libs/qt-gstreamer[qt5(+)]
-	virtual/libudev:=
-"
-RDEPEND="${DEPEND}
-	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
-"
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index dfb0db34ec9d..a643e4acd440 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
 DIST kanagram-17.12.3.tar.xz 7523656 BLAKE2B 3a3cf6ca8e79be66e48f0d9c9e6a9fe311aba098ab0766b2d07ee6c153a77613167c95a2622fd8c42bb5ca30da7c60470fb824322a9c2a10d97f0afc72a6efa7 SHA512 c75df80c167b155c53cbbad66d90a5b01f8f7ad9a97b303decfa3fe9e02ef5f4fb4f890256f6052ab67d735c0c5a1c587d56ea76738889a0c9dc9f24a6b0eab7
-DIST kanagram-18.04.0.tar.xz 7523324 BLAKE2B 1a6fd67a7ae56ce62993ef5a629b9263835d0834beee282a0b111c4dacf8980f4282f17c816e3f6b7b5591d09604d02e48d270507b3ebb8bc84b34d8189afcf0 SHA512 0016461f1996705a0f627206529e63d797f9df99010d8400b38307d23b256ef944217e18acddc379829fef9e30c032706725375521140aa837283f0e13b19452
+DIST kanagram-18.04.1.tar.xz 7523608 BLAKE2B 9dbbf115edc954e8e9c83e5eb0a2d19fec58d23f16cfb559dd88a908564c827ce8f0406a7959642160ea40026b7ecdf7c81128bd656bfcc59f8ee5ec11c8bc7e SHA512 be0372a7e195ac9ffdbfbd770551a02408ec4f32941888510221c2fe917fdb34666a4b37788be261ad132a700bd58975cb54b1d5061ebd076b25a6088828d597
 EBUILD kanagram-17.12.3.ebuild 1085 BLAKE2B b55b8f7e63892dc7ee25e80c53d13ab12a7091c260e44c300b0e20de20fa11765c501e83f8af155d4d9469f60ad7578383899a2638cfc538989dfc5dc85faad3 SHA512 de7945997daa902534b2e89c7ee9c2eb089b84329c5aa4c3aa63722d776dce28f8ac8fb26c458dec9c88d0d7d839fc15ad0bff4d62b4675b7f320541b5d4135c
-EBUILD kanagram-18.04.0.ebuild 1087 BLAKE2B 72a439633d7576ff80de9499839fc378c210407e9ee93ea9f1d59af7863b0b78d81d88915be91d70c728886472b2ca1a9a1439fc263293fd3468b5522e8b1301 SHA512 c08816e9005583539f5bbd84d1621a0aec0933ff13089a176a61fa1494690b33f777dcb3edff3ce6e50eb8a189ea4977ebc82fa7870ae4bbd40e3f51b9e59822
+EBUILD kanagram-18.04.1.ebuild 1087 BLAKE2B 72a439633d7576ff80de9499839fc378c210407e9ee93ea9f1d59af7863b0b78d81d88915be91d70c728886472b2ca1a9a1439fc263293fd3468b5522e8b1301 SHA512 c08816e9005583539f5bbd84d1621a0aec0933ff13089a176a61fa1494690b33f777dcb3edff3ce6e50eb8a189ea4977ebc82fa7870ae4bbd40e3f51b9e59822
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-18.04.0.ebuild b/kde-apps/kanagram/kanagram-18.04.1.ebuild
index 9899faffa5a1..9899faffa5a1 100644
--- a/kde-apps/kanagram/kanagram-18.04.0.ebuild
+++ b/kde-apps/kanagram/kanagram-18.04.1.ebuild
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index 51e1986d1b8a..e395d3112bf8 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,5 @@
 DIST kapman-17.12.3.tar.xz 2525252 BLAKE2B 819e84a0c3c887eb5cfdba86935e174f716fb97a93c0cfb7ca30b13606959e5100fc780d199c1955cc585a505b92b2edb8ecd682de3ca0030613268479e498d9 SHA512 68504b49a9cd41e5093096b24fa8ada843656cedbf4274637aac7f8d0f7d78f35ec35c3502bd5781380cf7ae763f773747193747fe8eb8a7e73a91d97c0af379
-DIST kapman-18.04.0.tar.xz 2525164 BLAKE2B 99291667d3f2e8b67cd50ef70e2cbc6623af4f5445c873462f7f0a1c47dbce9aee8c7d80da7f28a98a09a4e3b4e8807ef3a2310e4488b4e893098d541436f9fd SHA512 fb72e057a0eb7bc1035c15fa3a218baa3da02dc31a38e56a5bc914ef9872595014a656c4ef4b0c2cb060715616b6a813bcf64b6b172a61e398c97da1e7ee5b0a
+DIST kapman-18.04.1.tar.xz 2525664 BLAKE2B 615a1091f7b534a5e68e4a5e458c8d8027af55c075118b30180bd38cca5bd1f281d6d7e6f5124c11b0fea0247d30e74428b9f5b764220be40b80deedfeffb95c SHA512 527ca891e3c50d241eeda84859f27410a748606d4d7b6bff4cd4f9ed25eec40ab884cd8e43cb6d9920d5d1fc6fe1a4382f950fc18c8677b5d40c3a76cc70cf7d
 EBUILD kapman-17.12.3.ebuild 700 BLAKE2B c1a3f8e5d562345539feb4ecaf04028c9bbd0b2007750f5d3af30872b35257454e2fb07dcc1b72c1d02232837a40a2f3265f1df9202ead97be532918cf34b2d6 SHA512 1bf1c4c78b22de7300801a9acb3b2fc311881664640bdd06272fb5ba1dcabb5c1319509e2d55b3270e8d3d90eae856a63151e1957d0cb9b747c2bc70c124065a
-EBUILD kapman-18.04.0.ebuild 702 BLAKE2B abea90278a162819302c51909e084e29690a89eac38e9800773d24727de9c058fe6b098d224e5b7f2e027b283d09badc57de20585642be5dcb3c37d6dae92a7b SHA512 326b9e2437f143dbb0505afed2f92aa3466219f49698f378ddedf3e69c66f3948b878027be12e4b64f201b8594016d1e81d03ce5a91b08df68eb06f7cded8eec
+EBUILD kapman-18.04.1.ebuild 702 BLAKE2B abea90278a162819302c51909e084e29690a89eac38e9800773d24727de9c058fe6b098d224e5b7f2e027b283d09badc57de20585642be5dcb3c37d6dae92a7b SHA512 326b9e2437f143dbb0505afed2f92aa3466219f49698f378ddedf3e69c66f3948b878027be12e4b64f201b8594016d1e81d03ce5a91b08df68eb06f7cded8eec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-18.04.0.ebuild b/kde-apps/kapman/kapman-18.04.1.ebuild
index 1bb9a2b6f7e2..1bb9a2b6f7e2 100644
--- a/kde-apps/kapman/kapman-18.04.0.ebuild
+++ b/kde-apps/kapman/kapman-18.04.1.ebuild
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index b7d1fb66356b..ce66e409a002 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
 DIST kapptemplate-17.12.3.tar.xz 352488 BLAKE2B 203bfee3e05c42b266f7d7c880149ac31e2f8e37306ae46f2091831b68e80477226c05ace0ba63729e1e258fa504ee91133583e76ffdce0239191f2d4b08c22c SHA512 03eff26877917a38bcae3166a16e6b802cc900513bec9a615c38342f6a1ceeb454fbc195d1e05f3cf3b6f8a9a7a64eeaaa83d07a5058efc42c2140b4a8c9006e
-DIST kapptemplate-18.04.0.tar.xz 352452 BLAKE2B fda5a228478800f0b068d092dc2f0c0f3caa0e30ba600bdcb9dab779b1b74f3f50df6313be0fa196c315793d070619c6b7b134c4fab39b90b45983739d590e95 SHA512 58d697a240d9b8bf712d3bac509d9591e68e1ef2c02f74bb023e116c0bb5d1caca98753d090e3b22a4bff0de5ed76abc010f407afb97b17f27c99fa67efacc12
+DIST kapptemplate-18.04.1.tar.xz 352540 BLAKE2B 347e8bb66dfe67f8f118ed21b13796e132e8d87ce41cdad77e3b1711f4f8c382a34251b9133766dbcd65fe0e69c3a96bb00edf73e5eb6ca664b0c48cd2b28280 SHA512 75048d449fe70212942c2426d8b7c6203c0e64b17da3bfaf042303222c44b09b7a08f01edd0ea1e4ad51a51854fb8e074e3c281aff2c52256ef240248ec0039e
 EBUILD kapptemplate-17.12.3.ebuild 716 BLAKE2B a463eb5207879e6949c7961f872c177e64c85ae7288987ccdc3245cef428f472624f0d1293cfa8f0ff033417ccdb19d1707d797c8ea718526584ef4b5de6e81a SHA512 54f108f307fdd01e40242592d56da88d6b61ace68f5ab44f18b890339016e8f6dae53b392a6d73d6171fea5ac2cbbfe36509de29e405f219883529bca9db6e38
-EBUILD kapptemplate-18.04.0.ebuild 718 BLAKE2B 23610fc718bdee4457340700b0fff333413814a206c84b89d903715a050b7d3688dad2454f3c28cb37409a60a69cba31d9491ff44045d9b147341b18fe5e3e11 SHA512 4f0b319c78a4ee1f0e2b6a138f16578ed0d366f0063d4b1575d46da47ae06e7b4b3e1d9a6dc27d1a0c887980e36daebbb9b2380974f187ae8abc1547bd2ea5d6
+EBUILD kapptemplate-18.04.1.ebuild 718 BLAKE2B 23610fc718bdee4457340700b0fff333413814a206c84b89d903715a050b7d3688dad2454f3c28cb37409a60a69cba31d9491ff44045d9b147341b18fe5e3e11 SHA512 4f0b319c78a4ee1f0e2b6a138f16578ed0d366f0063d4b1575d46da47ae06e7b4b3e1d9a6dc27d1a0c887980e36daebbb9b2380974f187ae8abc1547bd2ea5d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-18.04.0.ebuild b/kde-apps/kapptemplate/kapptemplate-18.04.1.ebuild
index a1bbc2a3c37a..a1bbc2a3c37a 100644
--- a/kde-apps/kapptemplate/kapptemplate-18.04.0.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-18.04.1.ebuild
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 0b253b8db51c..57e474d70812 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,6 @@
 AUX kate-17.12.1-deps.patch 3101 BLAKE2B 6cb0a6762041c6f6f2b02d921cee39b9f8eba1f3104d05a4e9565f7e9c7287f1e3ad5cb51bf07ff2f93d1c826c646102ae47c4f67d3e34dc82524ad102fba784 SHA512 abdfce9b12de6b254fecfa8d5f9e532e01212711962c88a02ab099f81ab68ef02a95c6afbae22057467562b37fcb1036b4edd2e8d8f1bde3919c4cba171de38b
 DIST kate-17.12.3.tar.xz 5629840 BLAKE2B 384b15a1273ec02d0d3342e761f5c1135f000d1b8485445d07ff5384ea49f60c6d4a6aaadd8371d931cbfcab190e4e5ff820021708dbc44899a01340b980e3bd SHA512 3435afb4dc643064c9e98c86e02521cec9d53fb7ad30320e686db6260e3468b3745643447172218b033dcd46e7c9f02efbd00af26ee820b928ac74f5cf62b0a6
-DIST kate-18.04.0.tar.xz 5643140 BLAKE2B 298e15cd6545f35f1cbbb670c33f4d6c3305a250dd004e77bc56e28adc5975d242afbd7cc0b722c09239961e97d7400dcca76c842d721cd5a7e6c9b1c8967344 SHA512 2962b64a123be966017408bf02d3a92d6814ff76c759e8ea6f98e58c2cfa92086c290aea23f800dfa05ecf092c421ad7225161f757c98d409d40adce61aebc93
+DIST kate-18.04.1.tar.xz 5639500 BLAKE2B 2c8eb6b64c5551b69a0d6386e0e92d60e6affa451729ac4e9b41a51a22293532d1846a3bc6260eeb70daa881309683d9790230d9a6aba3690f9eaf38def3758e SHA512 c892c90e2f01b1540bd8eb6bc8e23532dff680bd5d8980f69b18ece3a7cfd8fd695653cd461f9f9676d1990f8eda18a89710ae536696f17442e16bd60432542f
 EBUILD kate-17.12.3.ebuild 1971 BLAKE2B 3f2152e20b5d66f38cdaef7e201e2a98c4daf6961e788fabf682a2c9e9e6fa27cd57660767d605f14331ed57053bc6980f6912086b7070b8d7293709844bc182 SHA512 67e615780c13a51e507cf2fa51de9a7826d67cdb07cc3acc23f0798c291ec9119300410bfc064fb760d84139602655388ec072f8e24c6e66bd2350c2738140f0
-EBUILD kate-18.04.0.ebuild 1897 BLAKE2B ecf5148bd10e4eb4890b4379752ac9c86ceaa09b13d8ae3563d5a6d83b4fc5e68d31c2a666b1bd1c17dfc347091245f0e5dea8cd03137b5c265c748cdfc6a913 SHA512 995c80491eff8c07e3cab364919f9e861a4d42ec2bc4472812013576da1381b0ec5ac70c9a2c2e011cc379098cfceda0210c6bb9a674b03b25b8fd5b8277171d
+EBUILD kate-18.04.1.ebuild 1897 BLAKE2B ecf5148bd10e4eb4890b4379752ac9c86ceaa09b13d8ae3563d5a6d83b4fc5e68d31c2a666b1bd1c17dfc347091245f0e5dea8cd03137b5c265c748cdfc6a913 SHA512 995c80491eff8c07e3cab364919f9e861a4d42ec2bc4472812013576da1381b0ec5ac70c9a2c2e011cc379098cfceda0210c6bb9a674b03b25b8fd5b8277171d
 MISC metadata.xml 330 BLAKE2B 2c8081efb3a1a1a6c87988dcdf0ac12e4e3efd85ad5c3965662683891113c9a60caa085a97734ae793bc6d12ac3ae0b8cf5249120b45c98897651ea23c7c3045 SHA512 41ae5a022aca855524ba8c6d4c98e54408853a94398a3ae65afd162200e6e4bb8fb9909ac270a27e99a8dc489a61eb48d732a04a73321113874dfcf605d60e6e
diff --git a/kde-apps/kate/kate-18.04.0.ebuild b/kde-apps/kate/kate-18.04.1.ebuild
index 751163775355..751163775355 100644
--- a/kde-apps/kate/kate-18.04.0.ebuild
+++ b/kde-apps/kate/kate-18.04.1.ebuild
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index fca15a848785..22bfa11cc96d 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +1,5 @@
 DIST katomic-17.12.3.tar.xz 1236200 BLAKE2B eb0eb2375fbd272d11e77484029fa66a35915021247e0d30a7312a019b1a59fb092cdddaeea28294b0d84085fe18f24ed06ba140a57c6f70f2b6b7d0dcffbdcb SHA512 7254fec57e9c0fcc2a3bdd3d3fe1a608d09aa80cacb42157b0ceef1af8706a5c0c047b554b0a9cc2a3c098a4d68c07738ea07c23e2516c0e58b405e13df16e1d
-DIST katomic-18.04.0.tar.xz 1236192 BLAKE2B 59084979fcef4d29d3d7bf3590902d187d40c13a729e31cd6d1866261dce38a4b7fc31d306a85aa3218d1e69071d14e666943cfac515a933a55da9b5316b9808 SHA512 c55ca9bfe95213fadfa9ced5bf2a70c2243b01f6f6d0462ea06cd59f65e7730a2180a03b0d24a02fbebaaa04c0776da79071680b3ca694b10400c076e715b027
+DIST katomic-18.04.1.tar.xz 1237068 BLAKE2B a1c13cfd5a818fb7c98838c2d97bba5d98b249bca307ac214aece5c40983e91b35713d050c758c0f697ea596136bdcda43f6061f8f3f52ec2935c86a4b5c56ce SHA512 f616d2074036f8377c63ad123c2ac302c8d8caec20669f33812f0c5146163cfd4c94d782e9adb23dfc41ae2ead789f2a761a3550df49545545338e3fd5b9b173
 EBUILD katomic-17.12.3.ebuild 738 BLAKE2B 06d61d0c6e462e9df7f11bd63a69b231948deb734e6d901789f1bd0efdec80496ff5f0f33121342645062e05d75125e8ab402e583d0594fbafaf839805c08b4f SHA512 767d7acf0f646f59ee8f45bb93d85e2f6c78a870747ec2e795663c07edb7595d13effbc343267f9fcae4c096ec19e84c7adad0edde92b0e26e1acb46a1d4e455
-EBUILD katomic-18.04.0.ebuild 740 BLAKE2B 715396c041dc1e0916a87d511e5007e06ac78ae9e50161a0ffeb1d6da6e7a067746afa26ede22a08c9785587ae77d1f427710422968a0221abc4a88b173ba61c SHA512 1e9f2dee9b0a85a9b0d201b537869d9831767b0349417774ddcc6d488c1227b9486bb6e3e12f5ab80d92505cf1b3e74c3911125913ccbf4ef3416916f345fcab
+EBUILD katomic-18.04.1.ebuild 740 BLAKE2B 715396c041dc1e0916a87d511e5007e06ac78ae9e50161a0ffeb1d6da6e7a067746afa26ede22a08c9785587ae77d1f427710422968a0221abc4a88b173ba61c SHA512 1e9f2dee9b0a85a9b0d201b537869d9831767b0349417774ddcc6d488c1227b9486bb6e3e12f5ab80d92505cf1b3e74c3911125913ccbf4ef3416916f345fcab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-18.04.0.ebuild b/kde-apps/katomic/katomic-18.04.1.ebuild
index 8385fb375b83..8385fb375b83 100644
--- a/kde-apps/katomic/katomic-18.04.0.ebuild
+++ b/kde-apps/katomic/katomic-18.04.1.ebuild
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index c2aeaee62308..2c613d29430e 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,5 +1,5 @@
 DIST kbackup-1.0.1.tar.xz 471784 BLAKE2B b700df053423d820ee545953b5303b1223c446185b80cbbd19fecb287316cb29156625490166d005231ceae9a068bf2da5b9a599ca8795d16cdcf90454cc8c2e SHA512 1b398a88ce0d109733ad9efd73b3e5770278203a751612749d747352fb05d278a92faeb713fdc82b5cafe9ca1532896a57065b75a9aad1596a34caf4426a18fb
-DIST kbackup-18.04.0.tar.xz 337368 BLAKE2B 9c1ad666994c20e16ae034ac96143186c472526cbc671d6ed5fc1f970962cb31a6baf803b6b23de17ce03ad3313f63b9085ff5476a01797eeb74850090e220b0 SHA512 6bc1da368b7f7d9f1cc3c8cadace7e295afbb3143f1dce02ceede221f207c2233c30d52a23bd8664bcdf910d0da945749945f9e50abff8acf1d202c28faee203
+DIST kbackup-18.04.1.tar.xz 341332 BLAKE2B 86c72a02b9517029c9f4efcca5436cacf6cc1fb03cb7652e4fcaec4ab329c161f17244bdea5c43c3c74b77144dcc8d4473e61a3a58db696526117aa01f27f739 SHA512 157c1c18c7a0de916d40f906539f7208dff95ca8921c088edb8be203f68fae6a8566aa44a6c413d3fbcdaac17d6701845a05be0c823b7c4a539dc96fd1aba53a
 EBUILD kbackup-1.0.1.ebuild 994 BLAKE2B c279512ccc7550582ef5bccd351d83aa05514e07bb9e4e44475bf845c60ccf7428f2b4dabbf2fae1fd9d4e46554b796c065bb4f61624f590ddfd228ff3a9be63 SHA512 ef976357cf4c7b93c3b1d0422962479e0fa851dd38a2ed2464ef55f375283e6ee56f897415717e52c6a900fcfa4cc8d526dab128c2e82963d0ae06ff62d873a4
-EBUILD kbackup-18.04.0.ebuild 828 BLAKE2B 33d6d607c19d67833c73ea262c81b64b20f92b5aafbee03253c6ca182a53fd1f3238ba29385c2064f660cb785014aaa662f8dd8412870664f9664604e74d4880 SHA512 812004bd1475c623c92bf7228f395f2c0f286f2c0b96511fa5033bb41b7e949a94e04babe4121bdec141d718451015f92f3064d285476577ba32f89f096529ca
+EBUILD kbackup-18.04.1.ebuild 828 BLAKE2B 33d6d607c19d67833c73ea262c81b64b20f92b5aafbee03253c6ca182a53fd1f3238ba29385c2064f660cb785014aaa662f8dd8412870664f9664604e74d4880 SHA512 812004bd1475c623c92bf7228f395f2c0f286f2c0b96511fa5033bb41b7e949a94e04babe4121bdec141d718451015f92f3064d285476577ba32f89f096529ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbackup/kbackup-18.04.0.ebuild b/kde-apps/kbackup/kbackup-18.04.1.ebuild
index cc493cea15d3..cc493cea15d3 100644
--- a/kde-apps/kbackup/kbackup-18.04.0.ebuild
+++ b/kde-apps/kbackup/kbackup-18.04.1.ebuild
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index d4ba7e14e28e..bf51ea55ab3f 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,5 @@
 DIST kblackbox-17.12.3.tar.xz 401756 BLAKE2B 46a6a533271839747e1331f52f6b1b6429b9632bec0473aaf56be90cdb39733257a6ab1f7ddf981c7dc62f4b1e0b3c79aa8a73306c54ead4d4d8f6c303544934 SHA512 e06f251a2b75db0910649e96c0d8ddae449fc23f39d468fc04e56d30b37ce58c3c15483122f40882dcab1ed1791c038caad87131fe2a4c2d140f66e79ed320a9
-DIST kblackbox-18.04.0.tar.xz 402632 BLAKE2B ba0f0b0256beefdf37a429ce69430341a66a6db22be3d8018cbc8e698ae7a22a5bc2f9f1ce33a5efff0c257ed8216f5b515c773ff1cb5fff4baa190581eba3d2 SHA512 59226a7c1d1de99853ace2ba85f6d418898a1572d872861a49a62ac688d0e6c7ff6d029f0578de9f4aa97daccba99583e63ac93bcb409cfab5a6e93304f4027d
+DIST kblackbox-18.04.1.tar.xz 404568 BLAKE2B 8459c4b73da20232855bb9d67b870268f7b32e892f59ed07eb06ce7b974c2f88b107b024137a662a75eefde277f3be5b7e666239c33ffd458819f8c85d1a209c SHA512 7f4a42f6810bf8f01e1dd0f10e62b074e7209fda970425e0641099b096396ff9eb2e0b79a45e9ac09405a96dc6e9a31027f85cd0498cfbe515277b392233680d
 EBUILD kblackbox-17.12.3.ebuild 734 BLAKE2B 3cd04225e1a8a871bad2c2caa8f52c4b23587ca247f78d17b29d3f5d6f03967cab156ca3940ec606f08a42e9fb966ea1ee890af6da5affacce8abcece4f689fb SHA512 30f4e1bfe5f0751145cdfc2be517c02c062474a3241d89397495699e1192a2818614ccd76a3df171d1e3169def087ba0e8a7ffb12c08275e20045677614b94d8
-EBUILD kblackbox-18.04.0.ebuild 736 BLAKE2B 3d98feee0ff07151beab896ce705fa66bd351f4a2b1916b111ad11e1b218b3696d540c0eda5d1dd066da969f30e71f20b0a8cbc26bd4847ec3510cb97633acbf SHA512 cb87ffeabfc2872538ceda0d78c029257f9effeccfb71c9681f087e839676f71ee866044b7c77a5f9994405239b110593fa4aa45a96f45e2ce8d90402c683bb8
+EBUILD kblackbox-18.04.1.ebuild 736 BLAKE2B 3d98feee0ff07151beab896ce705fa66bd351f4a2b1916b111ad11e1b218b3696d540c0eda5d1dd066da969f30e71f20b0a8cbc26bd4847ec3510cb97633acbf SHA512 cb87ffeabfc2872538ceda0d78c029257f9effeccfb71c9681f087e839676f71ee866044b7c77a5f9994405239b110593fa4aa45a96f45e2ce8d90402c683bb8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-18.04.0.ebuild b/kde-apps/kblackbox/kblackbox-18.04.1.ebuild
index f595a51a7bbc..f595a51a7bbc 100644
--- a/kde-apps/kblackbox/kblackbox-18.04.0.ebuild
+++ b/kde-apps/kblackbox/kblackbox-18.04.1.ebuild
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index 02f536c10ff7..4cedefc9c5aa 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +1,5 @@
 DIST kblocks-17.12.3.tar.xz 1750472 BLAKE2B 60c4390b9b3625ac6ea8c296fa1ed73b46f255fa5d594b7669a27286a73e296e3d49df0ddb39ec4e244eb465538dfec91f03963911b8e06e8aa46bc85c8367b3 SHA512 72e2d278a5707ca423f1494eec0806a0c267b745f14e0c88b9cb97b4fe5a8ae62c8dd0a78f0c94ad9e285d8090be8b45c91bfd0d88cc2a1956d5e580b090de6c
-DIST kblocks-18.04.0.tar.xz 1750336 BLAKE2B 9b7f6aea9e4ba95618de44896cd803b78229dc6ab84770cc815f0b15cecb2fca4e924887fff06c2e8b93b85174181f7a1497631bff0a91de80c863c571c5fa9d SHA512 0c7d790e892168bb1f050e2487b614c82460fb0f69514e16f6e6331006020e16331e84ec27cf77f14e8f660c91f71b437a20874fd4a75e08eb4d27efbb30277c
+DIST kblocks-18.04.1.tar.xz 1750872 BLAKE2B 50df74854fcf0c89fd8243b5c3f6003868c7e23774c28d1b722856fad5857b6dffe1dd0a1eef2599d1129cf4a044f686be32d001e47bf4bf60326a103d0ab7fb SHA512 409c8627e9d4afc7e815c4f0e8862342c2b8f2bef52038268574b2581d0491e807c587a981f7809ce0eea0c40ea5a8addfe0f09d22aa12f5bc134ef072c8ff11
 EBUILD kblocks-17.12.3.ebuild 686 BLAKE2B 5af8815669b58db0ff6f0cd3641e833a8f70cb792ca2122ae488c34c630dc4244f98a5d1547a9bb9852be31c7787ce664bf973f7be02648ba544e26c56cee5ca SHA512 5701312c7b1fd2389e341f8068cc4c7566930e7f170a623b886cfde6d32a3b16ac29b52bfdea8d4926d2edb0f32a65c8e2b6b6ab98350acdad484e0a76d65032
-EBUILD kblocks-18.04.0.ebuild 688 BLAKE2B b997825b2465fcba231a66f409136b932b7e8a14d6d098efcdb4736b913171f1230cb9827c816fe588e71d0675a58c77467d1469c576ba41100acc9d40f8496e SHA512 a7434eef2ccaf3f52bd5a9ec681959b7c5d8a9519fc7eb4e1183fe607a00f0d3b5d3cd3a9397fa247537bea3dcb34a30672efc858d1eba9031c7ac55688a735d
+EBUILD kblocks-18.04.1.ebuild 688 BLAKE2B b997825b2465fcba231a66f409136b932b7e8a14d6d098efcdb4736b913171f1230cb9827c816fe588e71d0675a58c77467d1469c576ba41100acc9d40f8496e SHA512 a7434eef2ccaf3f52bd5a9ec681959b7c5d8a9519fc7eb4e1183fe607a00f0d3b5d3cd3a9397fa247537bea3dcb34a30672efc858d1eba9031c7ac55688a735d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-18.04.0.ebuild b/kde-apps/kblocks/kblocks-18.04.1.ebuild
index 864dc454ad9d..864dc454ad9d 100644
--- a/kde-apps/kblocks/kblocks-18.04.0.ebuild
+++ b/kde-apps/kblocks/kblocks-18.04.1.ebuild
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index 9ab6b8c553b1..672192d3d32f 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,5 +1,5 @@
 DIST kblog-17.12.3.tar.xz 72264 BLAKE2B 36bb90d92b033fcc40f5f899e90b189458b1056c7d3b196d7fe6f0397f98ef5651a1eccbef3294403a27cd37a29ef2d7b45e4be89b752307a3fb2ea011c8db4e SHA512 6e048eed6c247e9af6c96d536fdac371734fc3dfc198094e2cb60218f63347508196ecf9d2d88c190c7e838aa3feb7872001d736be2b7ba01c596f0ca8eea2f9
-DIST kblog-18.04.0.tar.xz 72412 BLAKE2B cd4ef0d1f60a09ff2aee039451ca873a5d6ed52c3e6e32f02a28a37d4817e63ad57a1692d2babf56c781207b3455daf207bd3f9d1fb6da9fbe080c76f51d9d27 SHA512 078a9715217a0ffd6e5f2cc4b46fab3230e9c09a9493f66cc4e1e5feeba89cc59d3da259e601a3e4f6fd50c981bd1ace7fd6cd37b7c6556284b7856b66055bfb
+DIST kblog-18.04.1.tar.xz 72524 BLAKE2B b7d2cd6919d35c5cceac2fe15b2fbe2788ceb0f0b85d0d2412c917c900c97a96f3598acbcbfdd3d05e73d1cb02edcb080a964585f2604fbc3e940b0f034e4912 SHA512 48bf62ca246694209107174f8db58a89ad1ebabfa80b91fb73ddcac5fc9db0117a373e978b26451d8435672f176877db053b6bec43f0c146cabaa58c59926d58
 EBUILD kblog-17.12.3.ebuild 530 BLAKE2B 2a664bdebe9aed7515df9eb4535c850245632b331a23548c82421b96b592f4ece00334320e731e99ad7bb32e1d44f68e85770efe21805f4525f8989ec197a602 SHA512 cf8f8b2331184ddfd495519c39f2091e87c249c4662a1a0ec1d07bd00ec72b213f6e059821d6f9958545489fdd05764731a9d5aadfd12ed830ec1e2e8f7d3bf4
-EBUILD kblog-18.04.0.ebuild 532 BLAKE2B f3dfd672526dcdb8262f6afdc6926c58f752c6f2a7f9cb8131fd8ffcf76805d8e68e2fa4ff1408dbc8faf1cc2bed8a01595c4cc70739a5852890630f1970d8b6 SHA512 43b74ae97733e3869b19fb4e87e5efe7b6b14ad0bfe57d99b7bffac35f4af783d8129753f2cec3ad4b41f013e60057f254df00603cc0fe2fee75d5b304af2baa
+EBUILD kblog-18.04.1.ebuild 532 BLAKE2B f3dfd672526dcdb8262f6afdc6926c58f752c6f2a7f9cb8131fd8ffcf76805d8e68e2fa4ff1408dbc8faf1cc2bed8a01595c4cc70739a5852890630f1970d8b6 SHA512 43b74ae97733e3869b19fb4e87e5efe7b6b14ad0bfe57d99b7bffac35f4af783d8129753f2cec3ad4b41f013e60057f254df00603cc0fe2fee75d5b304af2baa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblog/kblog-18.04.0.ebuild b/kde-apps/kblog/kblog-18.04.1.ebuild
index 52fe4d617ecc..52fe4d617ecc 100644
--- a/kde-apps/kblog/kblog-18.04.0.ebuild
+++ b/kde-apps/kblog/kblog-18.04.1.ebuild
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index bcfb88ce1c38..2f9e90d27d11 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,5 @@
 DIST kbounce-17.12.3.tar.xz 3484252 BLAKE2B 0d802cd70a1618acaaa6609bec8c58628a149aa6bfed08a33041e11e30feca0902eb17f834f02be632e26b5e210a1b636a41bc22034f3d4059ea622228756bcc SHA512 e9a3a4ea3abc0fb46fe4595e494285006e29f0994841f2effe1b9c7efdbaea4eeea48d74268e0db610e8c8b58e322bf4d4261349e9ce00de7681158850c957b3
-DIST kbounce-18.04.0.tar.xz 3481884 BLAKE2B b17c57d9893c114b7c6478eaa39109b3f4d2a3b6d346a3a14aae4e908fc201b07f330c048f0d36eee4084c5b9eb697c3f7a80965c3b3485015a33f300c49ee5d SHA512 743a941ae770cc5e90bd43f3344acc27b93c90f32942c1598746c8623f5173d05d384a1f648c5e734ba3741e13ccac96a09e654f7631e6b9c772d77d6ac8d934
+DIST kbounce-18.04.1.tar.xz 3485172 BLAKE2B 2157bc73972bff8946dcce6e192f68417a2f2f9cdacc657788ab54765e68d8387bf981f2ae4c31f77397288d3e96ef343ab5da636bc81e3ce9bc61067c9b5c1b SHA512 09028226cbbf755aa3380cad36402faeecf14e62dd0a9517551b4baf9c60300daae5b329653dc82b7411fe42255d6921f9c6c067d4b9ae2c0e8c6b9dcaed4380
 EBUILD kbounce-17.12.3.ebuild 817 BLAKE2B c1344737ccc3e0884ed0aedde6ea0e70832996761448e02325656d595af247a92983cbb79c68ff6a039fd9c68b139eb997cbef02580b8d5782643a89b23567a7 SHA512 52bc73ca5c7f4e1923c93553e14ddb9e9db8ab8e5d407d2743ae29fc6796bd39c9793f59752ab63c6b42fd1154ac539f1ee4ef675d68bfedf4364983f602fe3b
-EBUILD kbounce-18.04.0.ebuild 819 BLAKE2B 6ca3462e7839a2e970005270fa502924e937e115b6684493af8f5fda8804c3ca4ef032ede4885e18e6d6670b0006f5b323530ed3741f8e2ef0fb550838775d8f SHA512 da01056eb58c0178d1cfe3162f3ffbbb02ace4f6fa97d06086f0a5d3c84a5d61a4280db65125ddfcff7067a691debc7d0c2416de9327a713b532ee5c12b4638f
+EBUILD kbounce-18.04.1.ebuild 819 BLAKE2B 6ca3462e7839a2e970005270fa502924e937e115b6684493af8f5fda8804c3ca4ef032ede4885e18e6d6670b0006f5b323530ed3741f8e2ef0fb550838775d8f SHA512 da01056eb58c0178d1cfe3162f3ffbbb02ace4f6fa97d06086f0a5d3c84a5d61a4280db65125ddfcff7067a691debc7d0c2416de9327a713b532ee5c12b4638f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-18.04.0.ebuild b/kde-apps/kbounce/kbounce-18.04.1.ebuild
index eccbc67cbbbb..eccbc67cbbbb 100644
--- a/kde-apps/kbounce/kbounce-18.04.0.ebuild
+++ b/kde-apps/kbounce/kbounce-18.04.1.ebuild
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index 87ff4cde5579..66ba39e30f84 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,5 @@
 DIST kbreakout-17.12.3.tar.xz 2021172 BLAKE2B 839334740acd0c6ac83b2f977044fcfed5c5546250ff96af973a47b7bf323ebb09d2e0feb6e556ec1b6f6bab9f86b81cca97d84f895408dab9652db492bacabd SHA512 8e0927ed28978175dbe9c9e35e2fd2844987b2d556b297a1eb7a31d6ee32508f14f9eb656ebf5ca29ff36dc1007f270e301c41eefb54e34889564e909c122b08
-DIST kbreakout-18.04.0.tar.xz 2021660 BLAKE2B fbd23e83bf00b213d7886a249ea09b0374bdb35642c499901f6b2a474983db7a3f0ec3c6d330a1cb3f237b0920301c33ffb35090d70afb97500590262b5f0a74 SHA512 be11a87e506393092128d733c18255c73c04d7ef1b9ec032693e6c0d21dbe4d87ae423b57a2ecf579ce7ebe93e3ed77055ce4aabf3a47c269eed431063c37eaa
+DIST kbreakout-18.04.1.tar.xz 2023968 BLAKE2B 706d04cf1bf182a3a7f1eaf68d79bc7a4fdd36e5cc21462cf715d6b5ece48703ea0f11b2edf34089d4f83cbbe7cfd5888a23796c558a6d917971e157f8c7eec2 SHA512 05c27a0f2c2ed8f582ede5fae6c343a53b918d8df4108a2a7b18d660a9d9c7d31739a338da007c8010d58929389171b798d94f73c15a2241c43089bd8c878d53
 EBUILD kbreakout-17.12.3.ebuild 766 BLAKE2B d5c1bdfe47144def260c6f124b99ca2c0ac8567067842de0de128f9e7c5df56b26acd049cf9d32cc04201a5b47b50a923829ebd5ef6f88c9685bc78eeb501b72 SHA512 4137190afc45eaef707c4fe2008cef9a06b7f1021fd3051d993ca5a101c989c3f1440feb758d01ecb71a0da068eec3736d53bbc3dd40575bea06091c216b9346
-EBUILD kbreakout-18.04.0.ebuild 768 BLAKE2B fc85517ecc7e80c9f666512a2543624fd415599b1842acbd0d9c0315c8aaaf6106b4d9c332de0fe28be4c7c9d7eb4bdba61f3f4c3c7826a57fb4a1d2811e314c SHA512 11bed8e4809be58b9b273a03df5ac0bc20ce6367008ac09e0c4dd2f3d531b512c8c01a98924ea0ba8ffab695b6e5d0fb4945575ab39233fc68e517010ee73357
+EBUILD kbreakout-18.04.1.ebuild 768 BLAKE2B fc85517ecc7e80c9f666512a2543624fd415599b1842acbd0d9c0315c8aaaf6106b4d9c332de0fe28be4c7c9d7eb4bdba61f3f4c3c7826a57fb4a1d2811e314c SHA512 11bed8e4809be58b9b273a03df5ac0bc20ce6367008ac09e0c4dd2f3d531b512c8c01a98924ea0ba8ffab695b6e5d0fb4945575ab39233fc68e517010ee73357
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-18.04.0.ebuild b/kde-apps/kbreakout/kbreakout-18.04.1.ebuild
index df3e421e986d..df3e421e986d 100644
--- a/kde-apps/kbreakout/kbreakout-18.04.0.ebuild
+++ b/kde-apps/kbreakout/kbreakout-18.04.1.ebuild
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index e3e584225c1a..34d6d9486fe8 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
 DIST kbruch-17.12.3.tar.xz 5601080 BLAKE2B d6fec580f74cd443f63e3e079060314e29b6b8e706f0ac91209b59c1be948c8cae53b03676d6bbbc7ad22981f43fb62c0975c8c64ff663cbd5dce879a60cee5f SHA512 3b3a4ad6e4abebf803feea0b3145290f9ae4cab048b4711138603cf42a1b856a7175b42bcf30388440c63b6c7025733c2e3f286e821c783f700936eeb890340b
-DIST kbruch-18.04.0.tar.xz 5600696 BLAKE2B d9a5d988abfea7ebf7883119541699081b45d3011607c83a0178e1166f6359ed138bb2d9872a1398dc007dac1946945ee3c33aa28f5c485f6fec7ab2593364a1 SHA512 2d2ac713186b344c6896f0601d33e306432cffe5cebfe2a7c037cfb9f6f790bfb1a5c87f9f5abe17e8783c1bbb99976b9dbd5612da207efa71c5753c2bb9f985
+DIST kbruch-18.04.1.tar.xz 5604428 BLAKE2B d5164f50588651bd6fe374d853df069adce31724431aac1043c92194ab099ae6ff2a20f653e6c1654032c6502bfe86b75fb28b5581c99312a5938a08aba41ca4 SHA512 6fd1f6e1983c8e8c5cc5cdc5dd68c9514ee8f17962723619b65b784c1191f2e7f1c4977909ccc1700b6face3c63f05c512b63f222fdce6a25f5743262496e572
 EBUILD kbruch-17.12.3.ebuild 630 BLAKE2B 111e2fbbe4ad95c8351455c57ccd531c3390679a9fa5da642c7f14e4d7f6850f510a1429b7c257cd8e151cf7b05b6df67039fdf63b43407b64027ce3eedb9d6f SHA512 53031739e69852f412c0fc32318f46d5c710e1d8dc9b17810fe0f009fa377bf5c13cdcd72db9132f17d50d901f486b34c76d958ae137c0b60359a2fc533d64b0
-EBUILD kbruch-18.04.0.ebuild 632 BLAKE2B 0a6b5ebf28c609236ab86ebc58bf09dcae519f505d6a0d27f44409b2c60ca01e038cff251fc60432e96a76c94f4f52d67bd482f049bf15c00b35ab33b92bdcb6 SHA512 953945f0d5366e10c8f2783cd25e98f4f415ab9dd3e3378788edb835b96a93954be6f3121795c7076bdbf4ab57bdb373e7a3b94433a6b80bf9041a73a42d44f2
+EBUILD kbruch-18.04.1.ebuild 632 BLAKE2B 0a6b5ebf28c609236ab86ebc58bf09dcae519f505d6a0d27f44409b2c60ca01e038cff251fc60432e96a76c94f4f52d67bd482f049bf15c00b35ab33b92bdcb6 SHA512 953945f0d5366e10c8f2783cd25e98f4f415ab9dd3e3378788edb835b96a93954be6f3121795c7076bdbf4ab57bdb373e7a3b94433a6b80bf9041a73a42d44f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-18.04.0.ebuild b/kde-apps/kbruch/kbruch-18.04.1.ebuild
index cdaad6a4a6c1..cdaad6a4a6c1 100644
--- a/kde-apps/kbruch/kbruch-18.04.0.ebuild
+++ b/kde-apps/kbruch/kbruch-18.04.1.ebuild
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index e9cdd500ec2a..5e15163626f1 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
 DIST kcachegrind-17.12.3.tar.xz 813108 BLAKE2B a5768fb9cff28f22750d0cca761ee6201ba6e53ec42e86fada92451b2f43a2c81235ef71cf7484a754c39739b8501f1c8fc31a5da9108c7cf0aebe802662346b SHA512 56f4fee2ba8d03760858bd9d0fd6601e5beb9aec4d8ce2d87ba1d811698f3e8673d12ae834b20696ec98689992b6a560ccae049a5b69538432df6abd21dcfcd6
-DIST kcachegrind-18.04.0.tar.xz 812584 BLAKE2B 1bc04395f45ed56f1dbce57d6f064665306d55e1d9ea701c30d25501c9aa7b3128366f7d60bdad27409def92222d102a5735a9ebfc56b5d3e92fb6412432dd1e SHA512 cc945d74e506ba6dc982b0a0e42d1f284963a05ca72fc6cf10f61bddf2d367f3eeb6af82460e1659bcd915f4266fa12a1245cfba6cb054f66b4a628931b3bc9c
+DIST kcachegrind-18.04.1.tar.xz 811640 BLAKE2B 4733492828108f5abd0868b3a1a115f66ad74f842d3054ff55b34964b02deecdca86c4de55ca8def6d5861729b82dac13a506737cfdf0d950fdedf0eec61e193 SHA512 cd8c138975c3d6f2b1452affd4bdd12f533331ee79ccc0d5986a22815036234dfa0969969990ec7fb0770d953816bbe34633f75fec28126211210a8f086f48a9
 EBUILD kcachegrind-17.12.3.ebuild 879 BLAKE2B b6a504162dfc611bded522a77895b797dac2d2fdc9dd9cef6ae89746f1a4c9d5157bc589ddcc1d04ac662065b6bb21cab9582aa9da16aa8564029fd7977b98d5 SHA512 cebea211513f766df63d127f369b9a539bf6137f7908e103e862d706c9f64679f791a9808efff89812c690a7da149204f75a9904896706927fdfe12724d44b3c
-EBUILD kcachegrind-18.04.0.ebuild 881 BLAKE2B 0ca911c9cc2beede7e7b59392cb9d6bfe0eaff3b6c98b1be10f896c84cc7fb923293d1fad1f8a7fa9afc835bf1789b34d6f6a7339e1f6fefa2a9602529398a34 SHA512 57fc2642442e1bdc5f4fe3188f84a061d5c2c1cfc8b11e3fda8448d6cc3b9209e49b2c5517680f2c75c684fbbe340e5f41ef51f8d0a1c2f32b9adea51471c4d6
+EBUILD kcachegrind-18.04.1.ebuild 881 BLAKE2B 0ca911c9cc2beede7e7b59392cb9d6bfe0eaff3b6c98b1be10f896c84cc7fb923293d1fad1f8a7fa9afc835bf1789b34d6f6a7339e1f6fefa2a9602529398a34 SHA512 57fc2642442e1bdc5f4fe3188f84a061d5c2c1cfc8b11e3fda8448d6cc3b9209e49b2c5517680f2c75c684fbbe340e5f41ef51f8d0a1c2f32b9adea51471c4d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-18.04.0.ebuild b/kde-apps/kcachegrind/kcachegrind-18.04.1.ebuild
index e373c6a3ab5c..e373c6a3ab5c 100644
--- a/kde-apps/kcachegrind/kcachegrind-18.04.0.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-18.04.1.ebuild
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index 183ffd1fbb19..b4e78952cd62 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
 DIST kcalc-17.12.3.tar.xz 360180 BLAKE2B 5b48e85c8c5bde7a01510d5f9fbf0f4fc98d7afbacf4574e1f8f21ed0c99df0776ac62de7589a1405473ace3c27a01fc54179e8f59463cbe3f5108f95c60f106 SHA512 e8d86165acfa8f6bce5ec0500baedd16ab73330379675b8b92d64093e8f74b8fbaf2758a269ea522682375c3b30c074194f55e1af96cd6ac758cc08ba68e30e5
-DIST kcalc-18.04.0.tar.xz 360196 BLAKE2B 671980370e2139bf974074f43dcccd19b356cf48ea63c2d268a16af52637383f5d95ab8f41edbe5ba7cf0ed459b14f6c3fcc49fd9068f072c85477393af42295 SHA512 c60ebc85ea5da9385298bd8ca0514184a23f070752cc39c68fb6b045080c866e0baa701eab6f98966ffa099820dfd356ca218392d98c0b6f8b9d26333c6db55b
+DIST kcalc-18.04.1.tar.xz 362036 BLAKE2B 7e9c3ee1d3899eb2631d3fbbbbb01582ea7b58a5ff02b520e1147ba1b13c25bca1d30df3b5a131ab6e44533432a94398252176a3edb1f071282be0cd9dff0da8 SHA512 4c6527389b79373b71fcd5a55b3687ac3c136b8b182d58ad61b2f0d4f1ad53fbfe3e6ca16e69d7524b032de9f3e599247c20b5ae0cb3cf78dcb5f4be10dc00a3
 EBUILD kcalc-17.12.3.ebuild 771 BLAKE2B c5c8f2f21e376081aefb2763784572876c9541b1221762eb9c43c36b8145a5f172f363b059c7bfa399fc6310182e8b5177593b1d9b36f59d2bcc010430f797bc SHA512 7991e7adec9c5bb4735a755fdb91cb2ff8ecde7c352ad13e1cc98d58970cdd4439621765ca66f8870f54101265af1021aade8a6a4bfe0c3ef02ab5fbf9686c3a
-EBUILD kcalc-18.04.0.ebuild 773 BLAKE2B d4b788d176928f7d3ed49ab3b985439209cc6279e816e2a99ccf0a7d7584484ad7a139845dc6feac14291d0f2059cf45ef19e472313bac7a41db04ed3acc2605 SHA512 db3ad31717a281b74585bcaf1f48d7b739decb4978579c428ad5e1beded5cb269416011d3340a081ca26347304e6610721689a060de7a88802ce59a29e03f33f
+EBUILD kcalc-18.04.1.ebuild 773 BLAKE2B d4b788d176928f7d3ed49ab3b985439209cc6279e816e2a99ccf0a7d7584484ad7a139845dc6feac14291d0f2059cf45ef19e472313bac7a41db04ed3acc2605 SHA512 db3ad31717a281b74585bcaf1f48d7b739decb4978579c428ad5e1beded5cb269416011d3340a081ca26347304e6610721689a060de7a88802ce59a29e03f33f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-18.04.0.ebuild b/kde-apps/kcalc/kcalc-18.04.1.ebuild
index 2877d5cef5ce..2877d5cef5ce 100644
--- a/kde-apps/kcalc/kcalc-18.04.0.ebuild
+++ b/kde-apps/kcalc/kcalc-18.04.1.ebuild
diff --git a/kde-apps/kcalcore/Manifest b/kde-apps/kcalcore/Manifest
index 60f4be7b2272..dab2640ff694 100644
--- a/kde-apps/kcalcore/Manifest
+++ b/kde-apps/kcalcore/Manifest
@@ -1,5 +1,5 @@
 DIST kcalcore-17.12.3.tar.xz 276504 BLAKE2B e2843a3aadbf6abadeabcc135b03ceb8278b19df960bbe9069ea36068844c13a330a8820a7d4cb7bd0bee98d39ea32efa6828eab95f851eee18bb41146ae8194 SHA512 af4d1accecbb220f4d2090553a1b8eb70b6c941ae0304cf67863c70cf25647a668c65f3371c7ce40533955416cf8ad7381da65982c31848087308249c6ff0968
-DIST kcalcore-18.04.0.tar.xz 253804 BLAKE2B d7bcb1c9d213973e169a0d7450a0849d5d05a84c0fbac198d5d84eed977815b77ae17b2e68a5ac35b104619a77f836b41cd38743cb3d261d8a5f22bae1f48cae SHA512 6e51adb1eb744b5e6ee4bcf672b74e4788857d0d7110ff4c86da125b331578a760ef0fd657bb6d4b473607a07e88e17ffa263761c093d78ca234629c12e4a439
+DIST kcalcore-18.04.1.tar.xz 251724 BLAKE2B 9e338d1dfa43a64f9215f64016ea2af0feadeed4c8cb309fdbe92b0c605d364981f981f8332ab47506b8fcdc7fa51278c7927473e2740c2875b71a49bff36c1d SHA512 2ce97d97b15bacec0ae208d5f987abc76d5b5712b99030c38170be5712adaeb76fb376d26bad42bde5fc144e3cc182c1e0430e885f4617d5514dd50a86635032
 EBUILD kcalcore-17.12.3.ebuild 438 BLAKE2B 6d19c4126c628848ba833d0eb807d8221b1e82844646b34fc0e2743b900260d3d647c3f85fb290172e10339efc64e8dad5b3fa6e1a21621e3a06dd29ce214883 SHA512 a8ab920761ef69473ec447e42a108829bd8eb5a9d77e5fa3c814c1c28a8234fae375c33ff25b0597bd41b4b46260464adb47deec7feea401140acf6b7fc23947
-EBUILD kcalcore-18.04.0.ebuild 440 BLAKE2B eaf468e17f97f98ae4ac9f39bb6e159edae27965ab693af16cb79ea82f9eac5716cd561e525012fab7d28e1dbabf7d14e8c7577df1929b62ad4d32a2b014fcfe SHA512 d27034f46a439a58a06002885e255f2a1ec6054c3e2d84581082547a1431e2b0b44470563f295a1ab47a47e7d579dcd7fb04c47d3aa3386746b7850e8ae0eafd
+EBUILD kcalcore-18.04.1.ebuild 440 BLAKE2B eaf468e17f97f98ae4ac9f39bb6e159edae27965ab693af16cb79ea82f9eac5716cd561e525012fab7d28e1dbabf7d14e8c7577df1929b62ad4d32a2b014fcfe SHA512 d27034f46a439a58a06002885e255f2a1ec6054c3e2d84581082547a1431e2b0b44470563f295a1ab47a47e7d579dcd7fb04c47d3aa3386746b7850e8ae0eafd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalcore/kcalcore-18.04.0.ebuild b/kde-apps/kcalcore/kcalcore-18.04.1.ebuild
index 88a4662dc2d7..88a4662dc2d7 100644
--- a/kde-apps/kcalcore/kcalcore-18.04.0.ebuild
+++ b/kde-apps/kcalcore/kcalcore-18.04.1.ebuild
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 93667610ff10..bdf41d2414bc 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcalutils-17.12.3.tar.xz 323512 BLAKE2B 31ee7f6e9608f496fe3aa3ac59f591ccfdedb421397d36dab0e04aa1cfe21a8e57d6716708dc35d06a32c8053822520c4c2b8b527e725a742de8cdf2b7863aa0 SHA512 68a5cded42a3b2d3cd8eb9f0fa3529b34c270fea06a0861c98bf4d1fd8d9bd239c656c25f5f4cd697b7434458c15b3ba974267161f9b4497020d89345475fae7
-DIST kcalutils-18.04.0.tar.xz 325260 BLAKE2B f1a044867300a8f2172ac5969cf8312303bbb0cc67d1cb5ec8213c879b4faf2b83892f7915c4d85b216dd2c72bdc23449086d249f354ce6e63ce2d34044cfa68 SHA512 97ed56e5017809e7f76c1a4fddcf727a2c23999da65ef1fdae397f1fcb8d9a1b01bcfedf6aa06feabac157fd92d51fc267f29dbbb816e8d90ea74f8db7a11d4a
+DIST kcalutils-18.04.1.tar.xz 326416 BLAKE2B b218bef8820fdcf1cda9c2581a697532fe26c0814d7f3059ec8d325925d5c0689854d15d850b47302607b838a1af09031d88a7f3f1ddecaa679004f77b2969d0 SHA512 9944bd39de795ea1ea9eadde756205bcc8c905bbfd4fb079d6347eaf6107f8f31b7a96f5ebc53af37e0ca5e6dd16243f90b81834ba0cf47e529c795cfa489cb7
 EBUILD kcalutils-17.12.3.ebuild 759 BLAKE2B 546d010e2e92c0d0221700a214af1ae5ed62ba1ce307cafeb505f459a2bec783e519d49f190ca6ac94306647c6e8bdf64fa0ed02675b94aecd08bb8d18e40262 SHA512 502e4fcca0ee7e807df7e72a95e7a3e9390a1eb98fd02017b4784872a941face06149f981ac502f247c179813305b715abecb2d6cc84bf82090b0872af62edc4
-EBUILD kcalutils-18.04.0.ebuild 742 BLAKE2B 9d499c034515c7b283b42dd20cda437e3cb11c254896e3324d63f85070260a3cd2de04880dda325007408f13f647c765740e13828422bdab6e31d8576870f8a5 SHA512 aa96a1fc68c59759c40aaa0af819c2a0a57e4162b9bff8c4f0ec9c4070d24540ec04908a7a995f41499097f1cf2e36ab6396ab24f67004ba47744b4ac410071e
+EBUILD kcalutils-18.04.1.ebuild 742 BLAKE2B 9d499c034515c7b283b42dd20cda437e3cb11c254896e3324d63f85070260a3cd2de04880dda325007408f13f647c765740e13828422bdab6e31d8576870f8a5 SHA512 aa96a1fc68c59759c40aaa0af819c2a0a57e4162b9bff8c4f0ec9c4070d24540ec04908a7a995f41499097f1cf2e36ab6396ab24f67004ba47744b4ac410071e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-18.04.0.ebuild b/kde-apps/kcalutils/kcalutils-18.04.1.ebuild
index e2a72988299b..e2a72988299b 100644
--- a/kde-apps/kcalutils/kcalutils-18.04.0.ebuild
+++ b/kde-apps/kcalutils/kcalutils-18.04.1.ebuild
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index dc106f57f15f..90a7947c70e3 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +1,5 @@
 DIST kcharselect-17.12.3.tar.xz 351308 BLAKE2B fc9e005381eb83f308c1fa10296f8cb54797cc0f53611cdaa737b6755ad35ba3dcf6a4a69dbdd1531d1dee910f000f62d1ee9bbeb1f3a925920969b33727af56 SHA512 75b4044c55ac539b05306f759bc4241da71500086157cb0847318ea7a9cea8a4fb40580c54d747f3e80a51668c435ca7aec80d68dffb7193e3bcded540b31275
-DIST kcharselect-18.04.0.tar.xz 351268 BLAKE2B 7caa6ff3a49decf4bde4a91831c12be0c01d7d51b2f49cef2c47430c9eea0cd97a5329b387abcafc5adcf39b0905a170144a0645bcbabe9d4a1289a907836f3a SHA512 6e73109e5e3112bd922a4ae660c79e0c6238499b8ca90facd17e499d1998f65c269575e9fe0528499e5019d2834e93eea0839f0af3dd34d58fac4d0055dcd379
+DIST kcharselect-18.04.1.tar.xz 351776 BLAKE2B 080ba566eb0c25bf24204e3826e214a9f0ec9c9265546d98cc23824afffed20d723da7b597c892af4045378c4b62f1efe92b350281d40322935fddf556d68176 SHA512 1ef8ed4d0e250d2d0e478fdcafd5703fd307eb82a1d3ca8f697852e803c26a5587dc786b9f984775a3959292ef156f7a59ff6c4b722f3a3507cb591733fc9fc0
 EBUILD kcharselect-17.12.3.ebuild 657 BLAKE2B 02d4eb97328d7a29bc35b38d7fbe1d36adec5bf63917e132ef4d3c73af36f466349e0fb69e8e117bac93e81818f24de79ab219a67863741065b9c48146c05a4f SHA512 1b4ad8686d4943234182a53b25579e0f44e8c1a4b5cd6dd1e3b132461906fd70eae7ec3e48603912813212cc8f82d93dc35f331a2c6717a2d393824ddbfde5f2
-EBUILD kcharselect-18.04.0.ebuild 659 BLAKE2B 770987371ea06f0106bd6c902f80d968cf0122cc4914067f2b7378c93d47b83e850b4e79a63e18c0faa7769baefffa998da9e044deb6efeddb3cbffe7fe59230 SHA512 fead3ce266fd1936720aa135138cfd21fa3f02efa9b1a18339d9f99c155e240962e1d81a81994da3583a261635c5bce505a084c7f39e09cdaacb77140f07c725
+EBUILD kcharselect-18.04.1.ebuild 659 BLAKE2B 770987371ea06f0106bd6c902f80d968cf0122cc4914067f2b7378c93d47b83e850b4e79a63e18c0faa7769baefffa998da9e044deb6efeddb3cbffe7fe59230 SHA512 fead3ce266fd1936720aa135138cfd21fa3f02efa9b1a18339d9f99c155e240962e1d81a81994da3583a261635c5bce505a084c7f39e09cdaacb77140f07c725
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-18.04.0.ebuild b/kde-apps/kcharselect/kcharselect-18.04.1.ebuild
index d7ccc94ca3cb..d7ccc94ca3cb 100644
--- a/kde-apps/kcharselect/kcharselect-18.04.0.ebuild
+++ b/kde-apps/kcharselect/kcharselect-18.04.1.ebuild
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index dcd74bb2092b..0517d9f52233 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
 DIST kcolorchooser-17.12.3.tar.xz 16716 BLAKE2B 2f1f0f7f00104aa3264949b7c14bf304b7f679baee1bf082c4b478742ac18d04989a97b3dd473d2cfa330b86fec7ca913508e4625c64939a12a83be15bfccdbd SHA512 0016433e5f445842e606ae8f258908cd9911b14867695c1aab4d6ba9c2aae2b3255db4442c108a2561cc32b072085a532ebd6ab94a2ac3af70f382e27d4c451c
-DIST kcolorchooser-18.04.0.tar.xz 16732 BLAKE2B 3bd9701b96bcc5998a859c080c290216728e6917940a433caf44a339590a183b9abfcea861e0ddf113766807f8a961b73dc737380e6130cb0c3945ce5befc7dc SHA512 af925dcd81f949d5d28705aa1302531483fa46253e0f5f3546a2ad17ed18c66bad7abe671b8f2ce64257a845761e77dbba810725037a15b49c161c0828273fd9
+DIST kcolorchooser-18.04.1.tar.xz 16892 BLAKE2B e4648e4849191cb70580f887ec5b76f5564cd85cecd39ef9ebdb5e1936a14e4e6dcef759e8a2f28b30437194e583ec45b409a8804be20b65ab1292691ed8588a SHA512 e23fb2b4120fad07db0d3aed14e4dd2231b9766d7adb4a02ee1b111253eec9aee2079e33a1e02301a1763d58395951fe02e0a033f240fa7515de377fc672e381
 EBUILD kcolorchooser-17.12.3.ebuild 455 BLAKE2B c2b3df4178abef5b4d8d821eb5a598a0d560eb800de0142ef3372189ad9a793d5da46140b669c0f79d4bcba19c9d9ebd78fd597966d12fd80dd3b0eee30529a9 SHA512 6a489f07659676ff90dde300a299efb31711f3eed39bfef10f68a8be4b12c9c2a23a0058dac542b1bbc758bb0161238174f6dd08ef2bd821d0c1b4ed90d09231
-EBUILD kcolorchooser-18.04.0.ebuild 457 BLAKE2B 06ca4df8902e0b76632924fa9c5a26127656cac7939f9eeaea8955c6636f96a45cf3d2e71386fbe6e76d7ee394b52901298a9db5ed02c7b8553c0d63c936c22b SHA512 cd5b9c8296cf2ee12e9fa84afe8a5d65f1171410946fb435522ca8c991d8c4339ec7d34aba1c0109c952ad54dc4a889a0323d55e228c71824906d652530df1d8
+EBUILD kcolorchooser-18.04.1.ebuild 457 BLAKE2B 06ca4df8902e0b76632924fa9c5a26127656cac7939f9eeaea8955c6636f96a45cf3d2e71386fbe6e76d7ee394b52901298a9db5ed02c7b8553c0d63c936c22b SHA512 cd5b9c8296cf2ee12e9fa84afe8a5d65f1171410946fb435522ca8c991d8c4339ec7d34aba1c0109c952ad54dc4a889a0323d55e228c71824906d652530df1d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-18.04.0.ebuild b/kde-apps/kcolorchooser/kcolorchooser-18.04.1.ebuild
index fdbb64c54d27..fdbb64c54d27 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-18.04.0.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-18.04.1.ebuild
diff --git a/kde-apps/kcontacts/Manifest b/kde-apps/kcontacts/Manifest
index 1eb076308db8..a63318a42787 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1,6 +1,6 @@
 AUX kcontacts-18.04.0-unused-dep.patch 1283 BLAKE2B 20a4b624770a7a578d2e0be5a9f8db252d4ddeea5fe8521122023f13d15470b32dd1c0ae7f3e0b8ab65e0848a7f82e568a712e6af2191600bab97995307d881b SHA512 0aa1bffaf62df622975ff092df911a107aca1ec96376aad37339d5a54ed6e34bc7b0aa07b0b2be573382e2e6cd07208ffd463f0e60e13c4f8d5959dc85fe6acb
 DIST kcontacts-17.12.3.tar.xz 206708 BLAKE2B 8c948183fa389be754ee7a8d2928c64f9b854ce06c97fbbca79c784d8e7cd48cade5c2e6a95b3dfe77017f2fcc7bcaebc15c8fb759755b2402a50f4e7dd029e3 SHA512 e6f77cb685d6c163e575862608d127b524815704a4d124234f871aeb36abdbbe6efca26d17c86692094b395e7edf889f53cc70b7c72f33746483c9a04a674e21
-DIST kcontacts-18.04.0.tar.xz 206920 BLAKE2B 00da3c840b09526903cad4a9c51f70f7ea9c3ed2df4cdee64477312ff713d3002d008a2f0274f1b11b979619277b979978a6c408027d551ac86b3cb2447dc518 SHA512 2cd7ff23f18df20020760c8969725be683d04855949dc0b926c720a65c1e160f3a1085b1ba03b80ec86c7ed5575407a4c8f16f45142326de809c4bc1be5ba0e7
+DIST kcontacts-18.04.1.tar.xz 206896 BLAKE2B 0998754221210df835d526fe360a2a7964cd6dec6110b9bc287c109097d8318f2aedc7316cdcd008c1abb0bc204236962ced8bb9c9d8c0a3bfef3b6a0d642694 SHA512 559be58b5236718ed71954866812d0b5f8429ef5d65f92374f1b0ab94fb57f9ea5fb72453c6fb84e706ad653c50b89ad7b39e0a760ef6918f668b57d7c40f81c
 EBUILD kcontacts-17.12.3.ebuild 853 BLAKE2B 0301f620a23a5135f1222517ba1a30989033f116a598de17b915f17952db5a621bd64eeff73560b69f6ca951dbd11c80a5462c199336ae5e37a993006658a367 SHA512 1c8457c6e45fb5ca445f23a6b5351de168aa081a66858f717954bcd5eeee620571de1290cc7cb3da929b88e29090cbdcf1eaad83dc9f3b49037fd643e9f57f82
-EBUILD kcontacts-18.04.0.ebuild 882 BLAKE2B 1fc916a2cc2aee36bc37e621b89e6bccb6736d9a80d31638cfa6a8f3558c7954d8e31dc81528350a665fee4c7dbe67a37ddeffd4f4aa2a965913962c343c0d60 SHA512 065e9ff4b8cc8ef75162a27251bb20b326766305fa98ab5ec0d15f6f1cad0cb1b996069a04d91eb282ba41a6b9355745886bb38c81c96ddc8e4ee6b6a7a0fc07
+EBUILD kcontacts-18.04.1.ebuild 891 BLAKE2B d44ae06bb15956e7312aff7579b56e455be2ff87fc089d212be53b024bea7c07c96e33a0ff2d9a3dfbca4dcd47283740c1aa05b4cff2c3943d20614fbb41b9e4 SHA512 60989d76fdb4692875c9a5a5ff427e98d842031887abc93e0f5382ebb148322245ddb75266ddf939128586dd3655c0991e28ec2ed42771e9407d35d8573075e2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcontacts/kcontacts-18.04.0.ebuild b/kde-apps/kcontacts/kcontacts-18.04.0.ebuild
deleted file mode 100644
index 0eb69f42b2ae..000000000000
--- a/kde-apps/kcontacts/kcontacts-18.04.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Address book API based on KDE Frameworks"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: Fails test because access to /dev/dri/card0 is denied
-	sed -i \
-		-e "/ecm_add_tests/ s/picturetest\.cpp //" \
-		autotests/CMakeLists.txt || die
-}
-
-src_test() {
-	mkdir -p "${HOME}/.local/share/kf5/kcontacts" || die
-	cp "${S}/src/countrytransl.map" "${HOME}/.local/share/kf5/kcontacts/" || die
-	kde5_src_test
-}
diff --git a/kde-apps/kcontacts/kcontacts-18.04.1.ebuild b/kde-apps/kcontacts/kcontacts-18.04.1.ebuild
new file mode 100644
index 000000000000..724b2339fd3c
--- /dev/null
+++ b/kde-apps/kcontacts/kcontacts-18.04.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Address book API based on KDE Frameworks"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+PATCHES=( "${FILESDIR}/${PN}-18.04.0-unused-dep.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: Fails test because access to /dev/dri/card0 is denied
+	sed -i \
+		-e "/ecm_add_tests/ s/picturetest\.cpp //" \
+		autotests/CMakeLists.txt || die
+}
+
+src_test() {
+	mkdir -p "${HOME}/.local/share/kf5/kcontacts" || die
+	cp "${S}/src/countrytransl.map" "${HOME}/.local/share/kf5/kcontacts/" || die
+	kde5_src_test
+}
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index 161602e9eaf1..b31a51d93153 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,5 @@
 DIST kcron-17.12.3.tar.xz 1054784 BLAKE2B e9f37357c1a83f7f9fe162ec5f5e0d1289482ff83b77c0f83ff8a592944fb5c133b99709139c12324be1bb1e0b5b87f92fd306e2a1be9eb0a083240803eba9ae SHA512 edc96b2521d86fd288afb688dc7abc60b575bb5171f2ed0026fcee4f9e12966ead95a15aca55e89b672649d83433cab66b6f569e802ecfb680ace86003a36328
-DIST kcron-18.04.0.tar.xz 1054572 BLAKE2B 749b45d23f3d2191829b6aa08072e9346f9f70ff6e6b2fb7078f9919dc5af1c1c0eeac64beb88ec38952231f4723974f6d8143785fc5527d2e47a21c27dfaa0d SHA512 45f764a72f30e59e02a3053423642aa3b38eedf05231545df138c426b7bd61e1ffcd2e8da8d2180e827a9839503cab1463012039e1dc06c0868c2029aa3095aa
+DIST kcron-18.04.1.tar.xz 1056620 BLAKE2B fbb1751e282400477e12b9dc3a035fa2f174f04b8aa517947b630ed033f716af2c9a38db8d1240e76fa283cab27e99f6f3764bf08bf93742ee5161658b17a5cd SHA512 6196fca373827edac85cf7b8d1dc319371a035a178e9d13f29c04e8cca1d1454a63d4c771f5512877cec432460326ec29d0e71ddaff6f492ca24d7b0d1fac6f2
 EBUILD kcron-17.12.3.ebuild 559 BLAKE2B 08a9cc3b58768927021f06b978efc556a958dba07975d7c5d3959943ac54421530fbb171b5575dcf7aec3f058b6cbe417c2355ce6002449580a830f6745e219e SHA512 f513f09079aab240c87abb113b6406cfce839f382490e9b81e370b763ab5831e7dcaea5a7ff00071dbb45f95143daeb64274737b26bee279860d0262127fdeeb
-EBUILD kcron-18.04.0.ebuild 561 BLAKE2B 78a41d26a37cc0faa24fb78f2248dee0a1b4ece7172155e74cec967d582805c9da6e3349e533b089589ac4acf750c3e1b923a87db9fda9cffbdcadddcb7a0cee SHA512 1e34d2a8bdf8e7a509e3cbf4f636fb4c272ca615c5feabffb354547ad56f6170b54b0f72d13945bf487a4866ff2f6af5ba13a13e93000bbe9e7dc65880a5d81f
+EBUILD kcron-18.04.1.ebuild 561 BLAKE2B 78a41d26a37cc0faa24fb78f2248dee0a1b4ece7172155e74cec967d582805c9da6e3349e533b089589ac4acf750c3e1b923a87db9fda9cffbdcadddcb7a0cee SHA512 1e34d2a8bdf8e7a509e3cbf4f636fb4c272ca615c5feabffb354547ad56f6170b54b0f72d13945bf487a4866ff2f6af5ba13a13e93000bbe9e7dc65880a5d81f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-18.04.0.ebuild b/kde-apps/kcron/kcron-18.04.1.ebuild
index eb1f317ce6db..eb1f317ce6db 100644
--- a/kde-apps/kcron/kcron-18.04.0.ebuild
+++ b/kde-apps/kcron/kcron-18.04.1.ebuild
diff --git a/kde-apps/kdav/Manifest b/kde-apps/kdav/Manifest
index ee8b133caca6..c5698a558efc 100644
--- a/kde-apps/kdav/Manifest
+++ b/kde-apps/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-17.12.3.tar.xz 37796 BLAKE2B 3f335f82fd6793d32647d2ab124b349166a7f80aea54d421e57b77f9b68123cde72ed2b8694e4c990303c9e57f73d1fa0a9f367ca2546be267aceec524b4d8e4 SHA512 ae4c28406d9a1cd6e8816ecd693cce1f33c92de8532b29ded33355c417837380bee784608f5784c61d54e77d3bc90e6efcbec9372f64f02131848ee40daba9b6
-DIST kdav-18.04.0.tar.xz 48760 BLAKE2B 727fe3a7efe5edd639b1dc7a47b348d09ec82ceff487abc21de47ce4033fd40d0ce7e8aa5fd9b344b7f23f3f6f8fb2e4e889016a693a6220644deaf32ee9d25e SHA512 fbafc995fc629023484574b0e7bea749b76632364297fc53dd085565a647f54e5a439d62c7756df44075767cc6d91614fd03f5e21ed1d94a4ac43bcda1b9cbdc
+DIST kdav-18.04.1.tar.xz 49012 BLAKE2B aff7f74c4af08da985176a8be6a4e229f3035774def6295124d5303e37eef6fff40fff232edfd22bfd5e45bb02b3c0ad5b84e1fdf7b1018e22827910867c2dee SHA512 29ba9079c849118ec2a4a31957a8b98df9660d08e1fdb1e11acf15fd2ee5ac021b50d7238460a3e9036ef8c32d12613a12f9b3641313593a130dbd782f10e2d4
 EBUILD kdav-17.12.3.ebuild 603 BLAKE2B 291e20fc681eabedad8230ea30a292afc79f15e396aa091b3d513712d1ed33e5c8a46294d8d5e2e5b8b5f72502f417bdab5505301830f57026d9bd8425510b18 SHA512 35fdcbe12541c640d42761ef9f4e13058dd99d1de94e4a52acc2194c87c909c60641b7e21ed7e331360bf86070a4b1cde8de41b9e6b02c7756a971ab0b8579be
-EBUILD kdav-18.04.0.ebuild 605 BLAKE2B 8bdcdf35534f2e0aacbbe4f73e502c54ff995a43c7888636386e519c049e6e9be7b1f07448e99efbb6a30296b7e06b1351c7b2e8d33068246bf3bdca8b6dcf12 SHA512 d3a37e5c4b1dd98412f1b713a408400cc2b697de00cc82b15afc25e2a432b9b2620f61d2067f64f5fddf8af2c1083ca777c4c2d5950bdf752dbcd0ce72404168
+EBUILD kdav-18.04.1.ebuild 605 BLAKE2B 8bdcdf35534f2e0aacbbe4f73e502c54ff995a43c7888636386e519c049e6e9be7b1f07448e99efbb6a30296b7e06b1351c7b2e8d33068246bf3bdca8b6dcf12 SHA512 d3a37e5c4b1dd98412f1b713a408400cc2b697de00cc82b15afc25e2a432b9b2620f61d2067f64f5fddf8af2c1083ca777c4c2d5950bdf752dbcd0ce72404168
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdav/kdav-18.04.0.ebuild b/kde-apps/kdav/kdav-18.04.1.ebuild
index 4c5706c9bda2..4c5706c9bda2 100644
--- a/kde-apps/kdav/kdav-18.04.0.ebuild
+++ b/kde-apps/kdav/kdav-18.04.1.ebuild
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index f1270ef0b947..67fb97183003 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-apps-meta-17.12.3.ebuild 712 BLAKE2B eb22f68f34234dac478d2c68faf184e3d15c1628a2375e8f0195f390559d76372e2af8f71e11bc706ba32232444ddbf71f7dff07a5feb4d80a99a143ba0b41a6 SHA512 68230fba9f71b944ae1f6f5751c56b7d86e9be217a7cff4dc0e35d2f7190d6ead515322f0f4643441f6b46cc3ef06e588869bfe61ea93db7e7a6b8d83a2b1c20
-EBUILD kde-apps-meta-18.04.0.ebuild 714 BLAKE2B 32ffba5e5a2cade7fae5a2ee06ca245f813350412e257eea8517729c06acc1404f4fd50bec458fb5422c352d82e92765d7bf9752b86731f47b82f358cbc5963e SHA512 4840e2c4ac65f5b9688d6dccf69982716c01622179bad74db168bb9f8146efd2e7ba5729d14c7a360744d944394086fdb59315fd6074ae418b6fb530021b546b
+EBUILD kde-apps-meta-18.04.1.ebuild 714 BLAKE2B 32ffba5e5a2cade7fae5a2ee06ca245f813350412e257eea8517729c06acc1404f4fd50bec458fb5422c352d82e92765d7bf9752b86731f47b82f358cbc5963e SHA512 4840e2c4ac65f5b9688d6dccf69982716c01622179bad74db168bb9f8146efd2e7ba5729d14c7a360744d944394086fdb59315fd6074ae418b6fb530021b546b
 MISC metadata.xml 379 BLAKE2B 7144d7c2d05ea49b428bf76314c83a1150296ea19006204241298a707ae28fe67a6feb328f0516cc34859bc1af61df6cda3074d58f96d61be1ef1c21892468b4 SHA512 9dd851fa81ee09c64dff5019b7fe60ff945159b14cf92af707df486969d72a0896b2116c4b203afccf056ff4b2e9704d29022ed0b5d8fb60f65c1cf6d6935ed9
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-18.04.0.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-18.04.1.ebuild
index e528dfd0deda..e528dfd0deda 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-18.04.0.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-18.04.1.ebuild
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 0d35473d4aad..9893c3de65cd 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-scripts-17.12.3.tar.xz 375796 BLAKE2B 243211c87fe27f298a49107ef48390d30b80bbf904bbeb1a8eb629453f301069e98ca1401a1bc178fc1df98c0ffacf85d253b86077fdeb1ae2c796f1b972c1b0 SHA512 eb55b5016dd4cd50ba8b062496f4f21a8704e48e277c467ef9f9b2e6056afbb6f71e75c9edff84f6e50b0e25b87bcc97f13646cfd6eec892363362d402ee70cb
-DIST kde-dev-scripts-18.04.0.tar.xz 377364 BLAKE2B a150f207ea98e290c403f37e3e54a335d16f2f52269fe6100e41b7be9546c51bdec268cf90da0179a52582bb7243d0f8dd19dc883b277cd7790d34dc0d45b50c SHA512 9b2177e21f166306bfa99fdfdd260cc1dcfc912fc75a602c345ede5700427d608bcad3f207f4ce4bb1ccbda5aede4987c173728db1e030c9d57eede46f69dce7
+DIST kde-dev-scripts-18.04.1.tar.xz 377620 BLAKE2B 6b3827f3e033e1c6fcb4c8aca61517056ddeae8ef3e2a760c03364e657e3abfe63f3f86cfd6a2c1664f8f56ec2694a16625794ced1dcefb1b47235e1733b1426 SHA512 e66ea083ebf54c3b7f89212647236819ee476dfe6e003f23fa98d2d7889a38976c84e2bd24da6ab2e05c5f425fa777b68ec184324ce09fe27e772ef249496698
 EBUILD kde-dev-scripts-17.12.3.ebuild 578 BLAKE2B 9449129c76d4f80488dfebf4536e575c1b29770ab5605ad2f271a0798eed4749f3f773754d881ea4c5234a53eb9f0d5c373696d8b30c2d7a92bcef70c6bcefed SHA512 a7caeff730912bb7805c61987203e5f2fae1b7c994a16271d9bcad01ae741b3579d092309c6a25e334c1801a16711cf4b9e0cf24f40d6039e6e2522e6c39d836
-EBUILD kde-dev-scripts-18.04.0.ebuild 580 BLAKE2B 368809e818a99848f0a705ef0eec0939a7277e0e7a1606ca239b230fc3f629ef5b737089ceefb693a8adc931ea318f2cab4713a49a4629d90563303d4cc6ec9b SHA512 cefe74b979f7a9d9f13b9a2057a7b46a726626968f70845a818c2f7191d327915ff1e016cfb52df598e72b15ecdb48c1910b977c46981f61a135437e89a52d75
+EBUILD kde-dev-scripts-18.04.1.ebuild 580 BLAKE2B 368809e818a99848f0a705ef0eec0939a7277e0e7a1606ca239b230fc3f629ef5b737089ceefb693a8adc931ea318f2cab4713a49a4629d90563303d4cc6ec9b SHA512 cefe74b979f7a9d9f13b9a2057a7b46a726626968f70845a818c2f7191d327915ff1e016cfb52df598e72b15ecdb48c1910b977c46981f61a135437e89a52d75
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.0.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.1.ebuild
index 8f878b4fe584..8f878b4fe584 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.0.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.1.ebuild
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index bfb76583474b..ce03eed4e2d6 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-utils-17.12.3.tar.xz 61000 BLAKE2B 5bdb7ddfaa792d4a74cc3d55e4c1e110c69af3393421ecbef5871a095097645be566137c2b609ec33c6d13a777e62b388d06f417859af390bfd20e33e406c0c7 SHA512 8f774d33f74eec543772db7a39b18a6a52b4fbade62d5ddad9f632c1719aca58a3a77ceb50bc4f4a96df047c3726c1f37e6e9d21b496cb6a2c082334082ae359
-DIST kde-dev-utils-18.04.0.tar.xz 61000 BLAKE2B 8d558e9ccdacf1ba213aa0e6c80d216e513f5b114a0d79130c2bc5e1c2cdbc8fb2d06073336107304af6a5b9f9d02d818644f78c668af031e4b1e9cb3ade8552 SHA512 796e60fcb1f5c8a7339ec5ea0e134a97544c5e75992584c4324956712c754fc710171bfd75d1a93e7c832194091e2de24140aea5abf2b7f6ded13ca0cdd696d7
+DIST kde-dev-utils-18.04.1.tar.xz 61240 BLAKE2B eb183d61314c1ae68e83aef3b92df27e537439c64d5d1e441b249048a4cde07f6e28620536de31c287c62caab12f4df6655d6909729a9055dc49e85355a50cbc SHA512 0b3ed98c816f170552c3701d2f78943c68c7262189fd05b762f3e48798a6ef69326e5b219823627b4f14d68dcedf086cd53a5457343cb65498a2c2adb2898d7a
 EBUILD kde-dev-utils-17.12.3.ebuild 646 BLAKE2B f04cd447cd1c22b3542dded1e6beae7bdb7f49e60a9fdc27432ebc880cbe35bd69e65a2d9f252bd865597f573c5c24a4217fedf06fcec07b35315ca0184e03b6 SHA512 4e9066a4830a64b89eedce000fc0addc64ff5a832cb0060f5e02218e21d8bfc6e7197f59561c3f28ad9dba8f9fc91b9aec202922cd5821e1c4bd793bbc31d1aa
-EBUILD kde-dev-utils-18.04.0.ebuild 648 BLAKE2B 19217c351ecc0af8fa5caa88cdd12ca5ab246208a3b9a62d6fd414ada8b526da1fe805722096f977ccad904650a88cbe1dd04c0aeb5d8097d0d5c83dfc9f78dd SHA512 855dfc8e3a1cff2a81a73c1e4dc2d346870d1324c16fae618ab05c3b4d9ca1834b2c5cda2498aab16a74bb07d8494fbed2f20445702944abbc1094f50bb3a29b
+EBUILD kde-dev-utils-18.04.1.ebuild 648 BLAKE2B 19217c351ecc0af8fa5caa88cdd12ca5ab246208a3b9a62d6fd414ada8b526da1fe805722096f977ccad904650a88cbe1dd04c0aeb5d8097d0d5c83dfc9f78dd SHA512 855dfc8e3a1cff2a81a73c1e4dc2d346870d1324c16fae618ab05c3b4d9ca1834b2c5cda2498aab16a74bb07d8494fbed2f20445702944abbc1094f50bb3a29b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-18.04.0.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-18.04.1.ebuild
index fd428260d4a6..fd428260d4a6 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-18.04.0.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-18.04.1.ebuild
diff --git a/kde-apps/kde-meta/Manifest b/kde-apps/kde-meta/Manifest
index 7dffc4dd5ee9..a0f113cfb1a7 100644
--- a/kde-apps/kde-meta/Manifest
+++ b/kde-apps/kde-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-meta-17.12.3.ebuild 323 BLAKE2B 50ad12fb1fa077e45f7d87d15d01ab510e6d41ee4d7686830906784c17fc9b742f75d591f37b6e9271b9de3b79b6d463d1837c0ffb059a1b5612997be88e1e55 SHA512 af6bd77fdcabbe77fd664a4da5cde15c790b1b3459dd04aa747b612f12a6953d2030a9c8a0143f3699d1a029b1b463c54be0b61c5b9268a5735dd3a6ce35e885
-EBUILD kde-meta-18.04.0.ebuild 325 BLAKE2B 7346e974fbc6478b6f5a4d315f22b039c298240fd295d8e2c3bc0dc8ef2588f4f33ebf7297a1dabdb6e13fb827d9c1492bcd92dfe33e801a32f6e20e383c1a53 SHA512 63388dfb92585daa39acb4edd10c0770ede4c944680b18d16b69a4bb0c3ad5faee718f232289ac517da14676780920ebc1a04cd2c3ea443dc4a1a4b6c62ad285
+EBUILD kde-meta-18.04.1.ebuild 325 BLAKE2B 7346e974fbc6478b6f5a4d315f22b039c298240fd295d8e2c3bc0dc8ef2588f4f33ebf7297a1dabdb6e13fb827d9c1492bcd92dfe33e801a32f6e20e383c1a53 SHA512 63388dfb92585daa39acb4edd10c0770ede4c944680b18d16b69a4bb0c3ad5faee718f232289ac517da14676780920ebc1a04cd2c3ea443dc4a1a4b6c62ad285
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-meta/kde-meta-18.04.0.ebuild b/kde-apps/kde-meta/kde-meta-18.04.1.ebuild
index e986cfd70609..e986cfd70609 100644
--- a/kde-apps/kde-meta/kde-meta-18.04.0.ebuild
+++ b/kde-apps/kde-meta/kde-meta-18.04.1.ebuild
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index e04f9463543c..a5660b615a81 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeaccessibility-meta-17.12.3.ebuild 356 BLAKE2B 670b57674d38cd325e3116e6cfb1634827f67526a7a7d43045a4477db227199dff1d21740b19a386a295bdefada351b1320ee969a9ead23bf7431a25f7c6ee9d SHA512 8813797ed8f108a321eddc24c98f2e73834c1aedb4cdfd826b0fc30e66edcb5f55b468b840448be613669777d7223333d22c34d755b44ae31d4a5096099922a4
-EBUILD kdeaccessibility-meta-18.04.0.ebuild 358 BLAKE2B 3985014c80cb5c3bc775e122a8432bb1d2794d837d90178d49123fb6df37fb955f862956be9c41844e163344a317d2d0af46725e0cf5ef67f03daf84b14244ec SHA512 6440329116502f8f4e04a34737579fe3ba91a9fc9fdc8dc45ee37bbab585ba0086876cdde4a326c323ec8b5a791fe6a045bdb349d210d79289507bc6d84b016c
+EBUILD kdeaccessibility-meta-18.04.1.ebuild 358 BLAKE2B 3985014c80cb5c3bc775e122a8432bb1d2794d837d90178d49123fb6df37fb955f862956be9c41844e163344a317d2d0af46725e0cf5ef67f03daf84b14244ec SHA512 6440329116502f8f4e04a34737579fe3ba91a9fc9fdc8dc45ee37bbab585ba0086876cdde4a326c323ec8b5a791fe6a045bdb349d210d79289507bc6d84b016c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.0.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.1.ebuild
index f9f04c8582be..f9f04c8582be 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.0.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.1.ebuild
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index 20c333563fae..6aad9dc03142 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeadmin-meta-17.12.3.ebuild 346 BLAKE2B e02288f4f94c2cfcefad4805143e8256ef440d6227a1e77ed4b338fd11c35b194932e416b9539103fe55ac60408d4fc5bfad953a7bbc550f47877a313f6c562d SHA512 89332ce2348e6105ea23a41ad6299cd91eef4d232add22e98e8bbbfc29c7f28be81e90e56fd14a9f10872fd21a72984eb9ecfd273c663a07f2d36f19bda76aeb
-EBUILD kdeadmin-meta-18.04.0.ebuild 348 BLAKE2B 219e53eaea47534f1da3284a67db0b3b3276d66f17a503e2f63fea13a4488549c0e87d8edf2ac54ee0fe210db5b6f66c3cd1b77695848e674b8707a407d09eea SHA512 2b0e1bb6625ea97eb83d074ffdd7d824a45a3fb8cf5b629447122cf7bc4b3d9e2bf99b56095c75a7df1313588007cf8e273785096efa5f6914b0d2742293cf0e
+EBUILD kdeadmin-meta-18.04.1.ebuild 348 BLAKE2B 219e53eaea47534f1da3284a67db0b3b3276d66f17a503e2f63fea13a4488549c0e87d8edf2ac54ee0fe210db5b6f66c3cd1b77695848e674b8707a407d09eea SHA512 2b0e1bb6625ea97eb83d074ffdd7d824a45a3fb8cf5b629447122cf7bc4b3d9e2bf99b56095c75a7df1313588007cf8e273785096efa5f6914b0d2742293cf0e
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.0.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.1.ebuild
index d87b170fdc44..d87b170fdc44 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.0.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.1.ebuild
diff --git a/kde-apps/kdebase-meta/Manifest b/kde-apps/kdebase-meta/Manifest
index bb051d04a217..ef0b24236791 100644
--- a/kde-apps/kdebase-meta/Manifest
+++ b/kde-apps/kdebase-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdebase-meta-17.12.3.ebuild 327 BLAKE2B 279c2650f074343a4ee5c30c3fb2cf145c4e017c0127f4c7e2ffe7046169b565addbb5fc14e7538b38e96a6871d5846b24ae98d0d3cdf153b649d684fb3a30f7 SHA512 c8fbb53ffa1784e26082357b04e3ac25a0a7a93dc490bcdb4e618181a53d545fb7093877b1086933ca0a9a8e3da40f23d1c7c587e793804ef3f23fdbd1367de1
-EBUILD kdebase-meta-18.04.0.ebuild 329 BLAKE2B 304a36e03db7599e610c961bd51291db1a4540ba958c47788201a3a278bf2f3524dec8848e8af4c9d90a55f4150728af9b03d0785fec6642e57ff2f5b5252a20 SHA512 b96417b6b44a56cd3c46ee998588ad7b69ef99893435b7dfb58299c55383381c252541dd8df88ec08caf55cc9ed8878c8f953e5f5440bcb042a2380d54ac208a
+EBUILD kdebase-meta-18.04.1.ebuild 329 BLAKE2B 304a36e03db7599e610c961bd51291db1a4540ba958c47788201a3a278bf2f3524dec8848e8af4c9d90a55f4150728af9b03d0785fec6642e57ff2f5b5252a20 SHA512 b96417b6b44a56cd3c46ee998588ad7b69ef99893435b7dfb58299c55383381c252541dd8df88ec08caf55cc9ed8878c8f953e5f5440bcb042a2380d54ac208a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebase-meta/kdebase-meta-18.04.0.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.04.1.ebuild
index 37f06d26788d..37f06d26788d 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-18.04.0.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-18.04.1.ebuild
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index c69778e0272a..0b6761406fe7 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
 DIST kdebugsettings-17.12.3.tar.xz 48668 BLAKE2B 1bba5a7860b47c6cc74e249dbc5b8885ea1721ba5614dbe4246f701c0f759a13efca834298453c17e75bebb1ad9ac155a51d95742b5b428f279bf3090c9a4e89 SHA512 e0f73e18ab1d7bccdb1d4a76a546dfb638f4b0a9ef331a45478fad8e15057a9424bb47d24aee5d870181c00a917ff42ef0e99697ebd3da4319ee8c24aba9264b
-DIST kdebugsettings-18.04.0.tar.xz 51772 BLAKE2B 8b58a9bc96e57ab6d3f2f77be38c1e79799e92a0fba47770ed5f5e94ef998e1afbafb7cb5efc2f7f174d6508510f15cf33be19c3e1363cb9ec1b5dce48129fa5 SHA512 f4eadc0eae9b779127f3a7112242954f9281ab1ddde9c81b13ef97e6476f79f0e65e69403a2b8262ac03fab045ae68e9069792dc9e2da82d4a08b3494a0dc091
+DIST kdebugsettings-18.04.1.tar.xz 51776 BLAKE2B 72209ed719dc7eaf48097b344fef881534284607b7b07f7a8d48be8be85cd634e9abec21ccb757e319792c59434ab35f6f85f1de02db253d39a1778febf24441 SHA512 80661f12660d1d41b482e895e0f1008bd46d28fc270aa527c4388b8fee9429bd6a047310dfccdb6b4b1df770e24bc1bcea644fedabc4cf3d5f4f86a5e3cad5eb
 EBUILD kdebugsettings-17.12.3.ebuild 595 BLAKE2B 23e604f648131c3c51d620b8133a1494c1466ff0883ce2037b10fdf402f819e2a7f0b0ee236fb2cd0fdfafb47fe9e6f6bc6eb4d96004d4e7eb63a7fad3ef7d04 SHA512 7facddf48cd39adc8910819bac603a5f2ff784a110364affef27c3c0b8944c36ca2ebea2b89de6a96e7736dd494eaf6a3bea9bba43aa0de063d04547ae8e39f0
-EBUILD kdebugsettings-18.04.0.ebuild 597 BLAKE2B 7979b21e081fbc1dbc93f1108c882910f664af089d6190ef64caed247becf80201fa9190e312557a394fa5f75d8bae8d0187ae6c2ca365870476037291de37e1 SHA512 a3a45ae47890268b8249159f501cecec3df5b6764123cd48ecf90d3fcdad9a5f8f62482f5cb5bb8fdad41550bfded040ec829fe710aad5afea3f618e74adfabc
+EBUILD kdebugsettings-18.04.1.ebuild 597 BLAKE2B 7979b21e081fbc1dbc93f1108c882910f664af089d6190ef64caed247becf80201fa9190e312557a394fa5f75d8bae8d0187ae6c2ca365870476037291de37e1 SHA512 a3a45ae47890268b8249159f501cecec3df5b6764123cd48ecf90d3fcdad9a5f8f62482f5cb5bb8fdad41550bfded040ec829fe710aad5afea3f618e74adfabc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-18.04.0.ebuild b/kde-apps/kdebugsettings/kdebugsettings-18.04.1.ebuild
index e53b5a97cb69..e53b5a97cb69 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-18.04.0.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-18.04.1.ebuild
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index a079617d3d08..7c4c73f6b30a 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdecore-meta-17.12.3.ebuild 564 BLAKE2B ab892f36312833261e1e698df5d0b79a04f340189169b59d93fcbe9c00f8fe6a50c80af09260675600080669a8c2c444307a946ae934914f8140fd429ad242d5 SHA512 e0a096c7a226d6ebec34759d4cba1b06531be6fdc553bf90fdeacda8f30dd2570fcc0bc112a7acd6c877a7e3a3c44406d1050cb985948ca5ceaaf96af8acdba3
-EBUILD kdecore-meta-18.04.0.ebuild 566 BLAKE2B d4c22b797a56d8d943c71a2d97406c4137d78fae5db9f2f63431e5d59c4f0d532728019a6d7020bc92f49d734d2b92d8b54b186151363e710182cbccd65d0bf3 SHA512 a121188f56bf8fc3ad7c440e3c648b4fbad3c36e5322eb4911ab05bdae1eba0858989a103b2b5891d76a8c236ad353662ac60aa40e4bad71b033d75fb69a3c1b
+EBUILD kdecore-meta-18.04.1.ebuild 566 BLAKE2B d4c22b797a56d8d943c71a2d97406c4137d78fae5db9f2f63431e5d59c4f0d532728019a6d7020bc92f49d734d2b92d8b54b186151363e710182cbccd65d0bf3 SHA512 a121188f56bf8fc3ad7c440e3c648b4fbad3c36e5322eb4911ab05bdae1eba0858989a103b2b5891d76a8c236ad353662ac60aa40e4bad71b033d75fb69a3c1b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.04.0.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.04.1.ebuild
index 10c9f670dda2..10c9f670dda2 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-18.04.0.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-18.04.1.ebuild
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 40cfd4c7b6ad..26c0df78abd9 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
 DIST kdeedu-data-17.12.3.tar.xz 327652 BLAKE2B 554de77a50fd6ac954dcdb6081f3ab9631c819150994389977142095defc3f7c802d8a94d8fcf0a2e07df60663d49ae27b75a4420d3ea35013a8c6ddf62ab6e4 SHA512 4f6dc1ed4407bc1447d5a4c66e0ee6e1b2eff69545a46ff365f69ac1e93add84e6415e3e397210112f9850556b52d82ac826dacba501713c4495f1b3669b15de
-DIST kdeedu-data-18.04.0.tar.xz 327636 BLAKE2B d75a1d038cb54f06d06e60e897dbd3548b7343a4b99d5026e8fdfdf20d96aeaf72286486df79e6af3db6579db0c754564b0eed9b7615131a82f9bb96f12720b0 SHA512 6f183123ebccd9d722bc2b2a2ad5067c9b2ce8b089a4c2e59a8673514cf368fe0489c4e94e3906fdee6ad174895880b9f9def18de334a69bdaab88df38010ece
+DIST kdeedu-data-18.04.1.tar.xz 327888 BLAKE2B 6c920a0938057acb1c2824652e2f17d40ef2d731a92993b12e3e6c7453b96731b88a774757839af773537de21a5d1169edd1dda55fa8c29eb22676884f576bc9 SHA512 427ad94b6527dc9b75c446591b8356ad20907ae5595665586af6c8eac889a368ecc11da8357883217d2c3fe634dbb479252ec6c0c0845d9e019dbe7811e3de57
 EBUILD kdeedu-data-17.12.3.ebuild 410 BLAKE2B eaa18f5506043dd8df271fed9fbb0745270caf4ab9ca37dddaea6bfd86febe3145e9eda889a1869c0dbb25c276262c81bf4f2f4a7da457a14cc78af7bbda98e7 SHA512 8f1472dc7549a96e75b1d2de05bc4c72c9b908c41c8a7a7fb5decf85b62366914551db39eac1414c2e18c69f134f8067ff086e2d00f47138c2b19877e3656f09
-EBUILD kdeedu-data-18.04.0.ebuild 412 BLAKE2B e3fb9aa2e25a9e485228fc3732618b52bdad72b4929c66c39128f4b3891d30760c95811744dba4fd2656d338201a9a5521e41a222607583fd14112786cad1f18 SHA512 8ab82ea007618d9ace59963319bdcf2cd58ac0e4be9bbbe6027348b357b032ad94f311051e73674931ff27f2f295c9d9b198d2aca6520c0089269c404a0a81b1
+EBUILD kdeedu-data-18.04.1.ebuild 412 BLAKE2B e3fb9aa2e25a9e485228fc3732618b52bdad72b4929c66c39128f4b3891d30760c95811744dba4fd2656d338201a9a5521e41a222607583fd14112786cad1f18 SHA512 8ab82ea007618d9ace59963319bdcf2cd58ac0e4be9bbbe6027348b357b032ad94f311051e73674931ff27f2f295c9d9b198d2aca6520c0089269c404a0a81b1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-18.04.0.ebuild b/kde-apps/kdeedu-data/kdeedu-data-18.04.1.ebuild
index 0209c5857d99..0209c5857d99 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-18.04.0.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-18.04.1.ebuild
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index 092d7913ed2a..a5942ea2bcc1 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeedu-meta-17.12.3.ebuild 1015 BLAKE2B 95de6c64a19be1476baf5ed5b1d1aecbb352eadb71cad7403c624d41c7567d322f2c57da37c9ef69f62746078c147b40911e811524b9b189c350ce18e7711e7f SHA512 112f1316947e28da8c52a36a031e2774ca24896b475e39d06bd200047b697521ab6f4a032ee8cdba07687916474c96b843dcaa3146e41303f3b98f20bb8c6155
-EBUILD kdeedu-meta-18.04.0.ebuild 1017 BLAKE2B cb41e7b402027cd2fd455167d215535339a430f8ebf28bebd5f3461cd4260d91d7da9469e1b92af9d725cfd6a6699d8b7cdad7bd91cb0e8072c2ca1a82afef7b SHA512 505e04b53185a81498d8c1de9c8b259922e74fd04955f8c3cd21f2bcd7ceeaed1fba1c42c53287023f69c2bcb1438f51fcea7c5987ced440d40eb7ac818554d1
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD kdeedu-meta-18.04.1.ebuild 1046 BLAKE2B e34a041df367563cb5062901806730bd2e24549810a9c4713e24ffc5f67f66670291f209679384e847e55282a53e30584d05b4fe27abbe61feb238ba8b8c4831 SHA512 e66fc5641a1a77ce3943edcc95e30c640a067354c43091cea852ff30cd0ab6306e0e07419b86e0c3a1da4fdca97d03605deee58043a14fce22e52388cc871b8a
+MISC metadata.xml 403 BLAKE2B 0cd42ab85cbd256e6080ce92fd939e8138a9639832c2f0a87ce4fec0364ead3a180d344c16672a2631dd294cbb7f50f9d748a6a3d0585c6a834bffb05469792c SHA512 50f9c120fc6e8705b2b40f21a3e119a1a52fdb1bafcaed645f41bd13311cac342f4ccff3090a9fa3ba031904871954f81ef3301c73a58e0688d071ddba5d0152
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.04.0.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.04.0.ebuild
deleted file mode 100644
index 5dea5c430d3d..000000000000
--- a/kde-apps/kdeedu-meta/kdeedu-meta-18.04.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
-HOMEPAGE="https://edu.kde.org"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep analitza)
-	$(add_kdeapps_dep artikulate)
-	$(add_kdeapps_dep blinken)
-	$(add_kdeapps_dep cantor)
-	$(add_kdeapps_dep kalgebra)
-	$(add_kdeapps_dep kalzium)
-	$(add_kdeapps_dep kanagram)
-	$(add_kdeapps_dep kbruch)
-	$(add_kdeapps_dep kdeedu-data)
-	$(add_kdeapps_dep kgeography)
-	$(add_kdeapps_dep khangman)
-	$(add_kdeapps_dep kig)
-	$(add_kdeapps_dep kiten)
-	$(add_kdeapps_dep klettres)
-	$(add_kdeapps_dep kmplot)
-	$(add_kdeapps_dep kqtquickcharts)
-	$(add_kdeapps_dep ktouch)
-	$(add_kdeapps_dep kturtle)
-	$(add_kdeapps_dep kwordquiz)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_kdeapps_dep marble)
-	$(add_kdeapps_dep minuet)
-	$(add_kdeapps_dep parley)
-	$(add_kdeapps_dep rocs)
-	$(add_kdeapps_dep step)
-"
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.04.1.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.04.1.ebuild
new file mode 100644
index 000000000000..8c2071918f47
--- /dev/null
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-18.04.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
+HOMEPAGE="https://edu.kde.org"
+KEYWORDS="~amd64 ~x86"
+IUSE="+webengine"
+
+RDEPEND="
+	$(add_kdeapps_dep analitza)
+	$(add_kdeapps_dep artikulate)
+	$(add_kdeapps_dep blinken)
+	$(add_kdeapps_dep cantor)
+	$(add_kdeapps_dep kalzium)
+	$(add_kdeapps_dep kanagram)
+	$(add_kdeapps_dep kbruch)
+	$(add_kdeapps_dep kdeedu-data)
+	$(add_kdeapps_dep kgeography)
+	$(add_kdeapps_dep khangman)
+	$(add_kdeapps_dep kig)
+	$(add_kdeapps_dep kiten)
+	$(add_kdeapps_dep klettres)
+	$(add_kdeapps_dep kmplot)
+	$(add_kdeapps_dep kqtquickcharts)
+	$(add_kdeapps_dep ktouch)
+	$(add_kdeapps_dep kturtle)
+	$(add_kdeapps_dep kwordquiz)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_kdeapps_dep marble)
+	$(add_kdeapps_dep minuet)
+	$(add_kdeapps_dep rocs)
+	$(add_kdeapps_dep step)
+	webengine? (
+		$(add_kdeapps_dep kalgebra)
+		$(add_kdeapps_dep parley)
+	)
+"
diff --git a/kde-apps/kdeedu-meta/metadata.xml b/kde-apps/kdeedu-meta/metadata.xml
index 2fdbf33d963d..fca8547c4132 100644
--- a/kde-apps/kdeedu-meta/metadata.xml
+++ b/kde-apps/kdeedu-meta/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="webengine">Enable <pkg>kde-apps/kalzium</pkg> and <pkg>kde-apps/parley</pkg>, requiring <pkg>dev-qt/qtwebengine</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index 9caa401f2c80..283296037971 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegames-meta-17.12.3.ebuild 1512 BLAKE2B 3a5f0d6dfb9135330701276aee09b4e5400ffadc4cb6879f1df0934a6c0553ebb52b86850825bf055b212a08de4b66640dfb9970cbfebefbf497c0962d754fde SHA512 dc97ada20d5b222a9bb252ad15e1c6c771a5bd20655b4a7874ca92d7e263db7eced138eedac778992c7bee28f2000dafbbbd3d8cf8b5facaee35b4d61b36d81d
-EBUILD kdegames-meta-18.04.0.ebuild 1514 BLAKE2B b5f13b6b671b8483ded53326d23b88a51c2e978703850dad408c3b4be3d3fc8b31ff5bf5245096f11b64d2800575a8a2aa332853bc8c5a1f2d4a21a908e7ecba SHA512 2ffcb6c7d05731b990f2c1206b45470c03dd7306e8598725fc4c56602f53a5a13c5a5eacebe5fc4595433e94610cbdbd6c22ba1b103cc0ecb2e0d727ac5d54f5
+EBUILD kdegames-meta-18.04.1.ebuild 1514 BLAKE2B b5f13b6b671b8483ded53326d23b88a51c2e978703850dad408c3b4be3d3fc8b31ff5bf5245096f11b64d2800575a8a2aa332853bc8c5a1f2d4a21a908e7ecba SHA512 2ffcb6c7d05731b990f2c1206b45470c03dd7306e8598725fc4c56602f53a5a13c5a5eacebe5fc4595433e94610cbdbd6c22ba1b103cc0ecb2e0d727ac5d54f5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-18.04.0.ebuild b/kde-apps/kdegames-meta/kdegames-meta-18.04.1.ebuild
index 85eb713ba0f4..85eb713ba0f4 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-18.04.0.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-18.04.1.ebuild
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index 1f0ddd54a3a5..ab18f0c9d93f 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegraphics-meta-17.12.3.ebuild 765 BLAKE2B a5a9d2bd8dec75e23280998d581e2359a827ab2b387ab6f2958e1839e62d7c2cf49763099824748b69cc27a894ff349892abcbf492be0d9d4629992bce3b0c9c SHA512 76ff544e418bf64e34d1ecf2034d13ff6ef37c0f107bd92d24d52b85208bef19bfff1c83f90aab64da143845a7438e0223ba52d8eebd1422e55286476f19a2d2
-EBUILD kdegraphics-meta-18.04.0.ebuild 767 BLAKE2B 9164daff434ae0899b3062ddb99474410f11b27ffadecdc0e7b284092f9815ea0fa7a50b114fbcb2e531aa759ccccbeabbc4a4ccc236c00658cf5fa35c1203f1 SHA512 306603582c97ba1add3cba677bc33c58a6e3ba6988f5769c36b63b059f3b3beb98d0267b5e117ddf133d7033900119938300d102858a0478bb9c95def3d0689b
+EBUILD kdegraphics-meta-18.04.1.ebuild 767 BLAKE2B 9164daff434ae0899b3062ddb99474410f11b27ffadecdc0e7b284092f9815ea0fa7a50b114fbcb2e531aa759ccccbeabbc4a4ccc236c00658cf5fa35c1203f1 SHA512 306603582c97ba1add3cba677bc33c58a6e3ba6988f5769c36b63b059f3b3beb98d0267b5e117ddf133d7033900119938300d102858a0478bb9c95def3d0689b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.0.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.1.ebuild
index bff71a679d37..bff71a679d37 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.0.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.1.ebuild
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 09da789e15ea..46f02a34caf8 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-mobipocket-17.12.3.tar.xz 13436 BLAKE2B ba45e959dd1f2c807210ac215cad3bfb0270d7bdf4162e2d80560fb4c6d8f6524a2a7da9ff519a6f93a4a937d69b1d1bc8b5fc47d97c3ff900cbf63a73e22adb SHA512 89558644d89bd3c68ab1436adb49698f264c2f59c85646cfbc8dbb2c2364933e74d91d9a24bf266b8ecf2e8852786d21615be1a83d7807e3abf6cd9cef213243
-DIST kdegraphics-mobipocket-18.04.0.tar.xz 13440 BLAKE2B 552f1877851dab80d1c90c83e6c66ae8d036db100ee433912d3063022eef6681079ffec01a4349bbf140bee18de504acf656c0f0b76324c4511951a401b2130d SHA512 cdd486499d28efcd09b3dd27c4d2a811b453f8a737223ef34f7bf33f48eda7afd8eb7856f05938440bbb5700a42da4bd62f43f6bb80877e4006f62a18c045fb8
+DIST kdegraphics-mobipocket-18.04.1.tar.xz 13476 BLAKE2B 2810f029dd4f1d765b1d59825e8678701438c1a5f424bf198b6677508a8bb6e5f229816051b3f04e7d79313ef95f2dad70081fb773c0f07b47b21216ac98cbad SHA512 8010969f847b33b4b7fe846f5292c1f767479894f7d837f0350f26ed9d035deb026e29cdc927d03e62f8c475f30c09ae24512b724d9fc2476ebde922677c56c1
 EBUILD kdegraphics-mobipocket-17.12.3.ebuild 422 BLAKE2B 6815ff8abcd82d201ccaebe992d7df276ac95c4c2474fb04478bf73092158c0b532157f85275842fd9b5400fd9f10bcbcc32e1c9b9fed2e37613dc453d31bde0 SHA512 b0653f84cf4b6e9a5b5c517268e728f84610939dcd17f5d6ed52f33140aea2e3030394b6584b4437cea46b27019e10f1792a6c35c6eec0641959fb5e4fa1d4c5
-EBUILD kdegraphics-mobipocket-18.04.0.ebuild 424 BLAKE2B 410d921f6cd5cea5db6e26634bb6a07d04c757e4f2497129722b1d4fa910189622fa90d4559aeee5e24bc097d77dc84401a9a307219b66937dd223f684ca67fb SHA512 5b3be652468b0003802063c8f6fe0da42d41dfc4fee9d0fb21ac0d39e346bff441e38b3cfb24b398d58c830fdf5fa6cc9d9aece1bae53cad4c6951316c33d600
+EBUILD kdegraphics-mobipocket-18.04.1.ebuild 424 BLAKE2B 410d921f6cd5cea5db6e26634bb6a07d04c757e4f2497129722b1d4fa910189622fa90d4559aeee5e24bc097d77dc84401a9a307219b66937dd223f684ca67fb SHA512 5b3be652468b0003802063c8f6fe0da42d41dfc4fee9d0fb21ac0d39e346bff441e38b3cfb24b398d58c830fdf5fa6cc9d9aece1bae53cad4c6951316c33d600
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.0.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.1.ebuild
index ec101c11b41e..ec101c11b41e 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.0.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.1.ebuild
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index 28d40de4d9cb..4d363eafbc74 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdemultimedia-meta-17.12.3.ebuild 683 BLAKE2B 9f2c1c82f6cf5ccaf7f02462d5298468d42aac913133b6b4893c6e0a3c0fdb9e84c89a711405f9605816f66c346ff1ca758e06987f4ef27cadfd512ef5f1eec8 SHA512 cc179782601d05ec6d00cac899a2d290989eccc10e4181dc277e52afc7877cae2bf37dd8cb96579921b5a6138a98b97a76f69c84c6ca1daba2a683537d5722a4
-EBUILD kdemultimedia-meta-18.04.0.ebuild 712 BLAKE2B 2c96c82a5aacc409980461637b78d849101bb2b7ea7aaf75fa7cbdb263800a04f8f9bfe53c8760f5ca7f515ec488919ce7120f79ebe6b8668aefd4ab60d94fef SHA512 fa2425d62f72efdb2d61f486e62cd8a89385278aea41166f4d83a67b32e50e31c0d03b17e318aee575d665643a1afeaa504a205edd3b481f14e499729e790baa
+EBUILD kdemultimedia-meta-18.04.1.ebuild 737 BLAKE2B 0dc7c6ad9bcaff2b6bb495b2486ca5951abd42e78cbcfe3c507280f1dc09517b3d8fb9305875a50345be0575a8c166369a97b6ae0e7c4a7ef4dc52cb213b8ccd SHA512 91cb69c63e506fd5c0de38eadcda200fe74cddb2368819c0ed86208f8c5cd4a0d0fbb646426f498f0f2838ba31e5e98a57f96db745a732b8e4f491d39dece0f5
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.0.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.0.ebuild
deleted file mode 100644
index 59d525810f19..000000000000
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="
-	https://www.kde.org/applications/multimedia/
-	https://multimedia.kde.org/
-"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cdrom +ffmpeg"
-
-RDEPEND="
-	$(add_kdeapps_dep dragon)
-	$(add_kdeapps_dep juk)
-	$(add_kdeapps_dep kamoso)
-	$(add_kdeapps_dep kdenlive)
-	$(add_kdeapps_dep kmix)
-	$(add_kdeapps_dep kwave)
-	$(add_kdeapps_dep libkcddb)
-	cdrom? (
-		$(add_kdeapps_dep audiocd-kio)
-		$(add_kdeapps_dep k3b)
-		$(add_kdeapps_dep libkcompactdisc)
-	)
-	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
-"
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.1.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.1.ebuild
new file mode 100644
index 000000000000..dfa492d4c212
--- /dev/null
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
+HOMEPAGE="
+	https://www.kde.org/applications/multimedia/
+	https://multimedia.kde.org/
+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cdrom +ffmpeg gstreamer"
+
+RDEPEND="
+	$(add_kdeapps_dep dragon)
+	$(add_kdeapps_dep juk)
+	$(add_kdeapps_dep kdenlive)
+	$(add_kdeapps_dep kmix)
+	$(add_kdeapps_dep kwave)
+	$(add_kdeapps_dep libkcddb)
+	cdrom? (
+		$(add_kdeapps_dep audiocd-kio)
+		$(add_kdeapps_dep k3b)
+		$(add_kdeapps_dep libkcompactdisc)
+	)
+	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
+	gstreamer? ( $(add_kdeapps_dep kamoso) )
+"
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index c8e78f9ff169..75bc4ecf94e9 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
 DIST kdenetwork-filesharing-17.12.3.tar.xz 323564 BLAKE2B 5d1e6b96507e983bb0d30aafc57c59517e6095546de71892e2686d13c96a980af390343a629e5f41426bfaeb010bd52739fb377356fb9854cdf783ece5f01316 SHA512 3152b7ba7eea4a8dd5f4dacfc87cdfb4236d678cf305bebeb915e3f13575d1924ef6418df1d7095ddcea83d17d614370b61738f62631e9696e41a313fcca7457
-DIST kdenetwork-filesharing-18.04.0.tar.xz 323572 BLAKE2B 33d41538248d9d6be89d3a9ff6094b42acca4b31ebe3fb6389d926528b3bfc79257d957b6e66e5c5e58fc303379f7ddfc8c3e9e1bb59ff89f91180f9cd492979 SHA512 65bd46e6e3ea6ce9f0164f134b3dd90dfd1d2550734288f557a2194b45355098011961e84ade44aab4e92c784234fa50ae2743ed02765a67372f1714ad6b2bc3
+DIST kdenetwork-filesharing-18.04.1.tar.xz 324048 BLAKE2B e9832cec3913f60987fdee636cb18f9f8a5d204341104ee493584b21aa2886dffc2742ee12ef79434cdc97fcc88bd2ea1e9b1d607d25b3d2f933ad4995fd1340 SHA512 6b96a82ec976dc7a631a46ffb49cd71befe4de6c2a6424b8aff59681006b0ca9da05658eba38e186aa1c189976d11f59de28b4ef250c9f56f5bdbf9dc3a256e5
 EBUILD kdenetwork-filesharing-17.12.3.ebuild 572 BLAKE2B 38ae6cdaeaafa1047dddc6b3c303098db6343279be551b0f72f51b2cc324afb789e6db3ce575572f7b1b793d1e432654dd44f1b9eb337064c4d569e7389459d8 SHA512 755e810f11580ce3c59b3ee8a215521ff5eb7d97bb9d69ca8f0d6a52ac9d73c7ed7c5f6d1e8f1c2ce30cb07cd8cff0f86f219b00075e58f420a1324220f5b3d2
-EBUILD kdenetwork-filesharing-18.04.0.ebuild 574 BLAKE2B 62863974d57cf0fb799937edaedb2db6df3b483e1d803a7388fb3c24348837e264018608468ec9ef379d937dcf7f7a66476a647c15da43283c0bca9a580c5c43 SHA512 0acb6b4093aa0eaf193db4578e51f94ecad8ebc79ddabe531816c0f80cc245cc74aa51e0347d1c5f33c8db5d6abe9501a0ec51b01b9aab77744e89bdaad265aa
+EBUILD kdenetwork-filesharing-18.04.1.ebuild 574 BLAKE2B 62863974d57cf0fb799937edaedb2db6df3b483e1d803a7388fb3c24348837e264018608468ec9ef379d937dcf7f7a66476a647c15da43283c0bca9a580c5c43 SHA512 0acb6b4093aa0eaf193db4578e51f94ecad8ebc79ddabe531816c0f80cc245cc74aa51e0347d1c5f33c8db5d6abe9501a0ec51b01b9aab77744e89bdaad265aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.0.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.1.ebuild
index 13f47494f491..13f47494f491 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.0.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.1.ebuild
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index b842770d2c16..46c676c8a7e4 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdenetwork-meta-17.12.3.ebuild 459 BLAKE2B 3392228fa2e577ad43cf8533792ca73de59d71e6838d72b023e2ceb7cff4ef2f673d258c886ebca4eb6d1ba023e63ba2c9fbca6ea0093dadebbda9e603f04868 SHA512 5dcf7efc7c7574854ba439c20a8af85cbd15818d807605e933c914aa89a5632b06f4ea950df32dbe830c2d865726a10235d803eaa93a7d94806b1c3bcc98dda8
-EBUILD kdenetwork-meta-18.04.0.ebuild 488 BLAKE2B 85f3f20b041962171371d359d19b78a97e1353a1ee555deb7163d0e47ba04a5d9e277aab9fcad47c6378cc0912ced440d45cdc2e4d15c53d76686d6639d1ed3e SHA512 d803e9e89f3de2481a42b505ba6b27d6527182b789a84114bee4d45af9c85a1b7ecde6deeebfadee5dba6ac55ef0a06c63f66e5240b4cf7d634e03fb3b8031a6
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD kdenetwork-meta-18.04.1.ebuild 513 BLAKE2B 6d7213059830c2624b7274aa5a7f68f6c8f68e791e3fb21dcba86fd8a30afc98b342ad7f6741d77f0013ca2d2b892a2ae8bddd8c99357d0adbf56aaf80e88a73 SHA512 b78a7765d1c786383b6c085f1c8f7397beaee2208f2f6950de2e4a861b9443f88a6045748dca1f9a41c51d78281fe1692fd9295aaa3804db0756264d5c0509c7
+MISC metadata.xml 410 BLAKE2B 8d98bd833e50db75f604cdb99878a614b28ad320b4a377b75897b7bcb6d0b95f5b2fa102661fc26474533eeda09e7cd5f8fe2131d0162f85b87c45a8aee9649f SHA512 049780b067ed1159cac1db34a6408997d614c74445b74c01d0fb3bca4beb46185b8bed2e2280f590501b44177fe13a5bf3fa090c21cfb5455b4e7a3a44ef1436
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.0.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.0.ebuild
deleted file mode 100644
index 35d715c44b10..000000000000
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep kdenetwork-filesharing)
-	$(add_kdeapps_dep kget)
-	$(add_kdeapps_dep krdc)
-	$(add_kdeapps_dep kopete)
-	$(add_kdeapps_dep krfb)
-	$(add_kdeapps_dep plasma-telepathy-meta)
-	$(add_kdeapps_dep zeroconf-ioslave)
-"
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.1.ebuild
new file mode 100644
index 000000000000..fcca5f5440b6
--- /dev/null
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.1.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-meta-pkg
+
+DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
+KEYWORDS="~amd64 ~x86"
+IUSE="+telepathy"
+
+RDEPEND="
+	$(add_kdeapps_dep kdenetwork-filesharing)
+	$(add_kdeapps_dep kget)
+	$(add_kdeapps_dep krdc)
+	$(add_kdeapps_dep kopete)
+	$(add_kdeapps_dep krfb)
+	$(add_kdeapps_dep zeroconf-ioslave)
+	telepathy? ( $(add_kdeapps_dep plasma-telepathy-meta) )
+"
diff --git a/kde-apps/kdenetwork-meta/metadata.xml b/kde-apps/kdenetwork-meta/metadata.xml
index 2fdbf33d963d..0eb226e532aa 100644
--- a/kde-apps/kdenetwork-meta/metadata.xml
+++ b/kde-apps/kdenetwork-meta/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="telepathy">Enable support for Plasma Telepathy (instant messaging) integration via <pkg>kde-apps/plasma-telepathy-meta</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 5da6cc865587..cc92708c1851 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,6 +1,5 @@
-AUX kdenlive-18.04.0-qt-5.11.patch 1473 BLAKE2B 359f9b56a1e34e9fcd8d092dfa9cf1ce5dd876c81ae64308117a514c19fe935116b424c35a1481d122eeb05856daea1c53cf9ca6c1b9de5f73e2bcd49675f27f SHA512 0ec21f86bb2298ac9f41600627bae3f972feb0bf85668201c311b82029fcb040486cd6e674eae32702252b4d575bc866b85e45992a32686093e8b84bcd94ff77
 DIST kdenlive-17.12.3.tar.xz 9383532 BLAKE2B a348cfc3622735af5c37d60f43645062a0bb077e1b10fd780d91ede4d1c6298fe1cad3ce8d6964b33e4b60ad7074ca656199209c827deb2e67da5a71cd341593 SHA512 8142229d01c4c5108bd1482f6479dd7ef7ccb56e19152a74021a47939aedd5841f9161483994f2e8078099b4e3c65a501736938b1ea3233779498f0d8cf5272d
-DIST kdenlive-18.04.0.tar.xz 9388972 BLAKE2B 8e3deb993c041be5803e29f7101a556d4867f3d763683adf1ad418fde7b2d1942f7dc45edf3eca91d0e2fcbd7011169c37ce2a68baacfb33000ddf848e960cc2 SHA512 5a3f2669eee7e850cc47950dfe9662b0185a962f3ee1a2a593e00862904b422903ccec39fe6c2837c01a4132773d24c7a17e1c13cb29e4e452e0bbb4adc03a6d
+DIST kdenlive-18.04.1.tar.xz 9391408 BLAKE2B 73a2bfe21a275d39a97876ae69b22611f9552129b67d15f3255b3f2443c0fe324dbd2388bd8aa5d2693c9053ce21051a46d54ae8505dac2940894a089871bbc9 SHA512 0e9c12359c9a17475573fa15289d89313a12def4baaf44101c51057200b1e259f91663afad16cbd8b93fc27b46bac48a6f9fd3dd7f33c10f219bfacdb552cc0d
 EBUILD kdenlive-17.12.3.ebuild 2087 BLAKE2B c8ac625eb0726f290615cf273c6b55fa64e4ddd253531be75b0fbaf8e36e8807c17588a95ca005bf7d7f289b56caa834408fcc5ea459e2de0ecc9daace50517d SHA512 23b0d0a856ded3048f40ee67ddb581c5bd385b5d2aa671b3c6cc649d7377a9c234e98c1a3cf6491e9c42d55ef9126ccd9570fffd1733a14de348132c724cf7a0
-EBUILD kdenlive-18.04.0-r1.ebuild 2163 BLAKE2B 3c71d3bfcce48815583aa1711bdffb9eaa282c24613db1859dfdf4214fde65f9e5eba7ae7960a15c7c7fcf722c26d2ff2b46027e6482be7010313b8435162cbd SHA512 6b7382cf9aa6e5f19b895641e824add714bfe12347d6575e29ae219f5e4176ed5c172398b893e4655a2b9871e09844b6cc51c3937ff14da16fd48d9de96ce71c
+EBUILD kdenlive-18.04.1.ebuild 2117 BLAKE2B c797fd67d793c1452dd7036657ce0cb83870a470da672275e3cda99f21e1f2c103f034ae02b21ba1f964f35b3746159d6436e175e56b1407066b4ad68ae975bf SHA512 30ddbb9448936f192b2852928bb86c73921b88caeaf8158f0220262e2faef5c87cacf345feeb20cf0db3ba5094da9536f2dd8ed9f071b2921278f20a38c405df
 MISC metadata.xml 531 BLAKE2B 2418fe9902d1e4253198b8ccb70ce23cee258143c0da3d99198328e02d2a1ce3ca1e327afd5beaa4ec3a41c04a5c5cd6c2b8d0943fa4b33599ddc3e9eaf59737 SHA512 f3658592c4023a1c101a2faff25018061f7514d5110794e137f72b31106021d581a5b9fbf85b460e55b541a2d11af77a074d702896cb6ab07c4e46740832fea6
diff --git a/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch b/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch
deleted file mode 100644
index 9b65000a8cb5..000000000000
--- a/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -78,7 +78,7 @@
- check_include_files(malloc.h HAVE_MALLOC_H)
- check_include_files(pthread.h HAVE_PTHREAD_H)
- 
--find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick )
-+find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick Concurrent)
- find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
- 
- find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET)
-diff --git a/renderer/CMakeLists.txt b/renderer/CMakeLists.txt
---- a/renderer/CMakeLists.txt
-+++ b/renderer/CMakeLists.txt
-@@ -9,12 +9,6 @@
- add_executable(kdenlive_render ${kdenlive_render_SRCS})
- ecm_mark_nongui_executable(kdenlive_render)
- 
--qt5_use_modules(kdenlive_render Widgets Concurrent DBus)
--
--target_link_libraries(kdenlive_render
--  ${QT_LIBRARIES}
--  ${Qt5_LIBRARIES}
--)
--
-+target_link_libraries(kdenlive_render Qt5::Core Qt5::DBus)
- 
- install(TARGETS kdenlive_render DESTINATION ${BIN_INSTALL_DIR})
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -299,7 +299,7 @@
-     target_link_libraries(kdenlive KF5::Crash)
- endif()
- 
--qt5_use_modules( kdenlive Script Widgets Concurrent Qml Quick)
-+target_link_libraries(kdenlive Qt5::Script Qt5::Widgets Qt5::Concurrent Qt5::Qml Qt5::Quick)
- 
- if (Qt5WebKitWidgets_FOUND)
-     message(STATUS "Found Qt5 WebKitWidgets. You can use your Freesound.org credentials to download files")
diff --git a/kde-apps/kdenlive/kdenlive-18.04.0-r1.ebuild b/kde-apps/kdenlive/kdenlive-18.04.0-r1.ebuild
deleted file mode 100644
index 78915ae45c36..000000000000
--- a/kde-apps/kdenlive/kdenlive-18.04.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://www.kdenlive.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="freesound gles2 jogshuttle semantic-desktop v4l"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=media-libs/mlt-6.6.0[ffmpeg,kdenlive,melt,qt5,sdl,xml]
-	virtual/ffmpeg[encode,sdl,X]
-	virtual/opengl
-	freesound? ( $(add_qt_dep qtwebkit) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
-		-DWITH_JogShuttle=$(usex jogshuttle)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package v4l LibV4L2)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	# Gentoo bug 603168
-	if ! has_version "media-libs/mlt[fftw]" ; then
-		elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled."
-	fi
-}
diff --git a/kde-apps/kdenlive/kdenlive-18.04.1.ebuild b/kde-apps/kdenlive/kdenlive-18.04.1.ebuild
new file mode 100644
index 000000000000..898340cc812a
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-18.04.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://www.kdenlive.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="freesound gles2 jogshuttle semantic-desktop v4l"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui 'gles2=')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=media-libs/mlt-6.6.0[ffmpeg,kdenlive,melt,qt5,sdl,xml]
+	virtual/ffmpeg[encode,sdl,X]
+	virtual/opengl
+	freesound? ( $(add_qt_dep qtwebkit) )
+	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+	sys-devel/gettext
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
+		-DWITH_JogShuttle=$(usex jogshuttle)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake-utils_use_find_package v4l LibV4L2)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	# Gentoo bug 603168
+	if ! has_version "media-libs/mlt[fftw]" ; then
+		elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled."
+	fi
+}
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 30e87710a968..0f2317928f1a 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-addons-17.12.3.tar.xz 2038588 BLAKE2B 76636629c40b81afa4cd6bdf273ea250e196247e2673365dbfb768c76449b01a72ad80af277bb03e31302b4ba8643f5d783b9c05aa62dea8b8eba1effce8a68f SHA512 15e15f5a7a00db274f1ac643d03b41cb71949ad7c36d35c19a011d2704b887dd1f23e78dd6f8ef04852a7934e5e5361fe0a60c93e17b2c891d55baeee75352f2
-DIST kdepim-addons-18.04.0.tar.xz 2501240 BLAKE2B 6d6aef42f8076071fca6fb701be9f07a188ca3d3a632db7eba8c24b080d6687ca2f19b4874701056a81f6f2e7ed488df461f3284836162e243ec7ca3715d1323 SHA512 60c3226db3ba8294633510013ec1301248ad345f4910eb39df975e0148254512ab3055195ed3161910b0a99e5a05706239c3965dd7eae54b73dec6bc6dc6ea84
+DIST kdepim-addons-18.04.1.tar.xz 2508620 BLAKE2B d1ca4aa0b925b65297d8a3fce98915f2ff9b43a793b0e5bc4eacf3aed2016260fcba4ad03745b37fa190bd3decae201c4642df7fc87c2531b8aa58ded1f28cc1 SHA512 bf7d14869b7feb4f38df776addb409cbcb47ce54014f2c298eb3e1f188093f9b90a6f78ccfeafe7cfd1f0a2bbbad1dc0157aaa0b1e314a7d18f682057098a875
 EBUILD kdepim-addons-17.12.3.ebuild 2254 BLAKE2B feb95b32a64c8d8ac8e0f7664cff63fbbafabe83263fb9920dce532d3736c49b7db26506799b267ea74c1b8de94a3600768ebdccd62e0843cbd5c2df0f05e1de SHA512 8d0bb5991fefb409d17e1575cc9ab1aee3784693e15df062c77ab3d07c0df403d905db5eb30728353b48c0287eb5d4b33d7d70f64d7186d2e2a991b12225be17
-EBUILD kdepim-addons-18.04.0.ebuild 2256 BLAKE2B 0489fec6b17fdb1d163e974a1fada3fe8f8e7636e40cda74dd79c14c0d881a160f52890e478add42be02f13424507574372db60973705b5937a983e7ae2aed6a SHA512 e5a7ea05a5ed21b8e3bdd2ead32a03ba87f249b0c9ac43eb0b14664d6fe7203c44f438ee9138438b96df6c7a6385521d99fe92253aa6cbd36c8aaa75db314d62
+EBUILD kdepim-addons-18.04.1.ebuild 2256 BLAKE2B 0489fec6b17fdb1d163e974a1fada3fe8f8e7636e40cda74dd79c14c0d881a160f52890e478add42be02f13424507574372db60973705b5937a983e7ae2aed6a SHA512 e5a7ea05a5ed21b8e3bdd2ead32a03ba87f249b0c9ac43eb0b14664d6fe7203c44f438ee9138438b96df6c7a6385521d99fe92253aa6cbd36c8aaa75db314d62
 MISC metadata.xml 378 BLAKE2B 9ff4bb4cba46c784e2664d026e71aa42bd2bc3336e5107d9476fb13aa57646b06a21890047e2ce763223d1c359c161f701148d58df6c2afc32c18112a6e5942f SHA512 6a36925cdc8648716b5b3c6574f544b5dbe2bcd656a2594930a8d5d9b2600bc3a9c98801221191a2c308c5d05716d48859b381dc6c0343ab6894b8c704280701
diff --git a/kde-apps/kdepim-addons/kdepim-addons-18.04.0.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.04.1.ebuild
index 5a11e4f931dd..5a11e4f931dd 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-18.04.0.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-18.04.1.ebuild
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
index 3c04682f2fd5..17bf9e603fbb 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-apps-libs-17.12.3.tar.xz 72912 BLAKE2B c7988237e127e6b5c79f1488dbab6b2594c16c93570ba5f2dd3f61f477f9a0eff4061417c913eaae20f359037a045c349b960b8252091c180e1aac1cc69725d9 SHA512 ffa2f59f95245ae5f6de56c8bd70a7f7b08cb063917d37aa225ffb7f580460ee951b442b1678151a1cf9ab8fa2fe04a36fcce8fef9773256dd74091337014e50
-DIST kdepim-apps-libs-18.04.0.tar.xz 73016 BLAKE2B d7ea79a627f9a9fbeff45691cc5941c37a16cbb72040d233a4f3b79467850af46a137b338e3d943dfa4a43ea306eaac1ae9f4cfe8f0903b323189907903894d9 SHA512 c466c2cc9d53b0cb1367344679f891d1144a520b77a1f49812475918822c4b816a9cd3d8d81a8c85d4315823dd36cd1d9911c532ca9b01d3e386c8c7e420c641
+DIST kdepim-apps-libs-18.04.1.tar.xz 73120 BLAKE2B 399c4844d7cae546c1cbc47549bbddc7d4fb7aa4c8c13478d9f3fc39a18a63c30ddc66123c68f497025f656f73afcc17ad5335d38292a3c9f5e8c0d74bc86278 SHA512 7db48df898e0e1c607e026a7da5ea6004cba5943a641166cba9ba3200a0d3f129aef21e93ca800fc460cf815cdf037e97e490dc9f868555550c0a8b19743d8cc
 EBUILD kdepim-apps-libs-17.12.3.ebuild 920 BLAKE2B 7f5d44fbc2462713efaac8d6626c0b9a93443b6ab5fc61d2430ffad2bfae7d28df323eb83cd25db915e32df9de55c39e92c0e1003f4a2ffa537775afea24d6ad SHA512 4b0f06a6d396335e9f7d87b6e2d22a4356ae9d4095f4c9a41c865f2fdd50d0e7129b11100c3acaad4e552ee4caaab3fc38461c38bf3f7be2baf03713b3a45a32
-EBUILD kdepim-apps-libs-18.04.0.ebuild 922 BLAKE2B 9023c2146ca7b469d010e479e010ec8671c24fa64ea2ed0a05344c67309ba2a8d069c0f0bafc4d241d561c10144182f65a5addd32badc5c1b6629a95b98b90cd SHA512 974b0ea380d8669d47dd6918c24ab52aa624c47a45e046846f7533936181cb5c57eabf26e07b9332ce3e3cb7706894900918768b9d71be8667b2d9c13b8ff751
+EBUILD kdepim-apps-libs-18.04.1.ebuild 922 BLAKE2B 9023c2146ca7b469d010e479e010ec8671c24fa64ea2ed0a05344c67309ba2a8d069c0f0bafc4d241d561c10144182f65a5addd32badc5c1b6629a95b98b90cd SHA512 974b0ea380d8669d47dd6918c24ab52aa624c47a45e046846f7533936181cb5c57eabf26e07b9332ce3e3cb7706894900918768b9d71be8667b2d9c13b8ff751
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.0.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.1.ebuild
index bdabc1a6ae7a..bdabc1a6ae7a 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.0.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.1.ebuild
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index ec57fd26a9e9..22933267186f 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdepim-meta-17.12.3.ebuild 2087 BLAKE2B afc09acdaa85df96cf067382914d3b79286d4d72abce61bdef73bd6c922850109803026dda15b62f294b0d68c7af3b2638bbce24fad69693427d05bde5527073 SHA512 a754585116fa52a7c67f85a12928364e3143c0af6610d2e4a7fc11326dabf66c43cdaccfdc9a825553d61f45a509c870ababdb8dad0b0adb12ef3ce67d86d227
-EBUILD kdepim-meta-18.04.0.ebuild 2056 BLAKE2B b8e5e837b44fdb1ff414d772ff6a499d7c92fb8db831517d8f03cd79ccdc166304ec689dbfde8e3c90cc2dc86177230797aeb0df2350e4defdc6ea92b6528d78 SHA512 4284c323335ce71fe2bbdae98cc6a7ee7615d4dac42b3cac7f21860883609af9fa4c2e01e6402078e21e736b7a6e8df784af3dc75e501fbdcb538bccb563d914
+EBUILD kdepim-meta-18.04.1.ebuild 2056 BLAKE2B b8e5e837b44fdb1ff414d772ff6a499d7c92fb8db831517d8f03cd79ccdc166304ec689dbfde8e3c90cc2dc86177230797aeb0df2350e4defdc6ea92b6528d78 SHA512 4284c323335ce71fe2bbdae98cc6a7ee7615d4dac42b3cac7f21860883609af9fa4c2e01e6402078e21e736b7a6e8df784af3dc75e501fbdcb538bccb563d914
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.04.0.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.04.1.ebuild
index e6ecd44f3a8e..e6ecd44f3a8e 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-18.04.0.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-18.04.1.ebuild
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 3b4c14566900..6c4b546f554d 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-runtime-17.12.3.tar.xz 1796892 BLAKE2B 8e74409e6a5eee9201340f971f14324eee68d1510c23f2684686a3e8b8463031cfd6658de2073f1205f8c6f7207d1f1dabbddcfad05c87fa7c8665dd30566bfa SHA512 9ddb7c717a94ca75f561e54f7842c18c2def83c129f004e345a32ab4de4a5b4b15ec50f2044000d785572636a0d78adc4d90f9b3550ed853cf1982c6ef749aa7
-DIST kdepim-runtime-18.04.0.tar.xz 1745684 BLAKE2B 59553cf5559825ef06c408aafae1f07f36bcfd1afd1f08e90d0f011c3d13f08d6d6dc99745c4f1b615af02b3941741d6be9abed80b1e4f0cb0f60e21d413d34d SHA512 303fa9fa3ab0b26ea49971f8928c0bf3e4bf75993dd0551bdf5e4aab95e00d3a871d09ff8b399f452f97688e25377ec53f6705f9e0b1993cb4b3772a1bee8ce1
+DIST kdepim-runtime-18.04.1.tar.xz 1749484 BLAKE2B 7b1e2654522e15f881e9fb2429387af31f7a46978f367d5183fdf5b2fa119e120a493a768c8a88cd159af5e2922316147031268ce45094a7afa9849edaa35428 SHA512 b9aed0799eb6bd6c0c21c1d8588b84f460a793b46f9cf79381d2f7c8a43a6fcac658c0a887ad7fd62ba7224c8b014c03aed7209a952c6d2814fccb1a3c24e769
 EBUILD kdepim-runtime-17.12.3.ebuild 2099 BLAKE2B 89590057bee63523527965deaa1c1b2b75640d6e3a9a1e4204dfd4122c273ceb20e65e4da8cb6fb456b135fd0d6638e173e80957eddddf1c929a4ba66ce9805f SHA512 cd966833607fa7e46b7d39ccccd557c09698aff2c0b883e7b9f71cd83e147db3d0e2da1e792eaa4c874bc626e05529ac1a5562965120d3b3ac51816fd28fca5f
-EBUILD kdepim-runtime-18.04.0.ebuild 2134 BLAKE2B 2cefa8be75ab1b12d40e5dbd20f42aa5c018b7541ac364aa05da4893d5e45d47a8f561cafa96ccdca3321a379754c14b1d264856342008c3c0bbcb101036666b SHA512 45a5f3c65d3e33404c1a1dae22c59b5514fc566e3bbe905c0a020e8299f335b195434145c8b16d95d5abc7cbe72d8c96e11c6ff94b55ea19cd45d230e6afff76
+EBUILD kdepim-runtime-18.04.1.ebuild 2134 BLAKE2B 2cefa8be75ab1b12d40e5dbd20f42aa5c018b7541ac364aa05da4893d5e45d47a8f561cafa96ccdca3321a379754c14b1d264856342008c3c0bbcb101036666b SHA512 45a5f3c65d3e33404c1a1dae22c59b5514fc566e3bbe905c0a020e8299f335b195434145c8b16d95d5abc7cbe72d8c96e11c6ff94b55ea19cd45d230e6afff76
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.04.0.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.04.1.ebuild
index 4f1d61f160a7..4f1d61f160a7 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-18.04.0.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.04.1.ebuild
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index c478747b86d4..402e220a3d37 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-kioslaves-17.12.3.tar.xz 37376 BLAKE2B 6d3e5f63ba3aa306df92740cb7e0b3adf46475fbdae8d3994e0682f5c6ce51e16e9c1288d85c9b9f5cb20ffe21af39d3fd99602cc6877b7bea0a2a2efaf72d33 SHA512 c82efe950bb23a8a78e941136a544fd61eaa96421c547b1d68a8b21c265ed69d746fdb14078dde007b96d800aa8b53c629549de01b64733ab830990a65161750
-DIST kdesdk-kioslaves-18.04.0.tar.xz 37360 BLAKE2B d51c32e9370d77bc44854a5ed3468a45123f8f4833de5c3f71b1828f80a67d09f14d651079da5863bcce9b47581f0628b5b981407f1484523b54d2772fb873c9 SHA512 7907759a95d8e66a8911b5ca0c6e1b16dcd7e139058597caf2066b31653c40a119897215187972be0e1a5acfbc8252abf91a5e754308efc33fae37415fe0ac6a
+DIST kdesdk-kioslaves-18.04.1.tar.xz 37420 BLAKE2B afb452cc615f021b0718611ddee2e3b8aa12f7e1d5b4149dcb055e6c2b0c8ce0dfb9318637a222b7bb047360c63c8884b737629adc298143fdefe541193560e2 SHA512 31e53613e680a630c99cdf83fbbc6f59fc585aa0084b11dae49b2e02f0ad8c38ca977262f8b86aa7828d1815d379e4438ca1bb50a2cef503453a8090bb16d18d
 EBUILD kdesdk-kioslaves-17.12.3.ebuild 375 BLAKE2B 8df34029202846d40886767b498ad131fbfe88c9a002f50c7b7bee550aa2f9d527ccf52d4d3c4ff4772457ebcd6cdae914030cc4428e9740639da9cd2e8d3c94 SHA512 99cd80231159521eff93142152fe52833f8f36d0678f4ccaa9e85522a34dd77f1ae5b1070d527915ee34e99219d55eb61e811e4608dc40a27fe8c77177152488
-EBUILD kdesdk-kioslaves-18.04.0.ebuild 377 BLAKE2B ca74c8f1cd7219bde81271519fa533aac2b4a2be76d5244f6f064178467d8b517db2cdb6f2119b59cc8972b1105c20f24b0219f72318eeed1b950d2f14d7ad34 SHA512 29bb043e718d0472262fd8d4230e2d8fe2953fd8171e3e974df3b92f967c319486ef73724376385c8cb98c8225999d526f7a63bffc69e6089e3a32d0e3063cff
+EBUILD kdesdk-kioslaves-18.04.1.ebuild 377 BLAKE2B ca74c8f1cd7219bde81271519fa533aac2b4a2be76d5244f6f064178467d8b517db2cdb6f2119b59cc8972b1105c20f24b0219f72318eeed1b950d2f14d7ad34 SHA512 29bb043e718d0472262fd8d4230e2d8fe2953fd8171e3e974df3b92f967c319486ef73724376385c8cb98c8225999d526f7a63bffc69e6089e3a32d0e3063cff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.0.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.1.ebuild
index a659366d3db0..a659366d3db0 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.0.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.1.ebuild
diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index 844f0b698450..369a22ab1c0d 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdesdk-meta-17.12.3.ebuild 814 BLAKE2B dcea153082a4c8fd1eafa4845e6f8744c1d3dfa788e886ae726f66b611c3d571434e6d3f91ef586650799ed278d6d859c2f6911f02c25792e8d8ac9d2a183de8 SHA512 543148e3d0c5408e70e99bc83116c233c9fa91224fd0901bd282d6dcf9a980cfefa66a85a80e380791d2a6fca166b6f17254e8085a9f42282951f2e5430963d0
-EBUILD kdesdk-meta-18.04.0.ebuild 789 BLAKE2B 8a714726b17b33dc7543e235c16e3ef1c7e2ba5448e2d13c5099b33694e8f8ce3f086517408c00548f84eb8560b9320ed20c25824d11a0aee38105cfa96ba988 SHA512 b47c1cfd369b996ecaaf797b19a29d2b3984992ff0395da2141b192d25dee55fd0f2c2d6fd53c94f7d31b0984926350c6f0ade56acae5284a7a17d97d2515ecf
+EBUILD kdesdk-meta-18.04.1.ebuild 789 BLAKE2B 8a714726b17b33dc7543e235c16e3ef1c7e2ba5448e2d13c5099b33694e8f8ce3f086517408c00548f84eb8560b9320ed20c25824d11a0aee38105cfa96ba988 SHA512 b47c1cfd369b996ecaaf797b19a29d2b3984992ff0395da2141b192d25dee55fd0f2c2d6fd53c94f7d31b0984926350c6f0ade56acae5284a7a17d97d2515ecf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.04.0.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.04.1.ebuild
index 0759a45c3992..0759a45c3992 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-18.04.0.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-18.04.1.ebuild
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 0dad02719850..5df9fcbdb929 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-thumbnailers-17.12.3.tar.xz 17164 BLAKE2B 5189bcfd5b39d3d91af18b3e0c2be39c9cd889eea6402b8ba98f6d9bbe2ac1b28d30d68ae476e3b26d2a75f29e8f73cc304dbc67cfaaee381afab2ada1564a35 SHA512 4a1aaee48d72601730a5eaffccfcd8f3fc10c848af4c5b72d0a81a41c3012521e43c259fa1fecc83268261290d86cb188c541d06827bb7cb990148257b699c45
-DIST kdesdk-thumbnailers-18.04.0.tar.xz 17140 BLAKE2B 902dc50c482a2ef8ee6731385c8c608a100d2fcf247a708bc9fc5bcd0df5d8e042428b408a21f00e42a2775551d6a49f8abe37ac53cb70e7f32cc500eba040b6 SHA512 b342bec3933565132f29a8783e11d27d2aa7065cb116a0427e72eafd3fbe72932e866dfe6326d8fa7ef51b02bd3f61985f44fd357c6a42b438abc2e3dcd732eb
+DIST kdesdk-thumbnailers-18.04.1.tar.xz 17140 BLAKE2B 9308806536b71cfb0ccf2600a35b0b8e02f57b9b77c4603abb075f5a847d6a3a17e4f43ef2a42242cc8d76b5af6ffee3321447790496ee8c5a40c5a050c44aba SHA512 7dfeabb21173f6429e1ee373b251eb42fff8db2d562a3bb3eefde97affd1793f18e100f4f40d5de611b882cd9aaa547436923197ebe4b249f1efa22cf6f2906b
 EBUILD kdesdk-thumbnailers-17.12.3.ebuild 428 BLAKE2B b1487995dfe76b2153c1ce5a8cb91165f9c26b4d92026b662e07c99a792b98dfee71fb2a449cff6170efd6b28eafc35f10e1b66f4fdfe9217fc48c924a96a104 SHA512 0b08e749f42ced5d342bba47dc64a59f5627bd23313b1ddc0ed38f30c6e2804b5827234c6f9335a6f9ae6af61d9e94ea4da5f144719f62addbdaeca2958a3ab8
-EBUILD kdesdk-thumbnailers-18.04.0.ebuild 430 BLAKE2B 925942c8b5354bc3c7e50d06e56501f3b1dc143bf3d37d8e81880130b1638a04b413ccdbb8513ee98c1f5e8838431e63af3ed734cfb71931b80bd32899765ef6 SHA512 a8b1d25f298c26729062444b842d899c65a1923b80e6c72964c0a14dd44eb2963f571610ab221123b23eedbdddc62adae750622d7b2a26ed4cc57a94352e7f6f
+EBUILD kdesdk-thumbnailers-18.04.1.ebuild 430 BLAKE2B 925942c8b5354bc3c7e50d06e56501f3b1dc143bf3d37d8e81880130b1638a04b413ccdbb8513ee98c1f5e8838431e63af3ed734cfb71931b80bd32899765ef6 SHA512 a8b1d25f298c26729062444b842d899c65a1923b80e6c72964c0a14dd44eb2963f571610ab221123b23eedbdddc62adae750622d7b2a26ed4cc57a94352e7f6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.0.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.1.ebuild
index aa6e30a17640..aa6e30a17640 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.0.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.1.ebuild
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index ec8e59ce4c7a..85d347f9fa56 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeutils-meta-17.12.3.ebuild 780 BLAKE2B 9c88d6fa4afe2aac44e6346be781b1d01df5b6ece0db29b776d87b22558318b8ecbf51876d6505d626c78a0b5e43a0eca58f66e221d942a4bf8a0856e4196d51 SHA512 9183685acacf514d5e0efaa07af67d15a61b71ba0c5bf02b19c572bca03d39b32cc4be2db42289bbe81f79adb752f537827e26bc9efd8ec1aa9c7ff30c960ee4
-EBUILD kdeutils-meta-18.04.0.ebuild 810 BLAKE2B 254d18dacb012f2eb254911546d48a51132ccd99113b1cf562e12c70207cd9f61b93e2a3c2ed85320a3c3e15b40e0a68feaee7f345a06f574a35904e270cf63f SHA512 26d2a351d77944ef5206636f52eb26162d516c47329d45b8577a5527f6e23fc6088365bf0dcd5ee0623bb588b5c3897435dda26e7328f3657a415e98bee08df1
+EBUILD kdeutils-meta-18.04.1.ebuild 810 BLAKE2B 254d18dacb012f2eb254911546d48a51132ccd99113b1cf562e12c70207cd9f61b93e2a3c2ed85320a3c3e15b40e0a68feaee7f345a06f574a35904e270cf63f SHA512 26d2a351d77944ef5206636f52eb26162d516c47329d45b8577a5527f6e23fc6088365bf0dcd5ee0623bb588b5c3897435dda26e7328f3657a415e98bee08df1
 MISC metadata.xml 389 BLAKE2B 7f665fc6407ec0455464d44f43b98afba7702a6b7a2e65841d2bd54dc7c229cc5c227cdd47fd81eb7cb97e45b69957c2d4085a61e2e2eecd2e2f8186d896971a SHA512 f991910e5080fab1810b9762700b528556370472cb796e02c5f03fe63058f4e5d665ad39b6de597d49c04c233b09a4b703c80408205a3df175025c14767cf564
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-18.04.0.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.04.1.ebuild
index d34c1f9cdd38..d34c1f9cdd38 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-18.04.0.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-18.04.1.ebuild
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 4b3c2b058aa9..3809c7cfe3b0 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
 DIST kdf-17.12.3.tar.xz 531168 BLAKE2B 34999ff9c3dabd8f83b3b4e1f197d6587926782ee68cf7df1897316ced417a8a5d6fe83821f9d74f3a2eda95e65c87bedd06822e71c6776c9dbde4705405ea5e SHA512 4a39e1f1d25d73171ba5b299227b9e4e51778d27a544b0198d77217904a5479c9e7107b15514f1ed1b9e2c8418ee3afd134f23c929b796a940a851b104563167
-DIST kdf-18.04.0.tar.xz 531144 BLAKE2B c0578e0b7d520209ba6ab2ae07e86a7f18821e24a55a094ca342c1c7ff40cd5f7bb26b83156905b7c070ef25f52215f42aaa396e557c4f574f0f4e6f2f023b44 SHA512 12d33dcbb5a6bcd9561ead9093977c0ed8b23be46dfae907a4b2568da7f9b84b9a022f21e56010f62419549096b84bd60feb30fb950b1ec5e9ece9706c52eb04
+DIST kdf-18.04.1.tar.xz 531576 BLAKE2B f9ae5b8c8a9073bd03f4d7b793fce1f964cb89172b895dbc224cf667abcad90250a478bf1d4889fc82676a36a2655c76ad13a18db7fc57b35676f9328f2820d3 SHA512 8d2821a09831230da41de2c35f0173b7a8a7db7a87132919ca52945b3b4e14d993b8e9771a3718c6e0cca285cb181e5f8e9177d1f4ddd22a6dee9e344c98dfe0
 EBUILD kdf-17.12.3.ebuild 723 BLAKE2B 2cd42edaa2ee679b03d8557f41d0751eb21363e51383ba705ad10269628fcf602425cecc819004cc22e0635a3f1e0ff71c9807db6109afff199def42e8458be3 SHA512 c3d2ccc31530c8902ec386e9c7e0f91906cde6cce2b9702e44cbb5dd71c3a9b40b13eb679f11da1c90436f5eccb13a7bcde0ba5f14f869858e0979bcb8a38885
-EBUILD kdf-18.04.0.ebuild 725 BLAKE2B b0897058417fce2b6c420dae4a8568151b2a7602e2d7b900353917ec88a21b695f973a8f6b0c3da21a681aedf9bfa2d44c79230c513cdd653ee9aec6e2385724 SHA512 f7c33825bece4ef0b1a4058795947e9a9ce15bcdf47e0021df052406811a9b485e7fcb44de20122e0864e50eb464c1fb7b6e674753961e3b5a405776c779775e
+EBUILD kdf-18.04.1.ebuild 725 BLAKE2B b0897058417fce2b6c420dae4a8568151b2a7602e2d7b900353917ec88a21b695f973a8f6b0c3da21a681aedf9bfa2d44c79230c513cdd653ee9aec6e2385724 SHA512 f7c33825bece4ef0b1a4058795947e9a9ce15bcdf47e0021df052406811a9b485e7fcb44de20122e0864e50eb464c1fb7b6e674753961e3b5a405776c779775e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-18.04.0.ebuild b/kde-apps/kdf/kdf-18.04.1.ebuild
index 3ac87d6ff652..3ac87d6ff652 100644
--- a/kde-apps/kdf/kdf-18.04.0.ebuild
+++ b/kde-apps/kdf/kdf-18.04.1.ebuild
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index e6e6ccef4462..4347aaaa5650 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
 DIST kdialog-17.12.3.tar.xz 95956 BLAKE2B 5a7aee1b13e3163e29f85a98f17fb94e0d4503ad43f4c9a6be82df8bbd64e9ad12de80ebc33248c79c63f27240d192d184e5c9f7d85e458dca22731b5678a599 SHA512 412cff325ff8bc77f91077d5a364f4e900d7344f27a0b13d9319c16c903bf9d7ae79e3687f53167e0157600988ca8c77ef005e37e3fe8d1a0c45c8f776de1e4c
-DIST kdialog-18.04.0.tar.xz 95972 BLAKE2B f3c3e7d7262416fec728258ab4496c751f61a81d6224654601144e58fba9b51a728f6cbc244ac24cdc3a02a85b66d6ef600b736a1d09595f884150db2425e477 SHA512 73848edbb17f3908932fa039da8bf8e2892a31ff034cac85b5ecfc6032dfd8e4f76bf4a155c893e9c0dd9e423eadf0a78c513fe0ef8378fdba220ea79d09fad6
+DIST kdialog-18.04.1.tar.xz 96468 BLAKE2B bfd26f0b425a5092bc94f00d988fe221929d5f3644edfb6bcd2925d73d111a85813411cfaa9f136d7f6193257c4809e71e73daea08b7173d31cea2e6387c6544 SHA512 b51ea436c6e5ea9650a7f4322d5e21e704e7e77a579fdb6e4a100606bd71bd9abc0d3603aa1e75524c3c0885e910f5b6b0f5e5d1f1f5c6bd03a85e97a99e3ced
 EBUILD kdialog-17.12.3.ebuild 835 BLAKE2B d1530d890374d6a94b326c053cb83f3bd834e9a1447aae26877096cc997bf4ff4dcca7fa80d2122b32e5a0006e73e8e02c2ae1821af62e7f89aad286e20b2bca SHA512 801f9facb90bcbb670e3c253e4e308b1c46f17435fdc5306170d3a54d744393e8552b9428e313310fdd85ca5b122c99c92b87ec83ad95adca7929b8b0f87a96d
-EBUILD kdialog-18.04.0.ebuild 837 BLAKE2B 699390df60024475a60b5b2f0ab567839357b01ad6db2ffa9987ccb6daba501749181e4b4b9b30dfa1d928e56743545c448ff9f7096ecf92e6ca92b8ab3b1e8a SHA512 e25479d71bb7c8ef910cdbd858489cef9d1c75636b84841edd36861ebd9d0983d09d209ad716b57137d4816bcb4303acfa19562f74702dfcae07ed57d316c49e
+EBUILD kdialog-18.04.1.ebuild 837 BLAKE2B 699390df60024475a60b5b2f0ab567839357b01ad6db2ffa9987ccb6daba501749181e4b4b9b30dfa1d928e56743545c448ff9f7096ecf92e6ca92b8ab3b1e8a SHA512 e25479d71bb7c8ef910cdbd858489cef9d1c75636b84841edd36861ebd9d0983d09d209ad716b57137d4816bcb4303acfa19562f74702dfcae07ed57d316c49e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-18.04.0.ebuild b/kde-apps/kdialog/kdialog-18.04.1.ebuild
index a3f46e46a8fb..a3f46e46a8fb 100644
--- a/kde-apps/kdialog/kdialog-18.04.0.ebuild
+++ b/kde-apps/kdialog/kdialog-18.04.1.ebuild
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index c6219ef27c50..911e9c5ebafd 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +1,5 @@
 DIST kdiamond-17.12.3.tar.xz 4606848 BLAKE2B ddb65e22deeaf41cdb125ea7dbac51c82a7f7e2528f77e49738261da79d4507f3b61a4261014d16ec5e1507b2317e483bc2e01d2815587ba6629feaa55a16521 SHA512 bcf362489e0e1ace69de17fb33bcf2fe8237565a620f6cb4f6a0ac5563c93c1e7ecdf76e5411463daa7a71225b91c2dd4131b1726566e9ac6b80d49babfd2b4c
-DIST kdiamond-18.04.0.tar.xz 4606960 BLAKE2B 4c219c4fe40fd4df396814febc8a33f044d3e654b54f0e3c1abdde78406a53c0aece2e2fd5dd37f1e80ba7592c49741b9a4690a2c7df1305153c7be3236cf3ea SHA512 4815fd982944806e81171df9ed46d45a589bf6412f5cd787a3a3c78f8bb81d14adc58edecd28e318212a2eec955d5e26dc1dfbeaf6ebdb48461010e1da292c8c
+DIST kdiamond-18.04.1.tar.xz 4607692 BLAKE2B 44063ab058c5ba6d7121d1d7aa9b6cdae821aa1e59c524a2242558890b6c8c4b6ed1ae50db8cec9b494b19310283a60ee514fc2cf7dcff986973b1544827dbc0 SHA512 07b8ac34f5fdb940a694477bd0f52480498060ed73560d5babc95958ee6b9e5b9ed542c7be52a8ec6120a628cbce0f092ce800026fa9b31c7088d407a09bf8ec
 EBUILD kdiamond-17.12.3.ebuild 789 BLAKE2B d3c9f7a689285fa19ca4a69867de48ec75c3159cf478ea9f6a65fd6fb2f1c411422f6c34548cf3217a3ffdf1b66221f6ea1861527696bf8f0848cc68d15a7793 SHA512 2ac9033bedf4e831528a6998b77f6f02bcbc453648a9dfa2a4d564cc4c6d0bbc9ad108d171d79b722245daeeeb89395bd16860676d74d0561544e24e48cdc47b
-EBUILD kdiamond-18.04.0.ebuild 791 BLAKE2B f8f0d78bad52684bcb399ddddb76929baf952180ff20aacb16e49a4323463a6b241fbd6650a7dae843de84491738a6300538b41abc416712a5732ce3e836c170 SHA512 e9bb4228f2e50537b53d82ef584db97ddacdb96eede82a8034893b106ed9967168b7c716610d41a7931d6fb09ba26f091895024c2a7eaf705cc37ef092919c93
+EBUILD kdiamond-18.04.1.ebuild 791 BLAKE2B f8f0d78bad52684bcb399ddddb76929baf952180ff20aacb16e49a4323463a6b241fbd6650a7dae843de84491738a6300538b41abc416712a5732ce3e836c170 SHA512 e9bb4228f2e50537b53d82ef584db97ddacdb96eede82a8034893b106ed9967168b7c716610d41a7931d6fb09ba26f091895024c2a7eaf705cc37ef092919c93
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-18.04.0.ebuild b/kde-apps/kdiamond/kdiamond-18.04.1.ebuild
index 111637d702bd..111637d702bd 100644
--- a/kde-apps/kdiamond/kdiamond-18.04.0.ebuild
+++ b/kde-apps/kdiamond/kdiamond-18.04.1.ebuild
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 475b46250129..6e16a480bdac 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST keditbookmarks-17.12.3.tar.xz 183248 BLAKE2B 89c2c23d1d0c9387d38dd84843b9da21cf9fc2d93d58f3b28c1f88bfdcf5c3e35862b7db9e13832cdc72b81a38421ba813bb4b00c21ce6ab2e21421d3a3abdf2 SHA512 9febc64485af7ecc4e2d80d3412a4c6ee8cc6cc38ef4606f31c10bf822389da9318f5e5ac97386bb68f6d4640f4ee5212871bc7c7a2b1a4ffe229936a00c0848
-DIST keditbookmarks-18.04.0.tar.xz 183208 BLAKE2B 2f9456478a98b07bdc9a4296c0ee4a8db3c8ee0cdf3850b0a83253f4a4278ada78d83fec36fa6a7f15d897739e90661f6d6de35110327854e38b7406d7dba959 SHA512 8e2f8c4ed3f231d3cb0b10613c885e7b60e44a701a81a3cd1c1db59dd0d102434524d3d7fe94f17717c8999e0af43e5707e361ee04c39915ec08d37d7098780a
+DIST keditbookmarks-18.04.1.tar.xz 183996 BLAKE2B b3a6fbbcd1a4b7cdf48f93417b668897bb46b81f551f8e692f87f624ee17d92e7e6ca739e8e6eacc36bbcd56ac99e12a75533021a7ff41e4ef39d9aef527bc5f SHA512 e9fbaba43a3e5bf21467c1429de6aea806e7ceafeef933071338943d1014f93bd354d7085a59670aaa9e4346c578207c7e97aefbae13835105850e3cd49c6c16
 EBUILD keditbookmarks-17.12.3.ebuild 1011 BLAKE2B c7e602a87e3a8c4b2d24670c70fac2603e67ea23dcb7face912e902d968f0fdd8f6fa35b364a20e8736cbe13918a2f3b82685cab68dd5c2a783d8c97ab9914a2 SHA512 62ab8d13685bef04dfaf60adcda07034f10212bfbafc11d27b2161d275e69ef00cc338d4f25eade629da6e7fc3564965e597111d8bdcab2c849675f1b2f14fa6
-EBUILD keditbookmarks-18.04.0.ebuild 1013 BLAKE2B db456d32470eb7a37bca70d4b93bfe8f1fbaaf0dae78e61b026931e33c3599693568ec0b556b576606cc84f3f90e42683f0c90071b4afcb86b4c1fa7f3a98907 SHA512 9837274abaa372edbc12fbb7ddd0c1b7d84d233c983fb2b07930bc270ace635c57474d46939dec628149bfc60daaf80fc43e716269e4beb7f42ac592af516fa0
+EBUILD keditbookmarks-18.04.1.ebuild 1013 BLAKE2B db456d32470eb7a37bca70d4b93bfe8f1fbaaf0dae78e61b026931e33c3599693568ec0b556b576606cc84f3f90e42683f0c90071b4afcb86b4c1fa7f3a98907 SHA512 9837274abaa372edbc12fbb7ddd0c1b7d84d233c983fb2b07930bc270ace635c57474d46939dec628149bfc60daaf80fc43e716269e4beb7f42ac592af516fa0
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-apps/keditbookmarks/keditbookmarks-18.04.0.ebuild b/kde-apps/keditbookmarks/keditbookmarks-18.04.1.ebuild
index b048c6a9cf89..b048c6a9cf89 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-18.04.0.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-18.04.1.ebuild
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index 37716c0c0214..26a997294694 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,5 +1,5 @@
 DIST kfind-17.12.3.tar.xz 208948 BLAKE2B ac1830df924a8e81fb0756a331e1bec1ed267cc8cf27ac38d2c1c36be8e9293b92505f6446ce0b291871bd0c09e9a3a3399dd63b2d372da7f242d6bb7dc3bbcb SHA512 bc6edb248208f7ef6f609bd3b49cea6c621276dc2e43fec9b4dc28c86f162eb01af6656adc6bd9d90f3b47c92c35470985468c0b166e41a12fac608d77214121
-DIST kfind-18.04.0.tar.xz 208924 BLAKE2B cb4500cb574f29866818d35db58c9f8b22f82f7b517d27eddf56b0909ef3e9be4453f6a364cce4fb69d9b903c768ee254f5a2f70e3ff3f65a1a720651f23f4d4 SHA512 0956a85c4c6070ac6a40084682fd5194b6571ab3ae56f7a445c2ef61a12b3d3e13407c2af7f01d6dca8a5e782dea935a724278be354ad7809434db649893801b
+DIST kfind-18.04.1.tar.xz 209980 BLAKE2B 9c66b5d7c84f735e7a6e737a7f3d73b153a36e5c81910f256e5664665eefb75bccaf448576b7f37a122760bb51c68e66a3310b00b77f844e5deefeb97dfa89a3 SHA512 7cc2225b727273232226bbf2bb044cba200edf8ea222852bd4811fea2792030f04f58a69f2ded2f69a382500e5f029f9c839400651e8bcf5f1e8f6182943d278
 EBUILD kfind-17.12.3.ebuild 787 BLAKE2B 0eb3991ac4ee3a81e94971f0dd5ee1747b6baa4967e32ecbbb34f07725adeec4212dc9a04d88839f3b0ab69bfc2a3065debf2979ce9e40d35c8800e9914a80b2 SHA512 d6588b758e9318d5b33c6f85affb13307bbf6931f70a12fb359e80e35cfcaf23792a9993437353d19912bc88c93e281d23ca14b26528877d99ea415e2907f5c4
-EBUILD kfind-18.04.0.ebuild 817 BLAKE2B 84ac05337939e4644b43b80c8805bd53b68ab800d0e1e5594bfec72acc30b5c5e1bd22f0705c226b4b740733ab282e3ba81e2f0edc75ca8fe60da614c23b2384 SHA512 d458b026288e2a6f55626dbba241c328a2c30e67f9a306b3587bba69858a8c5cb373f4c633f0be1e723bd4d5589911aed21c34877dd0123fcde240f92349e82e
+EBUILD kfind-18.04.1.ebuild 817 BLAKE2B 84ac05337939e4644b43b80c8805bd53b68ab800d0e1e5594bfec72acc30b5c5e1bd22f0705c226b4b740733ab282e3ba81e2f0edc75ca8fe60da614c23b2384 SHA512 d458b026288e2a6f55626dbba241c328a2c30e67f9a306b3587bba69858a8c5cb373f4c633f0be1e723bd4d5589911aed21c34877dd0123fcde240f92349e82e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-18.04.0.ebuild b/kde-apps/kfind/kfind-18.04.1.ebuild
index 281d188e459e..281d188e459e 100644
--- a/kde-apps/kfind/kfind-18.04.0.ebuild
+++ b/kde-apps/kfind/kfind-18.04.1.ebuild
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 0ed04138ec8c..857d0580b86a 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
 DIST kfloppy-17.12.3.tar.xz 199060 BLAKE2B add58331fd220c61c7b764e2bc970181b515dc08ddb7b867f41a23d1a70ffc2d8b457ed7a97ef4f49040f048b508e8431478c96db6eb18af990056c934055710 SHA512 1197b15ad8953e037f4fd8463b49da903b56dd5108472b24c9d9e9af22a7c247737650e80c70310d4d906baffb2783e4b911a3645afcd3c69a9acb124a782a16
-DIST kfloppy-18.04.0.tar.xz 199044 BLAKE2B e3cd19d1bc5abaeab84c8f37b0dc638e65328a54ae5c6fcd19b6259bd4f0ab3da55ba55b45f728eed277994fdc01abdfe7dee2fdd9ad0c1abe981d50a006dc49 SHA512 4d31fb02917f8f9c3331c16e185d40a207bce4ff4872e86ca29a60c4a06a6a328d6bdaf78aa1c5373585b78c818e67ecda747bf790fd4afbf81cd36047407740
+DIST kfloppy-18.04.1.tar.xz 199872 BLAKE2B 5954931a6f8449d033dca26186fb3bbaba34708117d21facdbfc0cea88b9ad9fdba68fb2d06ef2982ed8dfdf33e74857f0477741431646b2308110f99b9b3418 SHA512 882f67eebd217289c71e3076f3d6f03abc9e3634aa6a16fd5f903630ca644572c1c587981e4b3cb1558cf63a95d4936c73d867478e410dce11e36bb32fb80835
 EBUILD kfloppy-17.12.3.ebuild 751 BLAKE2B 8b20fa977aa4e17b58157a3b469c54c047705a992ddc884f45b3b9954cc678562df906bb7eaafd14d0f3e129988bf586918b2886076adc93180e0f04b134a9c5 SHA512 a4215b6c1d1ef610c17327f070e8a1ef4823855a0cd817e88b9d2974ec9f0acd8b7aa6f83f7bd5b6fdaa1d4d5f9da1495cbfa076410898d192e6e5fa0297c1ab
-EBUILD kfloppy-18.04.0.ebuild 753 BLAKE2B 143df62aaaa9e8af5d022311750a264e7f46c16059d29ab886353b031c594cdee73451d5724bf51fb6cc6f3c893b5708feab56a342513c93de40a3bc26443dc7 SHA512 b418a3eb55fa2fedba1042641cbc8abb18daf064bc50446ace4fa8ba22746bdccb56cb83225b06297130777a209cd9a77ce2550547e6d877d9b7e573a7512725
+EBUILD kfloppy-18.04.1.ebuild 753 BLAKE2B 143df62aaaa9e8af5d022311750a264e7f46c16059d29ab886353b031c594cdee73451d5724bf51fb6cc6f3c893b5708feab56a342513c93de40a3bc26443dc7 SHA512 b418a3eb55fa2fedba1042641cbc8abb18daf064bc50446ace4fa8ba22746bdccb56cb83225b06297130777a209cd9a77ce2550547e6d877d9b7e573a7512725
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-18.04.0.ebuild b/kde-apps/kfloppy/kfloppy-18.04.1.ebuild
index 6bdbc688d3d6..6bdbc688d3d6 100644
--- a/kde-apps/kfloppy/kfloppy-18.04.0.ebuild
+++ b/kde-apps/kfloppy/kfloppy-18.04.1.ebuild
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index 62edb904240c..c99d339fad88 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
 DIST kfourinline-17.12.3.tar.xz 573076 BLAKE2B b7fa506a3e602286b6e5329fd5b091e8165f80104ddf9c6c859e75caaa29257f124c05da82a04e7e8f5ff90ffe5654287a1e10b2f1bbaebde90042b240ce08a3 SHA512 77f9046d477e65aa99a7dd9b4c88b1bf8727e25127b1afdf9872f01d8154bb01e3dd3d8dfe294698dcbc8acdb666f0cfa80bace9893448a5a696485316997005
-DIST kfourinline-18.04.0.tar.xz 573168 BLAKE2B ce4df8f42070482634c37d9dc2130d969573965a37244953999f7c9be659c09b938371292dd348dd38b81a19a8c2f1c997ef10fd15179441a0eef5de699d8261 SHA512 b9cdeecb2ec74e465acbf952e30daab4a0af1587a963f03950515f2cb891acf53f28580137011559ee125e47344b3ac35398307789a65bc5bc55b79210c53245
+DIST kfourinline-18.04.1.tar.xz 573848 BLAKE2B ce298b28d47aadcc9201fac1041bf530e8ed9522342250e70d46c59b765ebd667c3617eea45ea7360eba9f2a676b6ed16804c122efad4dda1a087aeb11751ba4 SHA512 f83b2bf29f800dd3fa379dc05c6ae65387f9661a0e37b8862071f24c4ca269345d1889fdd9f92a404a571edefdaf665a94d16c8d690f920326e64e41706939d4
 EBUILD kfourinline-17.12.3.ebuild 733 BLAKE2B d663c190f21719280e58c0fc51f1f5e28977c9f9ee7804980023dfb57407cd51c1ef548645413ef568197106226d75c88d45deae4e6210f947ad4d56df379be9 SHA512 b158cefe8e92b3561ad8e6cd19f490c6f1397769b6a1cbeccc216667548aa3c4fb38d7add1af2491eafb598ac7a63a562b97c9047879f7bc51ba1e541425113f
-EBUILD kfourinline-18.04.0.ebuild 735 BLAKE2B dea403b189c3d5c834cc37fd44b7b537dd1e260096c88815cd43147a155ae915d88ae364a176a581351f099288d6b0062cba835554b1e7f63551633879693fad SHA512 5605cb8cb86f9ad0acabf4350d35a22cdfa3e082e9956eb6f47d32b8321bb5c1c10e8e27a233b2acfcffe3b462c6c00c1cdb815fd6250e1d3f99a5d61542626d
+EBUILD kfourinline-18.04.1.ebuild 735 BLAKE2B dea403b189c3d5c834cc37fd44b7b537dd1e260096c88815cd43147a155ae915d88ae364a176a581351f099288d6b0062cba835554b1e7f63551633879693fad SHA512 5605cb8cb86f9ad0acabf4350d35a22cdfa3e082e9956eb6f47d32b8321bb5c1c10e8e27a233b2acfcffe3b462c6c00c1cdb815fd6250e1d3f99a5d61542626d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-18.04.0.ebuild b/kde-apps/kfourinline/kfourinline-18.04.1.ebuild
index 3e6be98491f5..3e6be98491f5 100644
--- a/kde-apps/kfourinline/kfourinline-18.04.0.ebuild
+++ b/kde-apps/kfourinline/kfourinline-18.04.1.ebuild
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index 07090577d6c3..edbbbf0fa54a 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
 DIST kgeography-17.12.3.tar.xz 10922256 BLAKE2B fd19344317ced08cebce16caf2f927b6cc8e4059ea6807a0a176ce390d4ce40a9072d06c53454650d77b26f824afe4d1adc89b6c69380258cb9e6208bca57e8e SHA512 de54afe24786535fc90433322cd6bccbbd130e9a1fc162e32dbc2ca2c6ff4a0277be851bce5e6dc722e32f5bea709186a1c6f30eddf0f6a9d403bf5e86b1c1d8
-DIST kgeography-18.04.0.tar.xz 10921300 BLAKE2B 585737f2730612cc088632fdaf9b834ea3daf3ad1836d697140ee672b18d706b9b13454faffb785a6b73b3ebfafcb1012179dfc148121067f855e1ee7152efb4 SHA512 71070c0149dfd598b96bcadecc3cd804bb6c7fcf31578daef4d4d22bf103850e95cf79df3faabb547743dc706efd46dbe7e7e1dec7226a0b0b6f4a5d1bc9072c
+DIST kgeography-18.04.1.tar.xz 10932516 BLAKE2B ac600ebb079073cb480d77f6a8daa4ba88b0dc03b176c6e511d2dc2afb1396c9e886e8f7ea748bfae6204f0fc4b016a522bf8cab5564c2e39f42b61e520524e3 SHA512 dd6d72a3824bdf3a12ddc9f69a1193840698b03edad0a1850fa3c5d4d599d98f1ebf6587ecea90832eca52e356433649b3d6028edd9c91fb2e74d573e138c693
 EBUILD kgeography-17.12.3.ebuild 743 BLAKE2B eb402c1e0d48c0741540dc47f4490c42b072893c2a916f642714e63f89fd98767ae0e3ce37c88689ebaeb96881a0522f6fa1d5d7159ff0a3c8e6449886662452 SHA512 9b1bab3a408adc8835c0b25fe01358af0ccf897656cacb2be0e39257948eb9259d29477bc50da5e96038ea836e3ba0b49237080ae4331c6488e090a1499b0b55
-EBUILD kgeography-18.04.0.ebuild 745 BLAKE2B 0579dc2b562fd939866d5e772d71cb050043a5d3289e6428b906c9714b388bbc8d4fa6f7dcfe4ff6712201fd1ae1abfe57fe89eb8746c711424eda84a9627210 SHA512 031550e8d91800430084a44b85e735fd01cd0df415e3aa5c8d55c320b5200e06d21a26d22d07b812cf53a28e21346ff368feaa826b6eca43d5329c33fd5b3fe3
+EBUILD kgeography-18.04.1.ebuild 745 BLAKE2B 0579dc2b562fd939866d5e772d71cb050043a5d3289e6428b906c9714b388bbc8d4fa6f7dcfe4ff6712201fd1ae1abfe57fe89eb8746c711424eda84a9627210 SHA512 031550e8d91800430084a44b85e735fd01cd0df415e3aa5c8d55c320b5200e06d21a26d22d07b812cf53a28e21346ff368feaa826b6eca43d5329c33fd5b3fe3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-18.04.0.ebuild b/kde-apps/kgeography/kgeography-18.04.1.ebuild
index 1a573e6946c7..1a573e6946c7 100644
--- a/kde-apps/kgeography/kgeography-18.04.0.ebuild
+++ b/kde-apps/kgeography/kgeography-18.04.1.ebuild
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 9f64240b3239..f7b15b469e25 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
 DIST kget-17.12.3.tar.xz 5388864 BLAKE2B def36699a85dcf35166b2466884966acff152a5db16501ecdfd99540c42658f2b63e15024b6f0a891d24fbbb856c19aa8538b42f28fb084e0ce004a4c4f68ef9 SHA512 7f4f12090ed94fa16c71bbfb1e00702fc71b145cf9fed3b3d49197360f2533cdd8f9e442caf3d41e9d1749f94156f48b935e03a9027826def6a3b334af5bdd18
-DIST kget-18.04.0.tar.xz 5204268 BLAKE2B ca1e66544ba7faa5494ba59aff1723ebdfa162d7ecc716026de4eff84245e2321cbd3db43d9691fb3ea52dc054bd8e91ff3f99570e30ae47191291084fdf70c2 SHA512 15f73d6135b48351bcd55bc5436d513c0c0c8872cb22118fb5f854fdc7afa9e279679905d9b8cdaa0b5bd7fd64824712023b39ccb35a82dd24b01caec0478335
+DIST kget-18.04.1.tar.xz 5213276 BLAKE2B ca1527e0879d2daf1ef95c752156c12e56d7a798a57943e74f08293e3163b101917bebd7256cb71e04f524dc0032bebc6a2d410dadeec376f52a61aff5fdd31f SHA512 b93a1503ee6440aebe304472c6faa88bc375b0a6279fb50b65e09a33132dc76d04793f30b2bf0ab8e8ae2b8766080044f03be58e9729777e73620cb50f72ead6
 EBUILD kget-17.12.3.ebuild 1713 BLAKE2B d94cad35694aec4cec379d31b90615bbc941a16b4ee5ee8a50a605b30c552839c043d5f3f2b2271d2052e9c581eef6109396475e8eebfc3537c92656f29ab97a SHA512 042f1e1fd81492bdd01e6ccba914a9213bbb5f8706367b1a2f17797adb62bb9a9a19584d965454cc6396a8c5c11d5f6f2e4251e50da67241f2a404b895894bca
-EBUILD kget-18.04.0.ebuild 1816 BLAKE2B dd04a78374a90ef7a45e828d7741db2207f60fe8e8b8ed79d319fea34c93b547c44fcd7932ed503d520b02c59e6aba416e82fcee9af3c81e2e39fdf1cedd0c36 SHA512 521ded887e48515cf8ee0d870c493584a23efa0e61fb4606873901a7d509f3c864053ffe5ca43f9daff200bd34ed1097278d81043231a2c24216867508ec5f5a
+EBUILD kget-18.04.1.ebuild 1816 BLAKE2B dd04a78374a90ef7a45e828d7741db2207f60fe8e8b8ed79d319fea34c93b547c44fcd7932ed503d520b02c59e6aba416e82fcee9af3c81e2e39fdf1cedd0c36 SHA512 521ded887e48515cf8ee0d870c493584a23efa0e61fb4606873901a7d509f3c864053ffe5ca43f9daff200bd34ed1097278d81043231a2c24216867508ec5f5a
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-18.04.0.ebuild b/kde-apps/kget/kget-18.04.1.ebuild
index 314ad8dce43a..314ad8dce43a 100644
--- a/kde-apps/kget/kget-18.04.0.ebuild
+++ b/kde-apps/kget/kget-18.04.1.ebuild
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index da4e3ba4ed2e..e6d3b0f5f5af 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,5 @@
 DIST kgoldrunner-17.12.3.tar.xz 4403404 BLAKE2B e075034c51de901f78c53d1156488ef4f81bf5822217e69ea957c26a83060365f037dd565a83e4eace9a271449ccf06c7da0d8b592162fa1117957cb20422af6 SHA512 b8b0e596270f9f231e79a83eb0597932bfac675e33574320bbee60290973f907f753316e336c111b370a15989fb945fa5ab762d55bc8db64c782a695a8e4eb1f
-DIST kgoldrunner-18.04.0.tar.xz 4402276 BLAKE2B 713cc9cc9dcbd9716e24692110887e626ff1a6246408f7808b95d81f2a313aea30fad70bcd951d1f60c0bcc85f81e64fc2e5380603fece1744f113f0ee73d6a9 SHA512 201a1f41d5ad8b7d2a7f95373e452e0baec28c46ddc8f49befa92a96322cfdcbc66a9cbb420e1b6a16be671a9792d1ef7157a23270f104e7b7020654c6a90613
+DIST kgoldrunner-18.04.1.tar.xz 4405508 BLAKE2B 7d38b923111ada1e84bcbffa5b024374d6d3557100304ac2faec570f24d31c3fec970ab8abd9dc02cd88079b77ef3c623ad00e157a895162026dadbe93c8793b SHA512 9e563aad5a16e8b2e15c84eb867983291912a4560df151fd17d8675b75a5fb31debcb1f3e36765f17ca9d6571b646f47682a40bcd135c8b65b749953c0f4cc14
 EBUILD kgoldrunner-17.12.3.ebuild 863 BLAKE2B 8ad0721fbcae4c372e89fcc4c69c78a22c9fb603d2f2d8779ebb2ba043bb5e98967c24740228440d28f54ba77ddf66d3bb9a466c35f757f208c67109e89d8c5c SHA512 0194780fdc4fa17261a8db7853cb2149f09fd25d6a8a5ca28e97a19eade16e1e41628d93da452c442e351c5bd9d882ba4c18e0947a8e358e30707b30ee8c3dd1
-EBUILD kgoldrunner-18.04.0.ebuild 865 BLAKE2B 07adfe33b82ed75b910c7f70dbf4100c5a50493969a849db89ee07393789d0c19e6ba9b41c8045bfbbb9ad736da5e5cb60e969a5342ffead6760ff93dfaea171 SHA512 bd4e86f8e7e1414ab02cf5e602ac5f288d47e62d78dea0751d87537f083cf01a0b241a5cdac467e62ebb9187f700504e61221623b54010330d0d32cae966204a
+EBUILD kgoldrunner-18.04.1.ebuild 865 BLAKE2B 07adfe33b82ed75b910c7f70dbf4100c5a50493969a849db89ee07393789d0c19e6ba9b41c8045bfbbb9ad736da5e5cb60e969a5342ffead6760ff93dfaea171 SHA512 bd4e86f8e7e1414ab02cf5e602ac5f288d47e62d78dea0751d87537f083cf01a0b241a5cdac467e62ebb9187f700504e61221623b54010330d0d32cae966204a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-18.04.0.ebuild b/kde-apps/kgoldrunner/kgoldrunner-18.04.1.ebuild
index 1377b14402d4..1377b14402d4 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-18.04.0.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-18.04.1.ebuild
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index eb6e19723828..84924d838bef 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,5 @@
 DIST kgpg-17.12.3.tar.xz 2817380 BLAKE2B 0ea960f82cbd25a8b0d5bafaaa4ee08f8a70a187c438dc89a113e6f6192e9bc1f70778815257cb2009c117fff698c8d5de87a23feab3c15b798a9a1786cd49b2 SHA512 ff013f675a8a28cd6771683060cbafc12ce2f11fa0bbe400c75483c3eea78311aed6a35c11e799372b79ae6f33d8bfe38410c4faebba6f3c5db693a359cc0cde
-DIST kgpg-18.04.0.tar.xz 2817252 BLAKE2B 72342ebbedd866f1a502508793a2773122b09aa66c351c7166641cc81d3256df21b256a3bd383e3b57d2ac9cb3854f3f6abaa33199bdd7838562d8402dcd7095 SHA512 b99f279aecccdb36d76bea3b244afd65ba317c95323dcf602f74fb6b6ad53487dae4aa0f1a503d999ff7cae320941cf747717c52c57bce4a361485653e1e3e3f
+DIST kgpg-18.04.1.tar.xz 2821544 BLAKE2B cc0b45559a9f25f0dca3078f963ceb5397fc1c90ed97d3b45a93703ce5697c5e028307fbf5b2e942e09b77d6aec0e6e70c1646b68de50b313d41b3eb6dea41a3 SHA512 516f074b161fd545383bbd58e86ec33f7d4e8c654138af14a9e3cec78e5521b62b85ce3723474599b4377930a6bc9e1b0f09b6bb56e063c8381ac7bf441c8e35
 EBUILD kgpg-17.12.3.ebuild 1275 BLAKE2B 77b4aa15a4b469e0510d1a30bfd3cb7c5b618ba1085b35f6f1b00c23f03e79a868a32db2191443552eb7f3cb37c56358a0232cbc1eea9601528147d0cd7169ff SHA512 7ba158f0997cd7f36f9944928f3946f5526d0c9b356667e19a263d374e8f9eabc024b1c82eb591cae49c189dd4654339bf85a3c7cc2dd25d1858fcbe263930b7
-EBUILD kgpg-18.04.0.ebuild 1277 BLAKE2B f3f78e4a5b985339c81bec48fc4c8d0de639ee60aaee91d7f2437fb0188f229577d93ef2b21446e94cb4d801eba99a4e1c9c7b8c16a69689e077dc335c2b2e77 SHA512 b2c6c0702e4c46af859b4e13eac465e404ed7f2848b82350603916f5b1030ca3bc62aa103137b337ccbce081077d7f3191199ea4564cdbabefae374f0fae75aa
+EBUILD kgpg-18.04.1.ebuild 1277 BLAKE2B f3f78e4a5b985339c81bec48fc4c8d0de639ee60aaee91d7f2437fb0188f229577d93ef2b21446e94cb4d801eba99a4e1c9c7b8c16a69689e077dc335c2b2e77 SHA512 b2c6c0702e4c46af859b4e13eac465e404ed7f2848b82350603916f5b1030ca3bc62aa103137b337ccbce081077d7f3191199ea4564cdbabefae374f0fae75aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-18.04.0.ebuild b/kde-apps/kgpg/kgpg-18.04.1.ebuild
index 9179f8168592..9179f8168592 100644
--- a/kde-apps/kgpg/kgpg-18.04.0.ebuild
+++ b/kde-apps/kgpg/kgpg-18.04.1.ebuild
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 9c66d2e0bf86..79ec67e3d95d 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
 DIST khangman-17.12.3.tar.xz 6456648 BLAKE2B 48bd56b9bebbc2f91715c5b1d33b9f3c32908a8fced9f609c37a0f91cd431d9bb6dd5afd5cf452074662c3fe0f7b1017809918b4f2f00fbab94a447edf6f8016 SHA512 9b2759a272089422e1929854cfa584c356e3b69a6f58a26d3f610961cf36d581f06b41e173e19783c80cca4d9adb0f239a98316dcf36f82ecc17fc829d0aa5dd
-DIST khangman-18.04.0.tar.xz 6454700 BLAKE2B 365c8db44ec290017b7f58505cf18f5745ef6d0cb98a9b3ec604d2f0bd0f5282ff7f7afb60314420ae93e6c70f128b24b31e0783345421b275deb0bf9b44f1d1 SHA512 dc2564b3b8695e8fa7b9ccb427498698b111713cb5f2a812be8614ac41b28be45e3ae0af4097f28e8c21e0c73fb6abba2bb1d74426f4f38310c7bfa6f0a26156
+DIST khangman-18.04.1.tar.xz 6464020 BLAKE2B 3ca155211b8b59e7b8837a3cd10d6f7697b4406009fdb3e5189e979185d9c45313e4cd0ff4a4871291803f0ddab24261c2f53c564966ad585b55db53d310d85f SHA512 300a1cfcf9b35facc765001914dcf639cbfbaac9fe263f9741a93c26e092fa4cc5cef090893bbaa115eb95393335fcfe147cba594dcaa7870c185e096a58210c
 EBUILD khangman-17.12.3.ebuild 1039 BLAKE2B 562fb8187fc5281462879c78a3ea6840a9328cd242557b470d5b099acc8d692f43288068b6e55aefa02d62f75bee5cee1d6819d2b11a39ba706f86973650afeb SHA512 695ea6506d595c25d3cc7b8f3db3a3cbb6e6bf6c7a43938eb0f5d11fd862090efd374b0ccd9c1163527a18fefb38446f1df254bb1594f0950fd2721ae2a278a6
-EBUILD khangman-18.04.0.ebuild 1041 BLAKE2B 9ed11aa400845ca9377bc3a25671f853076e5f6572cc6d8909748677e8a6485790db332c07175e247bd8a7b91606c8d29a33bb8936cd07688aa3541c27b91d20 SHA512 26d8fc36ac7f2e6e18ce909bc89da18f5ec504b2ffb988f08dab7db2a34aec767c550ef4f91220bfe17c3492a132641dcdf5eb0df29c44d0586ce452012db8c4
+EBUILD khangman-18.04.1.ebuild 1041 BLAKE2B 9ed11aa400845ca9377bc3a25671f853076e5f6572cc6d8909748677e8a6485790db332c07175e247bd8a7b91606c8d29a33bb8936cd07688aa3541c27b91d20 SHA512 26d8fc36ac7f2e6e18ce909bc89da18f5ec504b2ffb988f08dab7db2a34aec767c550ef4f91220bfe17c3492a132641dcdf5eb0df29c44d0586ce452012db8c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-18.04.0.ebuild b/kde-apps/khangman/khangman-18.04.1.ebuild
index cb57c5103efc..cb57c5103efc 100644
--- a/kde-apps/khangman/khangman-18.04.0.ebuild
+++ b/kde-apps/khangman/khangman-18.04.1.ebuild
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index ba443b5e6aa2..6122f0fea0ab 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
 DIST khelpcenter-17.12.3.tar.xz 3024356 BLAKE2B 97f0ada4b68485204d0a239932a581c3e89312d5e0f5d991d35983e17ddb65331660e8a4d134594880989c17d36ad3a2b21a9ff327fc171aec7fbfe57e0489f2 SHA512 32febc1984c44112c22877e05742c6e7bbf0933ada1708305687fb6147e9bf3e06141cb2e88d8d3a4fe6442d983a56d4dd0e813f05e8ddb8b7083826575bf40d
-DIST khelpcenter-18.04.0.tar.xz 3046868 BLAKE2B b2a1cc9d79266cd7076b45f00da8ed47f782a755ce2db89a32535aea61a09d2ed3c9e489b566ac2cabd770effeb5bb34e8ea3a84a55416a2592e7c16f05d8328 SHA512 51fbeb88dba836d53f475325ebcd30a005628f4331fc3725cea72954dbb04e00bc3d3c1214ffa6e5b6d62de5ed9a733723e8a2fc62b22289a5cffdc0f8d256ea
+DIST khelpcenter-18.04.1.tar.xz 3045748 BLAKE2B 0dcb7863bb6bcbf7999b52d554419cc5af9cd425661d0d7bb2978d3462c01faf3a0599a55fde996826c2883e4a7fb638e48cb09b5590d2b007ea934761ef5d52 SHA512 f99273d6d7dc9753b973112ede2dc606fda430d0f02f7a0a14e8db6359d91d4c73fcb1b6573da2a2363aa83e397e2bb1512f88eb5c40016850624f22065022f0
 EBUILD khelpcenter-17.12.3.ebuild 1074 BLAKE2B b8398202280e0f2022e1344b8dad8bd08d265751f6ee1cdae608b0629a636064b1191e2e9c66e034f5639c6b85d5bfbe4f5155c77679227bd3a045b0bad1f58b SHA512 95f51a67a22432bfc25d0885d511405d50573443211e73a4504f3e9c82a9f544493aec6598334371df026ac67f2d5458d5f6224b6d1779c0c4db5dcb9886b4ae
-EBUILD khelpcenter-18.04.0.ebuild 1076 BLAKE2B 486b0db2c0b7c4e56c202eb8a20011af55e91b9e898f843a70442ec051534a092d4ea08504f33c3dd9a2d4732e1ecae20df1f1a1f27bbec56e9e055be95da9e3 SHA512 f3bc0e7f5bf85730e8a81911932ea2280e4c5240e1d63f545a3ef487dac21a8d8ede2cee67119c33915ee1e0a8aa94a7515013a7927bb34493282dbd4404b554
+EBUILD khelpcenter-18.04.1.ebuild 1076 BLAKE2B 486b0db2c0b7c4e56c202eb8a20011af55e91b9e898f843a70442ec051534a092d4ea08504f33c3dd9a2d4732e1ecae20df1f1a1f27bbec56e9e055be95da9e3 SHA512 f3bc0e7f5bf85730e8a81911932ea2280e4c5240e1d63f545a3ef487dac21a8d8ede2cee67119c33915ee1e0a8aa94a7515013a7927bb34493282dbd4404b554
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-18.04.0.ebuild b/kde-apps/khelpcenter/khelpcenter-18.04.1.ebuild
index 7a7d14ca377e..7a7d14ca377e 100644
--- a/kde-apps/khelpcenter/khelpcenter-18.04.0.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-18.04.1.ebuild
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index aa4f296e9770..f58229363233 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,5 @@
 DIST kidentitymanagement-17.12.3.tar.xz 147912 BLAKE2B 84c2252caaa7b30145910fc6012018e325ea5013dbe5f780504a181d067ff3279520a0e64385861130e6eaa350bf44edf14890e01bd17621026393eeb7ad98c3 SHA512 3ab1f0ebe6f993a5c1d8bc6b4952f7ab99150ec9938d4599c3b15451880089f385fe4775a950bcd948ca0926082038c47ddd3dd1f3ca5e9dfcd625f4934a66ea
-DIST kidentitymanagement-18.04.0.tar.xz 147884 BLAKE2B c1adae15b3519ce760cfdf680fa68e310cbec8a09808008bd9fb18ace84d1c34719b0dc84bcab2f73dd56a4670ca26f1c51da537d7d5ef226bdcb25f368d8481 SHA512 5eb71a792c1b987ea3eb7d549dfd2e86e91a9e50fb679e5a62cd9dfd0e3a9253496fc5f692c5b5942ac89119ff365b4b93663df7f3319275037a74f2e60d9c92
+DIST kidentitymanagement-18.04.1.tar.xz 148084 BLAKE2B 4579656e7d0d227f7d7034048a7f7939403f61bf7bff7307af046ac7cff5a1b4d6aa306a1615aee76babc0fe33d19cb8a4dcd69c618408206fbd00634eb62b07 SHA512 fcf40085f5f12b21c371308db378e0a15bae45389597eb224840bc43c08e8add479414f5409873f9ff8e1aafac462084aa92d3144b6e096e8061afa4aad32254
 EBUILD kidentitymanagement-17.12.3.ebuild 768 BLAKE2B c958331ed3a4f7db3328327f9f42f9e1d52b8b220062f74d787cef3a93a9019f1ea98e0c5f3205a0e9d7f053cced1bbc665d09e1ebbccf93169e45f995121914 SHA512 684a847d7e536f9c19785d0a1cb3bbd473ee3c75bc370b6a492bca0eb4b27769b310f87e3033fd73dad99f292dfd54a891f7145e2ed5af3be6899ca23f5f1b9f
-EBUILD kidentitymanagement-18.04.0.ebuild 770 BLAKE2B 5c57835bf25c9ece4b51ff3f3b728d3f32316c1446c3841432e18b4449cb8e701eaaff6add43f87c3758d0d1d144de9fbb605d31e983244f61861796c4462f9e SHA512 a60c9d8eb988c69225c6db31ce360b7bd096e40e489899f9c0b619591d4dd28fcacd2ec5d325ad76eadb27fe6219eaec317b1cb5d6d388490964271683462dac
+EBUILD kidentitymanagement-18.04.1.ebuild 770 BLAKE2B 5c57835bf25c9ece4b51ff3f3b728d3f32316c1446c3841432e18b4449cb8e701eaaff6add43f87c3758d0d1d144de9fbb605d31e983244f61861796c4462f9e SHA512 a60c9d8eb988c69225c6db31ce360b7bd096e40e489899f9c0b619591d4dd28fcacd2ec5d325ad76eadb27fe6219eaec317b1cb5d6d388490964271683462dac
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-18.04.0.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-18.04.1.ebuild
index 9cc840613bb2..9cc840613bb2 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-18.04.0.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-18.04.1.ebuild
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 75799eec07ed..3a37a3151cee 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,6 +1,6 @@
 AUX kig-4.12.0-boostpython.patch 1012 BLAKE2B d2dc90dfbdc0e361faef3506f32b37afae4a35a8c1ed0c16f0e52b9b56b33cb4b355ae313b2699125764508008bd75cb357ea6a9b020773e0faf88f208dea9db SHA512 0e490efcda1d61b9053fd4eec45e872db62b2f1f543378fb397bde65cb79e575a9268a2e2dd18e2b5590f60ba6f72954612191d0cfa1b57a697b627367a7c18f
 DIST kig-17.12.3.tar.xz 3589648 BLAKE2B ebe02b35f3244d3e9f262dace700f194b8083f0f3f996c12b466ae1f722085205bc39e8a743ed201f5e41c5b201cc512c2b5700f6c2a11d3c596479c718f9b2a SHA512 bf6201c74627e3892a584c455875f6aeabf466aa092ff35255423e152ca59b9b4d364281c740ba5f65ec3b6a208628ed229368c223193c28ae0c7fa6a21aee36
-DIST kig-18.04.0.tar.xz 3587972 BLAKE2B 93fc6f36faa3831d013b9d34b81fd215e5dfb11f0094a57ce49c7588f9eac8618ffa44f198b188ffe73707899a3c18c379159b8d011599cbbccf0dd5c28c8f91 SHA512 1afb7d73ad94670ec342091546aa0a91bbdaea37e0eb40f9c4d35ca17ca50a7a0e28fe2995b4aa3bfc4a1c9c226e14a1d7ded392fef6a56889e11b3d7c458d46
+DIST kig-18.04.1.tar.xz 3592016 BLAKE2B 6074d66cd8c2637d47c3099e58dc9fa679524ea0fc91eac76abee743502ccae20c1b8ffbe5706627f1e08e3e1814d4482a1bfb36b4ef6589cc5f2b84b997f12c SHA512 53a7c8d391629f387d99f47d7e710392a61d49c30395a0381927d949b70c237b1ec3cd200d5a94519ac39deac86a09354c0bd6a43c5839a1bb61eabbba604e03
 EBUILD kig-17.12.3.ebuild 1499 BLAKE2B 2b4a6e92492c904751cee9d89337a09e6eadcba375167a2c47e8e391b647a7cfda57b9fa9c03673fdc601f7fd636f486d9a752875cf18834d33079ab933ea3c2 SHA512 3f95555910729514ab7534c5017c33396bf1df644ce89961e339997874e859237ff3808846f5b963831f5023e7e86a1248ede3da3af4c9790e1812f94683f432
-EBUILD kig-18.04.0.ebuild 1501 BLAKE2B 4e253b1af7946157292a42f9386d49629901f0c0be646584d75ed70b86e8e323372df58fae69b0b43b4691963de94f9ba12b6e624c1037da13db03311d100b3b SHA512 519374484f25b8b838c0dc2d4b739be2b1e30e6901748dbd96a9a2d560886c1c0a7be4b120a98786e0d1fe56cafb38583689fb221154afb90d4c06088fd2725e
+EBUILD kig-18.04.1.ebuild 1501 BLAKE2B 4e253b1af7946157292a42f9386d49629901f0c0be646584d75ed70b86e8e323372df58fae69b0b43b4691963de94f9ba12b6e624c1037da13db03311d100b3b SHA512 519374484f25b8b838c0dc2d4b739be2b1e30e6901748dbd96a9a2d560886c1c0a7be4b120a98786e0d1fe56cafb38583689fb221154afb90d4c06088fd2725e
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/kig-18.04.0.ebuild b/kde-apps/kig/kig-18.04.1.ebuild
index 7e2644a1fb74..7e2644a1fb74 100644
--- a/kde-apps/kig/kig-18.04.0.ebuild
+++ b/kde-apps/kig/kig-18.04.1.ebuild
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index 02a8bc46958a..a6118099dfc9 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +1,5 @@
 DIST kigo-17.12.3.tar.xz 5222512 BLAKE2B 24fa500c8b5b973fdaf266f710c120a824e7e7832c1d973f915c745cfa5a6528dbfa4c3fb0b62fd80520b6ce8b8da1149c1b24438c11c679bb08718ba34ef9a9 SHA512 23e998bf600b7cd97b92ad5d327448b5190885c1470286e0c1c76755b5cd4d278806010854ea98b7ac71ba6776b6748895f62f4c9c309adae44a97c5c9295112
-DIST kigo-18.04.0.tar.xz 5222516 BLAKE2B f9255a6b435d1ac5ee97bd8db42898f15f14dadcc89120825d917a4640537efca947e8eb973058661d6f27a3c3da5a2fd117a0d112569bf4431ada8e5755c05e SHA512 f580cd32382f50ed82b9907a7134889d143ebc1c2f9643a16e1f1f4404cab7147b0c9f315847b6b2852a7ec7691cd7d58da1b24b975c7569f8d06d2bac073376
+DIST kigo-18.04.1.tar.xz 5224124 BLAKE2B a9fa992b19e7d07c636585f32acffb82756dde235b048697e207557d324a96b2030308d70d549c7a0064a7f9bece98f27ae1f2a7ccf632f9ea9b5cd2220ffbf8 SHA512 500107ab519a9f8969a84eae5d5868f2147f547dd8ad2c477fe9728ff8eeb42f999e4a11b65162c24997c4a5b843542a30ee6159f0f3d18808de5f53d0fcea0d
 EBUILD kigo-17.12.3.ebuild 853 BLAKE2B 317ccf14cb550b706e68ddbcd4ae5f155bb53afcad1421b8455173e7847586a8f192929e41a186c73d5a2b01fe46ee2b273491847b10d36e4f186806850e4089 SHA512 da2004f56ef18d098ca8008a12a320229021fc1809b96f237c61a3b1a88311fabdb927c4c609aaea5a6911f47315caf96578f6995ab3555b8dbe78c70d6ad7f0
-EBUILD kigo-18.04.0.ebuild 855 BLAKE2B b7b6b082300f6584f3156865dd32934aa948593c333a3b9b6b77adda18cb267bebdb09c3237423762f9898bccc1a0be561f7360be9e2e12b4448bb251bb555d3 SHA512 72a0cabf0383e7eae958f0b5812afbc7a9e7e868efb38ff2d81274d1a41311e14e7339c74d84f167929d47adf0147227801addccb0ebf2ab8db89ccba3cbe74c
+EBUILD kigo-18.04.1.ebuild 855 BLAKE2B b7b6b082300f6584f3156865dd32934aa948593c333a3b9b6b77adda18cb267bebdb09c3237423762f9898bccc1a0be561f7360be9e2e12b4448bb251bb555d3 SHA512 72a0cabf0383e7eae958f0b5812afbc7a9e7e868efb38ff2d81274d1a41311e14e7339c74d84f167929d47adf0147227801addccb0ebf2ab8db89ccba3cbe74c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-18.04.0.ebuild b/kde-apps/kigo/kigo-18.04.1.ebuild
index 3dd95da49b6c..3dd95da49b6c 100644
--- a/kde-apps/kigo/kigo-18.04.0.ebuild
+++ b/kde-apps/kigo/kigo-18.04.1.ebuild
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 28a1e4d92545..f7d7958f47ac 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,5 @@
 DIST killbots-17.12.3.tar.xz 1166204 BLAKE2B 418c9e86420e9d8b7014e949f2afd910503e9cd90bca71034af1f99c26f5a2bbc339e36c1c46df091a088a71c23a1294dd04cd31c600ebbc9c1fc31050148686 SHA512 327229cdc3f2dfffbc3cafa152b899081d66e0fd7560251c948cbca0bf961bfb4df16e3cf7eacef281278441a4eaa58985197942d653980d6f3ed82e754b7cc7
-DIST killbots-18.04.0.tar.xz 1166208 BLAKE2B c089f1b29099b0b1a020063e8fe72626cebfe8d204cbdc9b2c043440e0765c6f40a2d19accaf622dbeb51d99473947a1e32924fdd1a23280d56c2d431e476456 SHA512 0a3dd8b65aab054a093b1c1ba90334c3b3d9da111ac13a987780abd12d8bb2049968aed037c41f6e55f9380a6c92fa6abfbf74d75816ccd8b33eff3e1fb41296
+DIST killbots-18.04.1.tar.xz 1165244 BLAKE2B 715fc5dfa598a1bea92b455b7dedbe52badc6ce5bef987c1e97650944000b5fe6c93e9277ce0d5725469e0d1ca3b568bd6e31b29894ed910ccb573da9a0929f1 SHA512 db51ab4e60d99765e0912e5b793d01155236187df1938b3072210d2e2e4b12663759ab243acbc5e0526547d21062997e04a26982b3a1a2228f368fd294a7fc42
 EBUILD killbots-17.12.3.ebuild 715 BLAKE2B e8df4101325f24ec3ee979166690ef2b70ba9c0fc409149f5cf9c4b5d02d3fc68c70c6d896956fe334c1d6870371b46a2de36455e157c82c95b4c7623cc9ab0b SHA512 70888187c4e26ea0e12baedfffb483cf0b2b15c372f8e4241344f2cdeed0448ea1b930867d7928060944fd03132fd29d3aaa1b50b8fefaf8a5dda55ced792e94
-EBUILD killbots-18.04.0.ebuild 717 BLAKE2B dc4b87bdf1ec9849a50259f97d40bba1ce533d5602fad5a0946806e7016c7dc43a6855866d220c44b09fb0e53e746d415964e7a48e899bd655e4b5d9137cabad SHA512 d56d56fe75a815f7eae1c06f02592ca819ea7bfb06fde0cfcadb1d268e0d9b8e58000e7c252794a7be740607f4ecaaff39cb469e2824ee33cfcd3e34ad12efda
+EBUILD killbots-18.04.1.ebuild 717 BLAKE2B dc4b87bdf1ec9849a50259f97d40bba1ce533d5602fad5a0946806e7016c7dc43a6855866d220c44b09fb0e53e746d415964e7a48e899bd655e4b5d9137cabad SHA512 d56d56fe75a815f7eae1c06f02592ca819ea7bfb06fde0cfcadb1d268e0d9b8e58000e7c252794a7be740607f4ecaaff39cb469e2824ee33cfcd3e34ad12efda
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-18.04.0.ebuild b/kde-apps/killbots/killbots-18.04.1.ebuild
index eb0d9bdadcb2..eb0d9bdadcb2 100644
--- a/kde-apps/killbots/killbots-18.04.0.ebuild
+++ b/kde-apps/killbots/killbots-18.04.1.ebuild
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index afb11f748db2..89b20474f551 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,5 @@
 DIST kimagemapeditor-17.12.3.tar.xz 1053900 BLAKE2B 07606cc923bf586027111797822f61c4a9bb04bb26216e52e7970ace5a6729f2b2493b2c89cc1a8945ef3955273b7684ce085cb2268f917873a682343b1ac9e0 SHA512 5a8922131f5847bca4100ced10d8b02e4d0b641f14afa0df7162ac71682bc19bed499515df57e40ce61f1c30bb3593e8c68ee5c650d60e9e62d390a10dd12bbf
-DIST kimagemapeditor-18.04.0.tar.xz 1054708 BLAKE2B 69c459953fb8fffe7bb4cfdeb52d972c8658c3fa7ec8fdcc26cf9d26a58f778a13243ef4e11da12f66a9545dac60fe9b53828ecb08eeb37d095c716028b15942 SHA512 e729952ed3580764244a082ec4857e7dfc9dd53230bae2f6e911d54dffc5078810f27875b122f3b1f0d14d0ab7e7658e0eee5d1660a9eef4202da3224de4fa4d
+DIST kimagemapeditor-18.04.1.tar.xz 1054836 BLAKE2B e6271b2ca76b0e73e5a266a868ba5b62b94b16d55c5bcfc0f299ccb09797deb8baa0d8f38eaff6f8921d1deccea508b797a00ad4cf81d87e5b961eb555b842a1 SHA512 7ffd57ceb36e72194e9258cffd2a26c269c3cee53a2c4b86144b0dc39866b3ac7fa35179858c2d1d09c27ea8bd190c949bf23128d42b898c7e67343e9d996e3d
 EBUILD kimagemapeditor-17.12.3.ebuild 803 BLAKE2B 67094a945e9991e016c3b2be781596040669dfa639ed51e4325be9b413bbec359fb128f069a5e2230f78705f7fc23509545c1f04e66109f85adee60a63ec6b43 SHA512 4377f373dce195b367de3ad344da3c9600f1ab840378eb5c98530b0c3e31763e45dd70d5fad6936f2e4c3034d9a97a342d0147ead10a6267bef1eba87fe081b5
-EBUILD kimagemapeditor-18.04.0.ebuild 805 BLAKE2B fb2f5741989795260a1543150fde839c273dd8c41d33a0b9e20b1cf48078f17dbbac54a3f543720a4a66ba9c12538405f33f234b5bf52c890d6f36ac6d0e1f6a SHA512 09a4ff56d3833b12d11eea326eacab5ddebde43828ca947ee1635655d8efb9d5c0782bd20d78dcef66bba939bf6556074dffce941d37134636df9f5d133896db
+EBUILD kimagemapeditor-18.04.1.ebuild 805 BLAKE2B fb2f5741989795260a1543150fde839c273dd8c41d33a0b9e20b1cf48078f17dbbac54a3f543720a4a66ba9c12538405f33f234b5bf52c890d6f36ac6d0e1f6a SHA512 09a4ff56d3833b12d11eea326eacab5ddebde43828ca947ee1635655d8efb9d5c0782bd20d78dcef66bba939bf6556074dffce941d37134636df9f5d133896db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-18.04.0.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-18.04.1.ebuild
index a457413fa6e2..a457413fa6e2 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-18.04.0.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-18.04.1.ebuild
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 4eb6f92c4990..49c57ca5b0d8 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,5 @@
 DIST kimap-17.12.3.tar.xz 119720 BLAKE2B 49bc60c94804735468f491f6d50308f580cff8a7f19f95cbb0e2168a6c357783ecc1efbef3eab6a8dc5f841bb5166116690e2542fab51dbfb86f4e8b94569a03 SHA512 588a681bca53d4a0b961ba6670007c1d507c6622db1e3c058ec20b1bdaefb603fb6d071931ac988916b0686d3a020a86aaf96ddb29f1e75355f53090b79aabc5
-DIST kimap-18.04.0.tar.xz 118764 BLAKE2B 93e4122d77c7d54de3c57486d6952879e83a124e5f84407c827c341dab9e3c28439c8978ec0681397b6f7db5cc075a72db43da0a1190587f3e9b0ab231e939c4 SHA512 7e032f3a8a00c35dcf8c6677db7deaf9980735eb8daf7308bebbf2660485a164ad53b36ab4acaceadeec5f8587f6d70cddbb1c3d088eaa51a35472ff4de0afd9
+DIST kimap-18.04.1.tar.xz 118864 BLAKE2B 102b069eb4599f2fd59807144cdf628802cee03f80dc4ce57689dddee0ba951ea6a98713dd39adc406497b4041b191f774a5028b277a486a50db109953037160 SHA512 09dfca618d6911a2191f2280014e0c5f126df817a901ec8a393e8ae83f6666a99998ff828ec3552afe8497992ab6fd81697f03ca89ec47c3cfde798e2be274ef
 EBUILD kimap-17.12.3.ebuild 721 BLAKE2B 6cf62bd63ba1cfffc493e50b6ab7310ccfb8559e537315f17fac45891cfddcc67d3b831e4a8e8bacc686cde7898598c873ab70bbe080434e70426e2e4f31b3b5 SHA512 2ff2f8668fdc35bf1771a88c1be2816ecf5bc352d2c93b3d751037ba4f486552f223a1776ba0ecd93da94a2115edbf9ed2af6f5160b3cb35e31248dc0d25127c
-EBUILD kimap-18.04.0.ebuild 723 BLAKE2B ff74601211e0f90b30ce69f1daa4681b583b45f049455cb3fd51d2d704d28bd2eefcf3245ca7577834d366ecf215363ddc8951c6ac3debee0d8de5c180c94537 SHA512 81a73956d8983e4e526fa3ca3256e345a0c6740dcb1939e177a59212d3beb13716be5ffa5d0a788cc4e88f306b3f2c7c9072975dce8d89ec18fc2ae0f2ff8e85
+EBUILD kimap-18.04.1.ebuild 723 BLAKE2B ff74601211e0f90b30ce69f1daa4681b583b45f049455cb3fd51d2d704d28bd2eefcf3245ca7577834d366ecf215363ddc8951c6ac3debee0d8de5c180c94537 SHA512 81a73956d8983e4e526fa3ca3256e345a0c6740dcb1939e177a59212d3beb13716be5ffa5d0a788cc4e88f306b3f2c7c9072975dce8d89ec18fc2ae0f2ff8e85
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-18.04.0.ebuild b/kde-apps/kimap/kimap-18.04.1.ebuild
index e7bcd2eec264..e7bcd2eec264 100644
--- a/kde-apps/kimap/kimap-18.04.0.ebuild
+++ b/kde-apps/kimap/kimap-18.04.1.ebuild
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index d1f1cff0ffbe..fd8834f390e2 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,5 +1,5 @@
 DIST kio-extras-17.12.3.tar.xz 555544 BLAKE2B f8821e0ce5c3f6a7a28ae6a5d672227697efec49b9841b272bc9574aca897bbf104644ea303f11749161c68543206407c26174141ae31c43ca6b403c7d39c179 SHA512 a7d13516646954a00b03d1284c6d93ae71ec9598d03e3f500a6449160c228be9e41aa2351b71522423960e5321cc3a30a46ac6d2ba9e8dbad043def2804b57d5
-DIST kio-extras-18.04.0.tar.xz 549904 BLAKE2B 7571ce84f235fa2ac153249fcba04fe16dea66558d3ede7c1c554463e212b44e1826879b5bb30e7f3976cde9df53ff111ae48d1fa2c93797792fff7f6aa6aeef SHA512 fb7d8d9588625f223c27a5721859ac3b7c245733cb0f7270969af6aaab7202a1c1b7db3e373bef7138af98af0e9211421bfce3dafdd7d9348979a4479f2f6872
+DIST kio-extras-18.04.1.tar.xz 549832 BLAKE2B 5771114528fbdd65a909d8a9674df1bf4160e3d7f5716245d5aa9cc5a6dbbb31bf07f45c22106316bd090bf48934fb7d866a4d97fa192a962cb5d398d82b4c08 SHA512 7a08fabf8ff3cc03b02e88f38e889798489e1997c6678635c07c7597bbd9142450030e28958d4ccfd5e1aabc2ba0b213faa981fc30256d7edb76217ae99e40bc
 EBUILD kio-extras-17.12.3.ebuild 2296 BLAKE2B 765a560c155d84d38e9b2112ffc9bbb8c24b25fbf77e45a82b263c4a84ef0931b3d42f75f37416b685ce630e0988bcde065c513ba70e16cfb76dc380b34781b6 SHA512 6d7d7f1f347b11b038d6d0c224f26762068b495b90447d82f2ca4b9e54f45529ffd37250d60a1c273e5e8e95fc3e97e819d7381e0ebcf3ce003a238276d42bae
-EBUILD kio-extras-18.04.0.ebuild 2225 BLAKE2B 1fee0b466ed3ff3feb108bcbfdac696749c94b550bf17d9b5e86f86359926c8b0404c29341192a4ee1a1bea14fa5fe400b0355cf63ebe370690d150e396aa42d SHA512 67b691874315de0d52cadab2f404d54d63b1677f660c80cf2cd8ee966ff2967f83bf46080a74c2b3e03ca600af93ebd652b61c3f5240b1010487659d96acd818
+EBUILD kio-extras-18.04.1.ebuild 2225 BLAKE2B 1fee0b466ed3ff3feb108bcbfdac696749c94b550bf17d9b5e86f86359926c8b0404c29341192a4ee1a1bea14fa5fe400b0355cf63ebe370690d150e396aa42d SHA512 67b691874315de0d52cadab2f404d54d63b1677f660c80cf2cd8ee966ff2967f83bf46080a74c2b3e03ca600af93ebd652b61c3f5240b1010487659d96acd818
 MISC metadata.xml 679 BLAKE2B d5e3be772a13920bb093a4314931eac48f5a398582794ef769869d4f1e7c0d8136a12ebd1ce2fecccaaae99001194533b6c08b34a7f1a1e33c711e233428997a SHA512 018a5237fe9ace1ffba82c4dd5d3a4ce6228244476a163fb01ab5f914262cb20ff77d58e8dcc99713071ceb1764b9bc24fb61a8713001059b057963a9620abf3
diff --git a/kde-apps/kio-extras/kio-extras-18.04.0.ebuild b/kde-apps/kio-extras/kio-extras-18.04.1.ebuild
index b884ebc08a3d..b884ebc08a3d 100644
--- a/kde-apps/kio-extras/kio-extras-18.04.0.ebuild
+++ b/kde-apps/kio-extras/kio-extras-18.04.1.ebuild
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 53679836160e..daf088fa1dc1 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,5 @@
 DIST kiriki-17.12.3.tar.xz 325916 BLAKE2B a84aa79acde6f9ed16e9f92a7e64b3b479e161e8f394321fa929c6da9083215c60bae64fce92d4a3f59acb59c6eedc95365e58475788eb852aa0ea0981bf0877 SHA512 68ef87ee08d3ece79a90eff2e231851bf0cba0c8dda335be68716188646c6b2c85bfe45b0d159d063ef80e51b096e5a8872037f82a79250dce7cb64139cef1a0
-DIST kiriki-18.04.0.tar.xz 325888 BLAKE2B 5a9197fb74dab9f570733565a86a728df1b3bd98a979011d51b72d4a88e34ad8540d9f3d8788f337fa397e2f33ecf1b0827acec2795f83dc78dac26eb99adbe8 SHA512 29fc9833f677ddecbafc0c696d3938378e4cde5948d295fa75b126becd60f2c6ef3e0f77074725f36bcde9aea4c609092241d8426b36e02d03f71be145cdb3a2
+DIST kiriki-18.04.1.tar.xz 327084 BLAKE2B 69987c39ff21a5c03c4972fc62c91833dad9a7da67ca51769400d1b7df9dac4761102c25e8e22be53554377840c4cecebb99345663b1b4012dc3f90e9791a3c2 SHA512 a230e09862fa11be20c780d671eaa47d2168ac468d89680fade39e5c012ea634243d7b5e79554cb70b96f7bb5d24b16b07c99887bbfe0199ca0c9f9293f9d86f
 EBUILD kiriki-17.12.3.ebuild 780 BLAKE2B 3ccd5c6a3d359aaea020421a3a9fb70cd37bdbd012fee6e8de431c47b96881e118a826c4b4f481890e705690177116c1cd97265994b56455bc0a42362dd703c9 SHA512 54c9b931af8bc19c85b70736a8d459b8df1d798db8732f7f55fd26e26e8ec30e31e8f4d83dbc02b48a05a635ba9af00f95a9b6be6174392457491f6aa1a7ac46
-EBUILD kiriki-18.04.0.ebuild 782 BLAKE2B d4d941f4735a95ce94622cfa97ffdd8d1528c836f28d6569cc35358fd0195566373a2581686f9793457ec04a1ad61495f2c54c035c9fb699af106fbf391bcd81 SHA512 5a251124e885dba2fd70f11b412af3a060060b8fbb4f06cc65419d5c22c7d1463fa4b4d451cf768f0a34ed556f4730e071eca2ab932629f6a5eeb5dbc9a45b5f
+EBUILD kiriki-18.04.1.ebuild 782 BLAKE2B d4d941f4735a95ce94622cfa97ffdd8d1528c836f28d6569cc35358fd0195566373a2581686f9793457ec04a1ad61495f2c54c035c9fb699af106fbf391bcd81 SHA512 5a251124e885dba2fd70f11b412af3a060060b8fbb4f06cc65419d5c22c7d1463fa4b4d451cf768f0a34ed556f4730e071eca2ab932629f6a5eeb5dbc9a45b5f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-18.04.0.ebuild b/kde-apps/kiriki/kiriki-18.04.1.ebuild
index b0d97b3b53b7..b0d97b3b53b7 100644
--- a/kde-apps/kiriki/kiriki-18.04.0.ebuild
+++ b/kde-apps/kiriki/kiriki-18.04.1.ebuild
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index 5e5431add389..a08f90a52c14 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
 DIST kiten-17.12.3.tar.xz 11556408 BLAKE2B 4e6604d0fe67cb6a10aa43f8339bc161ff66c7699b26c88b4b973de84fdcbce2bcd448f82e670f6c7e5f5f940ab4707aca513c671cffc5d840b5265d30dc21d3 SHA512 aa84ca7fddf98eceb2215f4040b4494f529d7270f9b0157b916e3e9e97efbc9de0c6c7483d31f99eb17ac9a7c78e6765be2853090da9e86b379678678b8f2fa3
-DIST kiten-18.04.0.tar.xz 11554288 BLAKE2B 756c12bad031c473e30658507275ce1c8af38601b05327bff3725901822ac34733a1e47ed13c3b4384d808f81e1bb9dcb44e921c6deb11a30bda665b6460b1db SHA512 c982fa20104c14d4fa676309b8c864d66c421b1f7697f92487d35d1162540cf2fc87ef706c200f521f086bf677766a7d4c47ef136a61b73f6c5803793f1467d5
+DIST kiten-18.04.1.tar.xz 11555176 BLAKE2B 21bc7e2fb57fcb5660f7b3582d2d5e4be724f6861e77d6b10b760e4aaf3ad6c3f27591862d80b729c7fe43abdf4a3a3f3d0bddeeee8372a10ace1ab3415c7fd7 SHA512 7ebb52935b7a0344b51f950aaa8b546c442aae6a6abb4404cb0a29d6ba207f8474d1e5bde2cb015b815e65fc5cc11d68abda917db5bde909d2448cc30d024c1c
 EBUILD kiten-17.12.3.ebuild 811 BLAKE2B 4e2610272301095da9b26ef32278393ac8db2affd5bf3b79baac0e335d5907a721a8c74717a02b52b232cabf41f206f54ebd155ae41abcbf4bd5650cc9dd04ce SHA512 c77cf3e29c5437897a144100518da7012531ee7cc3d5cd628481be988b446feab3f193ebc877aa96e7a2263acc1ddc1ef089e1e0286aadd30972f374faf5ca22
-EBUILD kiten-18.04.0.ebuild 813 BLAKE2B 35f2e8a4415df279ec436d66ae69f785107c4f65ce7f8b34cbe06d2938f39c2985599a3ba9aca040ee95a9c6fae7b2b3761ee94d94de3d1616ce343cad141dad SHA512 3829e1ed3036fac31a30e9fac59257db3372191a6186052405d32438ddc5eb1a2e7d0730e638606f18155b3795e7ef36ff1ec276706e0bf16dbd56dd20abfdd2
+EBUILD kiten-18.04.1.ebuild 813 BLAKE2B 35f2e8a4415df279ec436d66ae69f785107c4f65ce7f8b34cbe06d2938f39c2985599a3ba9aca040ee95a9c6fae7b2b3761ee94d94de3d1616ce343cad141dad SHA512 3829e1ed3036fac31a30e9fac59257db3372191a6186052405d32438ddc5eb1a2e7d0730e638606f18155b3795e7ef36ff1ec276706e0bf16dbd56dd20abfdd2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-18.04.0.ebuild b/kde-apps/kiten/kiten-18.04.1.ebuild
index 19dcab41571c..19dcab41571c 100644
--- a/kde-apps/kiten/kiten-18.04.0.ebuild
+++ b/kde-apps/kiten/kiten-18.04.1.ebuild
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index c53cba717195..220f00c695d1 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,5 @@
 DIST kjumpingcube-17.12.3.tar.xz 293288 BLAKE2B 4efcec26285087b8eedfb406c9f702972e93e609a6f2a34ff98e1cd7f097fc7c27d51ecba4bda582adf36c07affd2c7825a6300feb4c0790f711931c00d5b090 SHA512 880ac463dead49d103947b228f80153e38c43c0c75d7b1f9a60445f61fd19999403d8d04848250b29a1a3424c2d5815312e99ea1a3b520eb511369b26462e3cd
-DIST kjumpingcube-18.04.0.tar.xz 293420 BLAKE2B 8e927bf5e5862e6789bf7eccc86127858b464682fe719b8cd0a7bed97b6b7a293e97f74272e50abd83f0c095b06cf62ae315737a1b17b7b732aef7b97c24b6c6 SHA512 fe8eaa97fe4bf00d01ce954d3839593083233e87913d5b9960ee11ecc9701847318a89061d8fff7b0c5ddeca8cc187a81ab2c7036e40fe7a84677b76a5848794
+DIST kjumpingcube-18.04.1.tar.xz 293976 BLAKE2B 8e3c1b31d97cb96f3b2f1083b44c83b4431b378d91c6ed74bb12095f53b9f896a5fd9ca303dc1929ffc2ddad9c1f05ba377e01f2bad0d094b9d0297f0dc28a25 SHA512 0569efb04303d9ac5f37989ce9a5646736430dc0447119c65bcbfcac53c2d63f5361dc4f459e2057fcaa0207c7bd709e00dd91026fd9ba976ddde1ea4a52d378
 EBUILD kjumpingcube-17.12.3.ebuild 767 BLAKE2B 68f9ca993109e2efda935509a8b4f5f93f6a283a43048b6d5d27fe0deee39961fd5a3210eaa307c0a51fa07a00d5976f4de8d016584aa586f85f1d48a2848803 SHA512 d0940a208cdbf9ab81d93511e2616ccefe4acabe2163b33d6835c732a45a0952f3122081ef6e32686e368384d71d3a3accee538cff583695035b9e12f2607b4b
-EBUILD kjumpingcube-18.04.0.ebuild 769 BLAKE2B a2bd3204739357b90f6f764551ee3a98f89ca63c09bd79e68582d080972591d384adf2e37a882e781e2deb51ad9438ba99115f39287658b4f7579afb7cc52657 SHA512 f94fa9955815fb7fea4b99012e0cfa26b13d4450f4d7bd225067490366f2570d48c026ba18ad5ce62839b145f2a288a7454fb2ea2711cc933ca1999f67323578
+EBUILD kjumpingcube-18.04.1.ebuild 769 BLAKE2B a2bd3204739357b90f6f764551ee3a98f89ca63c09bd79e68582d080972591d384adf2e37a882e781e2deb51ad9438ba99115f39287658b4f7579afb7cc52657 SHA512 f94fa9955815fb7fea4b99012e0cfa26b13d4450f4d7bd225067490366f2570d48c026ba18ad5ce62839b145f2a288a7454fb2ea2711cc933ca1999f67323578
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-18.04.0.ebuild b/kde-apps/kjumpingcube/kjumpingcube-18.04.1.ebuild
index 24ea87a948d0..24ea87a948d0 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-18.04.0.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-18.04.1.ebuild
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 24f1997b1b06..78cf0e8d2837 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,5 @@
 DIST kldap-17.12.3.tar.xz 155112 BLAKE2B f4d124243e39f5ef94a9a8d5c9c0eefba9881c243867f8d873256cedb96a03f3e2791a390f2e14dadec84cf4255ff4627ec2cf435b3eead21963efa516bd1d3a SHA512 d7cf0fa6b7a0f6fdcc712fb91f3214a4696ceefdc5bbdebb67f5f03c59901e0eebc6a7010c51f17791ffef490f2e39aa82d81dd581f2e2075e9f3bb4a3e8d3af
-DIST kldap-18.04.0.tar.xz 154088 BLAKE2B 61515989a4c86f0aafbfcff34e34a91a7dac112e80ee2b47a99c955b90577707580ac4814d26833cb0b3855bd6777d8e271e2ab5a5b0fe7b49f83d46cd0ea39e SHA512 779914011c7c6f8ece6899d29973544c921b3583768ffbdf6786a9360c86e5c083ccd33c50e95db60d6c7321da8abe2b71dfd292b28ad647e104895fe925e52e
+DIST kldap-18.04.1.tar.xz 154192 BLAKE2B 2f86517fa3f61a60d9d3949fd495a87769868f3ad2867235ccb2a431c77b8c90cbabf28bcfd35283bd82526f3664ad92c5fbcd1dba0d4a2717d60a171b6f3bf5 SHA512 1ee3f434b7818d7883f875ca8494b9d620ea2ea2474c14ccb335565c78f1b6f9e8ac6b9afbc5f1055daeb501f59aba7c98a3ab7a614d224d20160d7a68bf3d6f
 EBUILD kldap-17.12.3.ebuild 760 BLAKE2B f1950ca416e0f20b9dd05e0b3b94a683b3012219e2da5f06d395b1060d26c05ad3df42f9f96432f6f4c6d1de295c16e4bc53c0ccabf8e9c9989ff3bed90e0cb3 SHA512 97040219bf3b380924624e7e7f34b13597ad2d664a0c784ee5ee18367dabd79d4d6f95a3630812fbf0684943da9f99990bd67a454be9190f1e2655315859237c
-EBUILD kldap-18.04.0.ebuild 762 BLAKE2B 70a07add502728cca0387b5e6b9b98c6c422cb40ec8b3f0e57c2041aff3a81bfd1043a602d392d17e88f2e45baef2b97f9ed0ae76fc09f833d1b79dcde5c0b4e SHA512 185da5965001d19497bb0f83a4819b7e505d86bfc1017b8b5227a88ca252fcbfc96934c581afa06f71ea507027e87c6a6bf2c23b65bd8b7b223cda3b9fca90a0
+EBUILD kldap-18.04.1.ebuild 762 BLAKE2B 70a07add502728cca0387b5e6b9b98c6c422cb40ec8b3f0e57c2041aff3a81bfd1043a602d392d17e88f2e45baef2b97f9ed0ae76fc09f833d1b79dcde5c0b4e SHA512 185da5965001d19497bb0f83a4819b7e505d86bfc1017b8b5227a88ca252fcbfc96934c581afa06f71ea507027e87c6a6bf2c23b65bd8b7b223cda3b9fca90a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-18.04.0.ebuild b/kde-apps/kldap/kldap-18.04.1.ebuild
index fd1452bcfd54..fd1452bcfd54 100644
--- a/kde-apps/kldap/kldap-18.04.0.ebuild
+++ b/kde-apps/kldap/kldap-18.04.1.ebuild
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index ed91f38b35a7..494c767281d3 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
 DIST kleopatra-17.12.3.tar.xz 1895848 BLAKE2B ed9c6b72edd555b1707ce95804c32ca7fb682016135f290677a7964af344fe6a2c1529f7b621626fcf5cf7fd1d7a72bff7d4d7e5e8f7c379a82326ee1fc9c343 SHA512 36cb2e8abe68d11e8d1919e1d87f80d0f926e3934432f0ffc0988574e5d82adf67fb9891fb3bb81d0c68b63d80f7165462dc78572bf29d5cd905284fc255cdbf
-DIST kleopatra-18.04.0.tar.xz 1901700 BLAKE2B d29037b5a6ae3baec7f74880307018101763f79a6d1577bbd22898d28baaacbca253e2f85ede343d8cb95d989137d961344193a81e99abfd11e2ac361bc96a9e SHA512 1ff164eb923b5f50d8925b2f89d7774c39716b3c2da5a11fee1af0bfdf9fe41f87c0776f4dcc6a18135b75eaf10103cb1abd115d8b846114733e96932bc697b3
+DIST kleopatra-18.04.1.tar.xz 1900604 BLAKE2B e7fa9fa6f8b0ab72933124b9c9e341a0ec6580952728b57467d6082042c27a2c52cc2f3f6793a50f71758079bc87deee3702c0c083674073e8d99407d5473c53 SHA512 d4e404ef7ac8d6a97c57dd25fddfd0ca4f00cfbdbd158cdeb803f880137b583fa201fd1a60b4e00b083935a4784de9cd6d28961acce71eaaf36481f253950ad9
 EBUILD kleopatra-17.12.3.ebuild 1323 BLAKE2B 1aa3bd4a95a6dd7eccbc6ac669c78250343d3c7b99369b443aca92a489019aaebec2408a693b7269350a1b230c6caf399f328b0b7d966cad70d87ffd35aea06d SHA512 b247b69325a3119fa09d7d9e1bcefb121aaa09933578fad290b3ba8c17ccdecc0de7b40a99fbe13f0640c0506670dbe9076e6439f83380824fd7a2ef8f9c3cff
-EBUILD kleopatra-18.04.0.ebuild 1325 BLAKE2B c246da8fa42e95769d488fa8f361fc7767fd9050f2d1609db9860bccf19a9d6ad36e21b466c2619870d6a5c05302110deacb3db75176a41b3b1d802a3ef2c6f5 SHA512 2db9c95924ae4a085a79e26866020b2411e7909c6012d81afb140d5af0db2ac03ec2150fcfa24f3afd1c65756bd2b120e1e8617fac1ad711d61523dce5861f5b
+EBUILD kleopatra-18.04.1.ebuild 1325 BLAKE2B c246da8fa42e95769d488fa8f361fc7767fd9050f2d1609db9860bccf19a9d6ad36e21b466c2619870d6a5c05302110deacb3db75176a41b3b1d802a3ef2c6f5 SHA512 2db9c95924ae4a085a79e26866020b2411e7909c6012d81afb140d5af0db2ac03ec2150fcfa24f3afd1c65756bd2b120e1e8617fac1ad711d61523dce5861f5b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-18.04.0.ebuild b/kde-apps/kleopatra/kleopatra-18.04.1.ebuild
index 9526ad8ef1bf..9526ad8ef1bf 100644
--- a/kde-apps/kleopatra/kleopatra-18.04.0.ebuild
+++ b/kde-apps/kleopatra/kleopatra-18.04.1.ebuild
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index 7bd4d23ac0fa..e9fa0f7a7a95 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
 DIST klettres-17.12.3.tar.xz 21712168 BLAKE2B 79e8e2798fc50fdf0b78eac94f3d346fadf90e4ca70ea8e51cfbf298e08c9143b4ad68cfcdd7e7970ed02f4c4b16189403ebbcd9aea0c1f8ae6cb6a9c015efbf SHA512 a251699633712938393c81f314f9ef8069ea8ab792201ede097cfa2e46ddce6e2184add5a8959dcf6925a87b329b2b3b1acf134c9da1c25e3d39850a42276158
-DIST klettres-18.04.0.tar.xz 21712776 BLAKE2B b4122520d93ab5e6956453dae0e2fdc2a9412d295e50b18ca5ce0d5761be85b9635d590e252b5c13a6443948a50f0fa70c0520e883209a815a4d1e62d4c19563 SHA512 8906c79294def93c8b1c50b5686ec265e4fca81309eeb0693dfc4f1b6780c3c2cb46640efa438e8b22654ae9576c90d5c6c1c0e4be2ff1ab8de0a1437c98ea79
+DIST klettres-18.04.1.tar.xz 21713056 BLAKE2B eab5942bdd06d39978226d79e653ec9739da4294f8c3cc706762d8c279e6b925429250e715d713afa4cf1c5272073029d79f035f2bf0f6dbeec9dc0ef2536435 SHA512 8223bab25a60c515f3ff0d001e38cae1e9d97159eacbb5fa7a8154d1939a8e99ff1cea38162674a3c7f20d8d319e5cdfaba7568226a730ada0100c290f9c3b23
 EBUILD klettres-17.12.3.ebuild 771 BLAKE2B 2def2ad609ebfb87f7352dde75c0b6cf0b5b1939897ed4dbc8badbab50fb711aa106cfb7269a87861c40a56d1af2a41770ffe5b44df5eabff6d3682fc40a8b0f SHA512 ac4b1f7434ff79717f691a88825da9160b47c2e7a173a766b12dc9d8f1c2f95ffa275ea6c3231467d39c4112618d2ddcd268f9b948b0887ad991b6c37098b5df
-EBUILD klettres-18.04.0.ebuild 773 BLAKE2B ebee50fd20662bd100ecf61df3849f12b49608b2d3989e17749a308c958c125f11f65a898ff793f8df38c074b760b72c642a0f9b5163e4b3f766687f17fcd36b SHA512 cd209d6708323c85846b9a789fc024fe118a59bcaab421200ab7b607119c18695f705f6796d05db09ee429a655c83618eb2ed5bb1cfcb11dac4d560c70a8bd60
+EBUILD klettres-18.04.1.ebuild 773 BLAKE2B ebee50fd20662bd100ecf61df3849f12b49608b2d3989e17749a308c958c125f11f65a898ff793f8df38c074b760b72c642a0f9b5163e4b3f766687f17fcd36b SHA512 cd209d6708323c85846b9a789fc024fe118a59bcaab421200ab7b607119c18695f705f6796d05db09ee429a655c83618eb2ed5bb1cfcb11dac4d560c70a8bd60
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-18.04.0.ebuild b/kde-apps/klettres/klettres-18.04.1.ebuild
index 5a99090d00ad..5a99090d00ad 100644
--- a/kde-apps/klettres/klettres-18.04.0.ebuild
+++ b/kde-apps/klettres/klettres-18.04.1.ebuild
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index 4fc9eb21dd0b..3f600aff1d0d 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
 DIST klickety-17.12.3.tar.xz 1410128 BLAKE2B 224d7df32d37039e289e436c60a432c94cfe4fbd1e467b846272b710e86a089f946e0dd9dfd421f04a1d890311bf293335ba0af1f78e1e40cfe6437dd9dd4aac SHA512 3236c3f294d7270a6da40526436ab789b722e61f17774cc337287f482602967ebb5428bdc843e45fb375d0ce227a0d20e4dbe285477df846ce46e52b215e5b18
-DIST klickety-18.04.0.tar.xz 1410448 BLAKE2B 7db16bffd8e52de17c2fff8826a05478331ead2ad66379a4d07779b74fe48202ae7c9b0ed6b4108312ecf1ff87cb2b10ec2403273a48f846dcd4c98aa021e75d SHA512 86e3f775414c92e799f199beacaabc2e977e1bf4b1c476c60e6ddeb83fe8b6733c8587660e8fd15d9a277444b85dcc781de543be3de1a98de9beba1717230a60
+DIST klickety-18.04.1.tar.xz 1411016 BLAKE2B 0ce4f4ce5e483ce3fbbd41db070049be05823c981f04688dfdf53de8eb4344f488b24fcf5cc5a9a19105253807306253d6d5c6d0273639d08536d5b8506474f8 SHA512 dff325417bfbe41ab7ecc83e203de638e781c3882eb966c2bce0c6ec7c564be66fd44437ddf349983afa5be0190b662c94c083f917194d227da3a27d68b36a77
 EBUILD klickety-17.12.3.ebuild 777 BLAKE2B 9d0562efe8ed345c19c2038b1d8790c73c08531624a981acafec198470974f6adfd41c079f52dad4ed05e94f9496caf314d7b5d310f2eaafc6500c5d30a1ab6b SHA512 2f5dc2324fc5538e5a58416f58af57edc34ddcf6d3608c24b22d97b1c099c93652f8c89b403302846c30c2edf6f2df047dd286c7dc34d9b1514b920667fae3b8
-EBUILD klickety-18.04.0.ebuild 779 BLAKE2B 823d03b8596084535d467a2359c484000ec6616429b2dd968174f29daca821022b90bdf7011d6e0bad92b5271a00976e90987c5416bf15b996c7cd3a9c8ce642 SHA512 b0795f1815438432719b97f1686354757831b20338ccf4a93fae0d10f5bcd6a049117dcb1fb93ae87ee8b0d4422631bc421ab690ba59828733794a1e74c8f920
+EBUILD klickety-18.04.1.ebuild 779 BLAKE2B 823d03b8596084535d467a2359c484000ec6616429b2dd968174f29daca821022b90bdf7011d6e0bad92b5271a00976e90987c5416bf15b996c7cd3a9c8ce642 SHA512 b0795f1815438432719b97f1686354757831b20338ccf4a93fae0d10f5bcd6a049117dcb1fb93ae87ee8b0d4422631bc421ab690ba59828733794a1e74c8f920
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-18.04.0.ebuild b/kde-apps/klickety/klickety-18.04.1.ebuild
index 29d07f818c1b..29d07f818c1b 100644
--- a/kde-apps/klickety/klickety-18.04.0.ebuild
+++ b/kde-apps/klickety/klickety-18.04.1.ebuild
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index d391f4bbc2ea..4767875498a2 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +1,5 @@
 DIST klines-17.12.3.tar.xz 1667652 BLAKE2B 1159f2867e124b95475efe73a4bc2588eaaaca5172f4932e8aa9fcf5b06e6d895252e019550a4aef05f4d7c6cfdb17bd50b17a75f2ef59a4c7130e34c2496dbd SHA512 14a3fff0dd010d94b7e76308a8032c4bce428950b5024cb81676a18c264f0c1de7d87540d8a36060588beaad5da7f22a4140551b8c46be08cac7a50c314ff3e6
-DIST klines-18.04.0.tar.xz 1670024 BLAKE2B 071de5d8f397427169a7f6cbd5b6ac0246cccf2b39d7854524b84ed562b41a4ff1b73f82f120a06046e9eff92e8b105f8c61136dafe7640ecfba03f0fa834938 SHA512 98488df1899a6fac729d8e059a4d16415e754bd892afdc9a7801ac406af032c8d78870792e425afa6201c1f7f66d8fcc92c58bfd99e2bb61dc893d16158207fe
+DIST klines-18.04.1.tar.xz 1670904 BLAKE2B a379040cfb4dde02faabc70c57af14b1b816c4b9af7aa5b6ee73a01e5a14923d70eb9a8f0e81f840e947cab72fe1fe6eae7518cf14a5da9343ed43da5163739e SHA512 a4a3c5ec071d2acffd3e7badb26da103801b0ef9463b485dcf584f444b3615a6355058136e68efd6af974754396fa9ef8cff1cf178b34b0c3edc6088a65cbade
 EBUILD klines-17.12.3.ebuild 786 BLAKE2B 77bc18df1dc422f77976c3c9d1a0c6d5a9dfe3a3261c18766a1e68ca755c5db1831848b74c6b927e3f1bd7b005ba1998bf2ee1f4025a82f9e4d5659fc8091741 SHA512 87a9781483b04be005d26690868278dced7c776a105b274d38381781f46e25a64c23fc640b3d8cb899282d03518330394cf5cb0d69c1c5226a247a7145f9e216
-EBUILD klines-18.04.0.ebuild 788 BLAKE2B 6ce27fbd68fdc1bb29f99dc59c5c61080f680882d87bebf95eae4009ef221e69256da0e42d27a60bdc83c90010ed310daf9cc1ffdb32691fb63e636895496ef7 SHA512 19f860eefc5c4c6d070ae2652471c87d38aeff1337b50f8df0091b9b5c1c9955c9b3fc300c14f3e83110c89599d8856d75f8ccb1ff8fd94fa43a0bdd8c849f2e
+EBUILD klines-18.04.1.ebuild 788 BLAKE2B 6ce27fbd68fdc1bb29f99dc59c5c61080f680882d87bebf95eae4009ef221e69256da0e42d27a60bdc83c90010ed310daf9cc1ffdb32691fb63e636895496ef7 SHA512 19f860eefc5c4c6d070ae2652471c87d38aeff1337b50f8df0091b9b5c1c9955c9b3fc300c14f3e83110c89599d8856d75f8ccb1ff8fd94fa43a0bdd8c849f2e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-18.04.0.ebuild b/kde-apps/klines/klines-18.04.1.ebuild
index 7d4775b223b4..7d4775b223b4 100644
--- a/kde-apps/klines/klines-18.04.0.ebuild
+++ b/kde-apps/klines/klines-18.04.1.ebuild
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 344c07ccee9d..77f888268102 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
 DIST kmag-17.12.3.tar.xz 588224 BLAKE2B 7e5a9c5eba52fe751b1bdf8f5e5afea400a82cb3b48bc8e5a31c7219b44f5fa69b9bd047c8e0b508c5229c367b2ddd706e0b2c7b26e18ffef8105310f2fefaad SHA512 d9815d9e59a25765a74b3a33253de718b333f53c32df9afefdf4cb6551f10faeedaed189e625f20593d8d3528b835a01a47891dfaed341f0e943a317d6c6aab0
-DIST kmag-18.04.0.tar.xz 588324 BLAKE2B 04fb0ad3ee9b44d7110a0e3877bc0f10c4d6630f8d0a49754256a40d7e3ec9a9e34a6bc09ddb5847065fb26b23f693a43e9d54c63e693b72a879c687c0628cb8 SHA512 ed669fe9b1b1f0b26519eeff649d60cbd850934fa07a75bf4fed0a8c7a20c9dbd8d1b223d762f087741c46b8f982344975ba47c0ed8ab6a8c142d7cc28fd06d2
+DIST kmag-18.04.1.tar.xz 589236 BLAKE2B 2ad424a77446eee476d8d6a21a194178cfe84b466a195a4a3d028e5ee4fa34c99fc462f1f3fccefc9035044bd534505dd19900e7bc2a7fa2d8df19ea36c90464 SHA512 d7498a1b6f60383f0b23826d654412d8001e2179f96b8fb703cd982d53bde5202ebaa00c3527b4efb320767e6d92f22874d01703bf2b678cc0ae082c67e93288
 EBUILD kmag-17.12.3.ebuild 857 BLAKE2B e51060f466ca3fb7845575a3fb80fbe46933deb5e19141eb4a4c2024c82a9dbd3b3fb5101e831ee907fef31b49d9c5e1bdcbd8050cb6e10e33af603eb70664cd SHA512 741d51b88c16628b1eedeca0641ab3ca71f8e3c8bb6ddf36cdaec2d35eabd435f60ccd47d021caa5dab16146c9a7d3f3d7cbc6286785a012402ad13d61d491b8
-EBUILD kmag-18.04.0.ebuild 859 BLAKE2B 09eff3061722d92f59307af5037e312404860cf3bc753d0fd2ca874f5ac0a05ee04a5826877a4aae2db42d5915690d1a64c97f69d84f89a837a72104f3936889 SHA512 806fa0da2c4917e98bee7f4a9ddaae977bc0a16d3a4f0466fa434ecfc1b1d5fd00e112756c16eaafbdaf66986f0558e8ab715b645a416c3d2f7dc84c607243a5
+EBUILD kmag-18.04.1.ebuild 859 BLAKE2B 09eff3061722d92f59307af5037e312404860cf3bc753d0fd2ca874f5ac0a05ee04a5826877a4aae2db42d5915690d1a64c97f69d84f89a837a72104f3936889 SHA512 806fa0da2c4917e98bee7f4a9ddaae977bc0a16d3a4f0466fa434ecfc1b1d5fd00e112756c16eaafbdaf66986f0558e8ab715b645a416c3d2f7dc84c607243a5
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-18.04.0.ebuild b/kde-apps/kmag/kmag-18.04.1.ebuild
index 78ea685239b2..78ea685239b2 100644
--- a/kde-apps/kmag/kmag-18.04.0.ebuild
+++ b/kde-apps/kmag/kmag-18.04.1.ebuild
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index b76124832983..6c43b272a068 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST kmahjongg-17.12.3.tar.xz 4084868 BLAKE2B 761d68c0d027110a6898d3697898ed6824681fed98bc0a87b042406432a6796dd771a2012866d82c2b41eaf447a3cc89c6baab72d3fb09002aa1d9f3f0c3ebe3 SHA512 c6835b0900e7969f65f5cf74cccdd0271aac1e4d0f161fea13812e91415db77b7b5937b75adbadd027a3b424e520de8cb7c9ce277dd29285ba6a8e439888e8fe
-DIST kmahjongg-18.04.0.tar.xz 4085108 BLAKE2B f7cda6b6d618e60aa4da0385d781575e0d2146bb8561aa98197af17a930071486d550f6e9c11465bbfadeba974a94a856aeaf8b89fe320e59846f5ed7c46e936 SHA512 0652d751636a51624b273cafda428b0c33fe3891c8383b94be63d02233580c32d54a19b4fde76cdd71ba151775d293465e2db65d83802c7eb02a46977a53ff70
+DIST kmahjongg-18.04.1.tar.xz 4086480 BLAKE2B c433297f3593f54013f9bffd4559d01ae3470ebdf50dc82592a4382ae5a05ec4b49f4d096d7d5774029a00e6b52721592ba9d14521bc855946d8ffbc2016f1dd SHA512 72d787fd92db6a1a0f2f526157e8910a76b21eb2b5344534a8459b754de757a0b9d38047d5e8caa16ffd7c8c9edcf1da565824cd56276d38787de9a501beb736
 EBUILD kmahjongg-17.12.3.ebuild 919 BLAKE2B 6f6c7d03718a1c1884cd05e759c43cbe6931bef488ef1086032d5e503c9ff63636b0d6e54fa3e38fad15552060bbd50827b9a5a7dcede35c4888046d1d478c4d SHA512 f0f8629356ae75045ea083099e0deec449046034a97a28119708565fae484aa88e1d41b53d519de7d21186dd2a4e730c0b3e93bbbab1f88e584bb36d2e62da31
-EBUILD kmahjongg-18.04.0.ebuild 921 BLAKE2B 305bdb04b2711bb691601ae5f1601802fe5e6aa29da6962f0a72ba8f6bba065157cc1adc77fe31db30570564d83263a8c7266575c2eb5bec87c0a18964fce7ed SHA512 dcb4016864dfa052e5340a8ca81cd32775ad3b4a40ac5ce56b6100df862e4e1a9aa51e326b43c6403c34b1fed15584184766071af5d1f164b2513216c7a925cc
+EBUILD kmahjongg-18.04.1.ebuild 921 BLAKE2B 305bdb04b2711bb691601ae5f1601802fe5e6aa29da6962f0a72ba8f6bba065157cc1adc77fe31db30570564d83263a8c7266575c2eb5bec87c0a18964fce7ed SHA512 dcb4016864dfa052e5340a8ca81cd32775ad3b4a40ac5ce56b6100df862e4e1a9aa51e326b43c6403c34b1fed15584184766071af5d1f164b2513216c7a925cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-18.04.0.ebuild b/kde-apps/kmahjongg/kmahjongg-18.04.1.ebuild
index 7f03c60e0f6e..7f03c60e0f6e 100644
--- a/kde-apps/kmahjongg/kmahjongg-18.04.0.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-18.04.1.ebuild
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 12c1e0569a40..7297f9760cfe 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-account-wizard-17.12.3.tar.xz 153456 BLAKE2B 84dcb3249dc82d22e29597ce9396d788fa6447f0e5ab4ccb783904e54eb86f65e8cf7b7e583567bf7d61a45f4eda485b46e5abb9767f91fbb71ba95aee0c981a SHA512 c19d89cfaecb4072b1dbf4fbd059e522e60b148edb78eb94e46ec73d56f3794e29b4af198d453d6b837431fdb738ab22dc6ba3c98766c2848c0e3a24135bbd02
-DIST kmail-account-wizard-18.04.0.tar.xz 153600 BLAKE2B 1f2ea6728b6a8d09d819e140e1412cca6d9b9f144f86d64f63a6802bbcb64bb93da71a68b1448b05117a100102fa5344f3ee1583580381a2d29f2235ae75a97b SHA512 35f5854d3ca07fe46973f952112037c3ec79ae44fbd6a0be74b092827e2fd735d25c42fd64783858b7da3b54ce57383c3e591dcf10458a9d97bfe8fd54bd9478
+DIST kmail-account-wizard-18.04.1.tar.xz 154864 BLAKE2B 00c0cfacf049cb0b01e17e625dee5ab48ea8ce29dfd7bc5e23898373634d0940a3da2c5065f580f0a7db9c450853f0d229171994aedc4c42e1f0371a71829cc4 SHA512 8ae8c2d899d0f72449858b033a3635894348a3a3dfb44892bb07f04c4da911b15ac90805b62d14a1d8bc1af1945cf04202d4b7e31ebf720997e4d910e9160c9b
 EBUILD kmail-account-wizard-17.12.3.ebuild 1443 BLAKE2B 6007a7862e8aef132649f83be8b139a1202b3c8ecf62b32e63fbce7e8be706ee36e358a03fcbd555cced21d43a5d9ecb57e18eba0c7ea0c0d7d6a885e72bfc6f SHA512 4cdba7be5e9e59617a5f37ec4282e66dca61a13570acaffdc39738ecd5eab0b60ddd1d77e3ee1708832df59985e6d9a15e890ebfe1d02eae53e1e4911354eaa5
-EBUILD kmail-account-wizard-18.04.0.ebuild 1445 BLAKE2B 7926b75b4a9d5f435c4d4d30a5c59cf1ccb137394f0680b831a09a6106011d8850bbe218751d35965300e2ac6fd323f7385e44152d0b7559169c420ca5168962 SHA512 b8007880b6400c349c7491ffd23cb28f873851ca77e39766dfdcb113eaceb9548e936bc1e47c7409031214b4c26f94dda2a467301b494b81267525044abfc188
+EBUILD kmail-account-wizard-18.04.1.ebuild 1445 BLAKE2B 7926b75b4a9d5f435c4d4d30a5c59cf1ccb137394f0680b831a09a6106011d8850bbe218751d35965300e2ac6fd323f7385e44152d0b7559169c420ca5168962 SHA512 b8007880b6400c349c7491ffd23cb28f873851ca77e39766dfdcb113eaceb9548e936bc1e47c7409031214b4c26f94dda2a467301b494b81267525044abfc188
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.0.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.1.ebuild
index 1d631b73e888..1d631b73e888 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.0.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.1.ebuild
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 2d72aec82b12..cd9df2b5439c 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-17.12.3.tar.xz 4746820 BLAKE2B a8ffca362a5cb7433917cc361a786039e9792714910ccd46b305d97826111d21502a9598bd044988949cf4b1ed74c3eb49a4cb70f5d7af22a118a876d3d17b52 SHA512 903e6accd92cf70134a162fcbe2bb78c5058453c4272ed2fae02cc75aaaf185da7fa87b64926c0ad6d40a3f42ffb60ba7873106076c034840cd75dd965e406a0
-DIST kmail-18.04.0.tar.xz 4753384 BLAKE2B 8637e003d7a1b293668acaf0cee22503c6d3e97a5e8967f05d1eede596dd73a30d2556a3ed3414211262c1baa54ac4e4dece879db42e06bbac452da356c3883f SHA512 d3487cf9d48137e66b1d1bc536562742eba4353c8a64dc7e26b0fd63195ad0f515ad98d27942c071c902c072e4c764c873fb05da0f2d1a66228f1a161cdb264d
+DIST kmail-18.04.1.tar.xz 4758416 BLAKE2B c87c85d7bf7921cfba955fe057ddca0f99af8152adeaa0a8f420a6ab232a0e4b08feee39883c6d29cfcbdd148d612320041c3055965676094ad33f7e62260cb9 SHA512 61d8e0d35bb9f4bebbd0695a7059c84b781626df5da3d23919822bf95da62e26f44bce1a182324590ea6245f2d7d7d888ee651c2941e42125b3607bf6ecf4974
 EBUILD kmail-17.12.3.ebuild 3201 BLAKE2B 542857f6faef4b8d94c223f6caf64c47cb96d38df8f44ae86d58dd6b6473b9ec75c1fcd7b6fb1dfb8f0b633b2e99aa979fabe9fddaafb7b596300d9abb479f58 SHA512 852462e0a5ec668dceae6ef15495ca9c193469f308cadb3d51c8ff5a8ad4c812d4f457e1f38c6e1abc646fd2e9eb54696fd46e856c158066cc910f8387348a24
-EBUILD kmail-18.04.0.ebuild 3182 BLAKE2B ca1c1db4d7c158360d8d5f41057d4c35df7b588e3dcd8687ac6be1bccee6e199d9b6cd3a39192045fba959e410ad0bdef24383834a5ea4946160c32d11ab5d7e SHA512 2e653f8da18b09d27bd8e4a25af283860836ffc41136c5c792beb3e6dbc0da95ad8567d320c9c744424071b09d7fdc8b5039ebf360c9a9043fd06efac0ef3dda
+EBUILD kmail-18.04.1.ebuild 3182 BLAKE2B ca1c1db4d7c158360d8d5f41057d4c35df7b588e3dcd8687ac6be1bccee6e199d9b6cd3a39192045fba959e410ad0bdef24383834a5ea4946160c32d11ab5d7e SHA512 2e653f8da18b09d27bd8e4a25af283860836ffc41136c5c792beb3e6dbc0da95ad8567d320c9c744424071b09d7fdc8b5039ebf360c9a9043fd06efac0ef3dda
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-18.04.0.ebuild b/kde-apps/kmail/kmail-18.04.1.ebuild
index 42818ab48cd1..42818ab48cd1 100644
--- a/kde-apps/kmail/kmail-18.04.0.ebuild
+++ b/kde-apps/kmail/kmail-18.04.1.ebuild
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index ed22d5b988b3..6ae472c69a1b 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,6 +1,6 @@
 AUX kmailtransport-17.11.80-deps.patch 1450 BLAKE2B dfb1e3c3d0e232986bd187e0bd1b623a0f1895750af69b9aa03876dce49c0baf09c2d2dbb83c40241da280d40045f9898ff218f4e8cafc4df09daee8f3fd27f8 SHA512 037a7efb891883cfa388d252a8e4fc12994a851eea56770c0f6c7acc368fe507d66937392ff6a401cf2781c30cff748e2521f014024ca2f61c690664b63b5af9
 DIST kmailtransport-17.12.3.tar.xz 164804 BLAKE2B 79b2e5d28429c777f1b6f205a950109bf8f16310eb8e6700079a9e28c4876398e813406376aefbecef5565caf0d75262bef700f1a69ee59dff393ce93d10d18f SHA512 a90d305a0ca9e938c0629ac602862307f1561280cd8f90159e0d9eab48bc8e3ad67208a04db724bae5e8b5edb08ff7901843c86f3d6ab3b5a2d7092de127d513
-DIST kmailtransport-18.04.0.tar.xz 164516 BLAKE2B 39b12ab209f6bae09c49cd9f679c54e6f6a5b95daf7ad471c1aea04cc3508273cc9e248a164ec4a5143426d9dce7db3ba29a1e700c7ecf2a024e27937b83df30 SHA512 7f3195ade7c958071e35a992a26fcec2d308c59d0005bf5e56faff91411b725f42b919639a4f6c9f3029a7435fdf43f2251289ddcccb52a6778206124adce91c
+DIST kmailtransport-18.04.1.tar.xz 165012 BLAKE2B ddd029562c8fce9062db5f56766e2577bb8deb0c50d653b09ab3838002d30468e1139263e54358ce6195f2235445a4bf5e43561f19417d384b0c113b552762d0 SHA512 15f049d217a8401c26f036f55d226603168552ff11025c589ec7c3ae59f635a73857c29f9fa343c49bd273889a21abeea087240f0959a9b980ae5f485794d3f1
 EBUILD kmailtransport-17.12.3.ebuild 973 BLAKE2B b1eaef0dadbf94bbfb1db48bfec8d330d2797afd3f346f17c8e70198c252010f92428762c4203ecdca63dc67da850b4b4c47d1e4a007fbb8026dc81fb131d634 SHA512 b6dae6990a2ec2754b147851e5d027e1b436000ac79cd06021b2fe1f8d146ec6e54d8ea5562619c44aa6736bfa821dc36aa02558999afa0b04be3d3cb4295819
-EBUILD kmailtransport-18.04.0.ebuild 922 BLAKE2B f7669c1a6b67aee39fe777c8163ffc5f206f6501b71c7509db6332eb0e495c9232cd4f6c17d1300c799bf7455a3ac551bf80bb34a4e0377665df2c7fc4baa689 SHA512 7188152ece084912e8db2bf7b0113ef92d4c4d776ba29f5fd77243e185ed4aec44e1837f70984575b0302b66c61b7c5e389099188ba2e7a0867633109784f171
+EBUILD kmailtransport-18.04.1.ebuild 922 BLAKE2B f7669c1a6b67aee39fe777c8163ffc5f206f6501b71c7509db6332eb0e495c9232cd4f6c17d1300c799bf7455a3ac551bf80bb34a4e0377665df2c7fc4baa689 SHA512 7188152ece084912e8db2bf7b0113ef92d4c4d776ba29f5fd77243e185ed4aec44e1837f70984575b0302b66c61b7c5e389099188ba2e7a0867633109784f171
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-18.04.0.ebuild b/kde-apps/kmailtransport/kmailtransport-18.04.1.ebuild
index 5814e89ef59e..5814e89ef59e 100644
--- a/kde-apps/kmailtransport/kmailtransport-18.04.0.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-18.04.1.ebuild
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 419775b07704..c77d8bcaae44 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,5 @@
 DIST kmbox-17.12.3.tar.xz 24356 BLAKE2B 7780c408317bbc7aaf1d0d8cb128550afcdf0a8a5a5d035c51fe25a9b9870ef825f74351b4bad33f0d8524582771ff91f15297bd1e3c1d8c119c3d4e399af335 SHA512 785dfc65b7b3ef7b5bc9a1dde9d67d04d06110995fbc0b4112670c27350fdee4cfffdae7867dd73f07a431f4116b784faef716de902cf4da0767f396e7d3624e
-DIST kmbox-18.04.0.tar.xz 24420 BLAKE2B f84332f3b670213348e56c4671e501e3ea03d24d4a9ec33b4718e2908cd7c081a61fc211eacd962ba06bea683144abc63136c02210839e27ae98238d2743a043 SHA512 0955044d13a13cfaf6bd090b8d5c9f5d38c269a6ec8c85dc7933c769e2c092f4e94cf84143ad3ff64a42669718e4757def495a8934e80c96c405bd033ee0bc83
+DIST kmbox-18.04.1.tar.xz 24540 BLAKE2B 9aa2809e1f8e5e6a7ab7e919832758969d4b3adf94be073046029cbb5b56deb6e56741628a6d387c449cfdd2b9b5b53a36d2fb21bc238486656ec6e5ef0a37e5 SHA512 d7e63b1d60ecb362a12edda10c6e1c03f4b2c68177864d7e07aafdbc04e23cd65f45ffda5621ffca931a0145d449e2ed2a0a3a42743a93428390d471f5931214
 EBUILD kmbox-17.12.3.ebuild 309 BLAKE2B 455819bdc1f3f68251a13c8449aeb6be5e2b7e54dc73f78a852b6ec3e8c2b2a893adc1ab9f2dcccc016a1e80bfc46b6c1d936d35784ac7da7d2398dc4b623c02 SHA512 20f579addae7175ce34af42be9092340339b17b36562ba819228658a50b5d72f1187c6cb7267e0d7d513237ebe84f152e902807bc1b0392ffa0fe59675db634b
-EBUILD kmbox-18.04.0.ebuild 311 BLAKE2B ec5ab4224dc43c1bcd235f6d56af794f20d976d89064385a35010c554615f4239515304e6278c11a09da0602b9ec6b82f6a26977d0dfbbdcf62ca0a3c903f164 SHA512 b88679b1d6e88f7c8e1834d47b2d0f35acc1221e273856c019c0296b8769617afa0084e1664c47c1314ed6c36e568f4cf2ed422a56535799e7477c82f4ad34dd
+EBUILD kmbox-18.04.1.ebuild 311 BLAKE2B ec5ab4224dc43c1bcd235f6d56af794f20d976d89064385a35010c554615f4239515304e6278c11a09da0602b9ec6b82f6a26977d0dfbbdcf62ca0a3c903f164 SHA512 b88679b1d6e88f7c8e1834d47b2d0f35acc1221e273856c019c0296b8769617afa0084e1664c47c1314ed6c36e568f4cf2ed422a56535799e7477c82f4ad34dd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-18.04.0.ebuild b/kde-apps/kmbox/kmbox-18.04.1.ebuild
index aecae880bedf..aecae880bedf 100644
--- a/kde-apps/kmbox/kmbox-18.04.0.ebuild
+++ b/kde-apps/kmbox/kmbox-18.04.1.ebuild
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 83504cd3a7bb..17a2a315e718 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,5 @@
 DIST kmime-17.12.3.tar.xz 146456 BLAKE2B 106a985528ae9ecebdf3f9363ed2d84eb1067e53cdec59dae09896575bb49cb350527ee72c2d44ff5a7f48c8208360c2a919f8b1362bb5397796fe32d6c7a922 SHA512 f1d9ce2468da62836f9db461c2da71293ca38666576acece3c7e60c6f1bad10380f5db650c4bc5c4ebdb5bb12969c6a11f88e0e9205d265a8b0af825c34afab8
-DIST kmime-18.04.0.tar.xz 146480 BLAKE2B f4f0a10348747c49e96240d57e91bff933ea3a31755e015a1c4916172b56eab48ab5834479b9fede84326b539f48580cfa6053574ac6909e16e6cedc0d4c4435 SHA512 43eab6346d55a3547d7722495fc85bedb29e71465511afd2c57b98c04fdd21feb3c1d8c960f5573ca0e5b224e3a12aafc4fd2e7fb3e418ed37e4a9588400d686
+DIST kmime-18.04.1.tar.xz 146364 BLAKE2B 8a397859ba802b5090915888e3a96a446946f8310d799b140ae3087e1590946590ee48e4c1256f573d4f9e2b44d2eff7eb79e47cb314a49c0d3ad27e32525b56 SHA512 40f25aef78e1d91e2c75f7e0a5a30b22aadd481372b3a2d6965daebcd717d20e6b0d63a11e678ffc20c4f33875130d93ca263a3e43a32610b7a19f6e5fe1f8d6
 EBUILD kmime-17.12.3.ebuild 379 BLAKE2B 216ed6d21e1450630791516fc558d407840f4839a29251580707da273b38ee58e7a5ca0f7277e1d76df18be46e4f48582691e7d29b8a08d7fcf66d3fc4cdbab8 SHA512 9a3fd01d1dad25cbb1614bf1beec04bd3f6b2afdd93c9eb78b24992eb0920d2a5dd10259441adc92efd41c3b46307578e7fc8e8bfb78b8bff917abb8c4bcd709
-EBUILD kmime-18.04.0.ebuild 381 BLAKE2B 52d676a1e2fbdb96f54c165253d4a8cbe3d1174a6638b3cbbf86eb37042d073150e82f95c03fbe8465a6161c142969568cdbb74dc42e3d55d64ca974be692e7b SHA512 0011bcbc77462fe44c6ad9ee2534528026077eeae7effc8c50beb7210b7c76057639142bacf7447b7f28277b96f52b57f68fc966b97e8bb3df6f9ab3a1fd0dad
+EBUILD kmime-18.04.1.ebuild 381 BLAKE2B 52d676a1e2fbdb96f54c165253d4a8cbe3d1174a6638b3cbbf86eb37042d073150e82f95c03fbe8465a6161c142969568cdbb74dc42e3d55d64ca974be692e7b SHA512 0011bcbc77462fe44c6ad9ee2534528026077eeae7effc8c50beb7210b7c76057639142bacf7447b7f28277b96f52b57f68fc966b97e8bb3df6f9ab3a1fd0dad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-18.04.0.ebuild b/kde-apps/kmime/kmime-18.04.1.ebuild
index 18fc8866db0d..18fc8866db0d 100644
--- a/kde-apps/kmime/kmime-18.04.0.ebuild
+++ b/kde-apps/kmime/kmime-18.04.1.ebuild
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index 659e4378c11e..904cba7ca220 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,5 @@
 DIST kmines-17.12.3.tar.xz 882616 BLAKE2B 80d87205c646c6f4fba54bbbc92361678e6247cf34859649dcff73eeddf62fb6830b47520ac6778aab43cb0378c7469f0f82e14636e57abf1305c7ad6fa4986d SHA512 09f17fc4ebb8babd9c2a1470269e55c9f10f94680577812aa65ef84191668226e4aefe206cdab4997a05ef9db1eb45a568563da7061de8be6d1629c1bbbc8a33
-DIST kmines-18.04.0.tar.xz 882540 BLAKE2B d483b470f568015ed16e7ea6b1411f5d3153470e8c2186e65dc12f53eeb0059f2dd0a0367d40fb39ad47d5817f0cf95ecc5a9575b2f0702e2934bc7613c3adf7 SHA512 81572c532cdfc739d48e0984e717459921a16786890a848908629c0f1c3edce8938b7bb3548f0b09946e3d8408b45c43ac04321f1c3908e12e82ba80b13eca20
+DIST kmines-18.04.1.tar.xz 882500 BLAKE2B e8e1938cf860f89e8a0882e78fee79f3242da37d415d1c287856a697f531da8d6de03937b629c7749ceba9d9241be61cf5dafa28d1dc1c9b0dbfd9854cd5d1e9 SHA512 3f581f1713a83e9789ba7f19d5115b2108f6b54e644f53b123d548b715640e877af2719aa571bc12215de0f45ff7ab93c9a5888c04c4d967ba95d3b7cb385883
 EBUILD kmines-17.12.3.ebuild 773 BLAKE2B 10d7004524f7f641407361453077250c3069ce28f6dcf2281ed5bfb66bb155c8eb0bffcc4c857914acb960c3c13056dc7fd5c949cde406ffd6468ff6f81473ce SHA512 6fdd7890ce470b3596249de91c0194453fba15b32c7f1bd3fd4dea40ee375e636b80a3f718308daea3d99f1ff6d4b505114423deda6d8037cc04c18ee39aa642
-EBUILD kmines-18.04.0.ebuild 775 BLAKE2B b0d600e715c012424b6f5d13f1293b65b2e2ad7b999808cfca0d3565436377bd4884a7674fcdad38007ccf8326d7d6dd682d012bf1539292fd6cbe103cd5c78e SHA512 c4fc7ff0268222cd745be8f5fa449b7e0577f6811c67a330ff1d2036ffb90fb7d87ad225eaaf1de54210e20349772234eb4c81b988761769c080b39e7501ecb1
+EBUILD kmines-18.04.1.ebuild 775 BLAKE2B b0d600e715c012424b6f5d13f1293b65b2e2ad7b999808cfca0d3565436377bd4884a7674fcdad38007ccf8326d7d6dd682d012bf1539292fd6cbe103cd5c78e SHA512 c4fc7ff0268222cd745be8f5fa449b7e0577f6811c67a330ff1d2036ffb90fb7d87ad225eaaf1de54210e20349772234eb4c81b988761769c080b39e7501ecb1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-18.04.0.ebuild b/kde-apps/kmines/kmines-18.04.1.ebuild
index 517fa32429c5..517fa32429c5 100644
--- a/kde-apps/kmines/kmines-18.04.0.ebuild
+++ b/kde-apps/kmines/kmines-18.04.1.ebuild
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 6948e88af835..a2de65ecf826 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
 DIST kmix-17.12.3.tar.xz 1281524 BLAKE2B 7eb86417515b33a1ee0d50f87d20e2ade27df4be6792e9b2991065eb99bf123b0d5aefe4477c952a129aef08052dbc96960e32b58cafaad124e4072254e4d6b8 SHA512 e238331586a9c77792c10b1011f789ba739ff0811cf457e73812b31ffea7bc8bd4d3db66d5d50395676d1b8eebaf1894e01ae10166bddf7818c2833c6f346688
-DIST kmix-18.04.0.tar.xz 1283136 BLAKE2B 56b8d7e8c80445a9254fa8d7b6d07583c537d7c1f7977e9cb84d37ab7fb988b120bd86f4e1e611f94bbe1eb472ae98c55cc6d6aac66d31ea8efd08bd55ed86ee SHA512 342ebb659ad3466dd374973ce2ead176234e6cd2e19830e9432836b25b4dc813c66955685e45fadd1328f4460f26e930249c8ec703ef814ed652cec2ca145303
+DIST kmix-18.04.1.tar.xz 1284496 BLAKE2B 56e32b693391132bb3b4f6a040aa1cee48d746b5638cc3e953ee2e7f2e57a8905df1d80dad85d6f151e2fd0b7fae7fa4247320548c4c16c3fe40a409f4f5bc54 SHA512 c763548b76e2cd8e01654c4fe5499a21cfbd5152f927c007fa46518d6eadab022fdca02cc0c422a9882945897d85a61d1d05020dcad156fb5171bcfcef712a1d
 EBUILD kmix-17.12.3.ebuild 1257 BLAKE2B b6e380cfc5ad9dacfad944abdf8938eedeef0b2fb645ed3b8e9326991468a08d674327cb5bb883084867c13023e20b33ccb98b3b1aee513f005bf3ceaf0fd980 SHA512 a5f8527e8a10eab94ff93b1694a8656c460ae1b6c5bb91f4f6741a2a140bf6e0c98720b2041c69ec9a85ea86b82366075443bdc3c82c6676c418df42b28dddf0
-EBUILD kmix-18.04.0.ebuild 1259 BLAKE2B a6bbc426ed3368d528f398f4d97b9629312bb2f729d9b36f6cf0f5ad6bad3584253638400dfd62b3204078ef36967e0f5d6cf52be6ff5710cda067eee04ec512 SHA512 96c0bcc813d442a7dfbd28b35984008e3836fb19d7ef865d891329d0eab10b4405b170d722c54d5ee1c5469e34c64454330bb951d430a31358ebde56e5db15cf
+EBUILD kmix-18.04.1.ebuild 1259 BLAKE2B a6bbc426ed3368d528f398f4d97b9629312bb2f729d9b36f6cf0f5ad6bad3584253638400dfd62b3204078ef36967e0f5d6cf52be6ff5710cda067eee04ec512 SHA512 96c0bcc813d442a7dfbd28b35984008e3836fb19d7ef865d891329d0eab10b4405b170d722c54d5ee1c5469e34c64454330bb951d430a31358ebde56e5db15cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-18.04.0.ebuild b/kde-apps/kmix/kmix-18.04.1.ebuild
index 768fa6584e01..768fa6584e01 100644
--- a/kde-apps/kmix/kmix-18.04.0.ebuild
+++ b/kde-apps/kmix/kmix-18.04.1.ebuild
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index 0938149be800..3d8ccd889dee 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
 DIST kmousetool-17.12.3.tar.xz 110788 BLAKE2B b0212a774095735d69048430b0181a88d6c375ab74d850d8fd0a2e1978ed85a201d860fbf957b151f8f513dd785c15f4b3a8ec0616bfdcad43b456cd4a1ce010 SHA512 5e67d82d8034568c27e367f77e591688a3f9cb2fb0a84e06323994fa36f486004dc1bb9bf8c7d2cbbc42c234bbbcac95605e05eca6590ec53499f391b36eac83
-DIST kmousetool-18.04.0.tar.xz 111868 BLAKE2B 8548aa38b443de0fd6d08548014dfac066bcf163d568265d74abdbd4ec410d416b81049c7a319be32ae4d50d681b2edf2b9f05e799f4bafd2184ae64877ecca2 SHA512 e863a5861a93a3e2794dc7d7d5ba22a15ff1eb57e2bdbe1c6fdbb5222bf1afa8fa5d652d04db978adf8a526d4226f057001ab7908b318f57f5ed1faebff1d5d2
+DIST kmousetool-18.04.1.tar.xz 112588 BLAKE2B 5155cf81b7f2e6c4b55b5fffdaa600000ddca30981c1adb112d9d0614f58fb3824559543d2344c2f8137cf638395e2cb938051382b276c9537691526889017eb SHA512 04baa9c22ff60cf61be4c60081b23d83d666e91e31b912c02407b8c784ce8d746673f640f94f3254a59048ed33224d8ced6163fd4e722e5e55b6e5d5c7f22140
 EBUILD kmousetool-17.12.3.ebuild 816 BLAKE2B bc7593c687c3850e2bfff547c7d188d290f95a87d6f23c065933c69e43db52e6a195da367769a5c21cc91736e64a9d8e226f429c091155b7055dc32060390112 SHA512 c7c721c793d4f9f3c4697e372ddd0ce4481e70e162d83d8cc0dfcdf690f8cfde83d8e384c51ed4607985b9e70b8e4c572c360d8f91b7b09f5e1b3cdc121de372
-EBUILD kmousetool-18.04.0.ebuild 818 BLAKE2B 3672770cdaf03ff3fd071c1c36428c231c6f8662536c5c6c3f27cbd9708f3b1ab22e105b80354d5452f967bf3090f33f7ff1de98d5bc81fe13f11db7070b9b35 SHA512 7c0b69e3e9a03bb4b12d843d4e73f310ca2db4b478c85fce540a84881798f53cef17720f4c7093772c6cbc4461ed562c7072b7d9efcb4755791c955c7957a512
+EBUILD kmousetool-18.04.1.ebuild 821 BLAKE2B f5e6e898ea58477837ce48ca399d62d7795c979701149e3456269a2335db09061f0f46261d425670caec0b37434b0abd4a62fbfee050c3fb64924ebbac94f416 SHA512 a9369b2b459edb1f7c89aaabc36e48f0d62afd3dd073477367b20cedb577d6425162477fe53cb5f0348576c390183c9f85c25fac44ca3b5c1b1fd199586c8954
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-18.04.0.ebuild b/kde-apps/kmousetool/kmousetool-18.04.0.ebuild
deleted file mode 100644
index ed8aa9a18385..000000000000
--- a/kde-apps/kmousetool/kmousetool-18.04.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE program that clicks the mouse for you"
-HOMEPAGE="https://www.kde.org/applications/utilities/kmousetool/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/kmousetool/kmousetool-18.04.1.ebuild b/kde-apps/kmousetool/kmousetool-18.04.1.ebuild
new file mode 100644
index 000000000000..27f3e7583436
--- /dev/null
+++ b/kde-apps/kmousetool/kmousetool-18.04.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE program that clicks the mouse for you"
+HOMEPAGE="https://www.kde.org/applications/utilities/kmousetool/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXext
+	x11-libs/libXt
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index d64759d3b806..c4400a0ae11d 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
 DIST kmouth-17.12.3.tar.xz 1823724 BLAKE2B 782ebccaeab0fcbeba98fd6b3deebd3a19b445032e5b0b921d0130b88dad60b96cc4d7b46a5b5cc94b9a70620f4aee12704ad0c581bba7ca75d4218f5e17b10e SHA512 3f1af3952d8ed591b7e492f7db0ed3a80097b111e9b5f37039f71145ebb4bb6c907fad4748b6fb804e0f404ac1b30a7aa70e00946bce5ceaf3b54f3ad0f51576
-DIST kmouth-18.04.0.tar.xz 1766072 BLAKE2B c22e21871d34c8c559ea9f7453316255a5b152dab7034294f1b44174c43b0ee90ebdb591fbad388d30f277aeb4c43e4db6a230428bfac59196e7c8f7fc6ba383 SHA512 414fc0418ff441a07384941ac42369b7f23b4cfff93e76b0f2a3fa7bb77020e3b262725a044d49ae874b2556611bc05742f0f18777877e3b9d5683cf7c4041bc
+DIST kmouth-18.04.1.tar.xz 1766428 BLAKE2B ec91b422b7132d7e9f5370be1f3fe3f9d66b6dd3fb205a60b8659f9a171c1a47fdd0cb4c8ad0a956003520410dbc3e1bb4e75101556d9c0e44fb302f9f0c1d86 SHA512 eb0015ac4cce99adcbfc6aa1d5afea1b1234a4ffd1f5038d997a1855ce5ee47ba81607fde16779864340d3eb6842bdd80bb31f6d0d1dbe0d128dcc6554d123f0
 EBUILD kmouth-17.12.3.ebuild 770 BLAKE2B 28a86a37b22b5dba01003bf8444da389068e8daf9b7f903a4c4a19a219987afdf9faaad273d765f440d272e219b999b9de3562a148f2729382080cd15b83a1d5 SHA512 db09f5401d25b9e38e440ec9b705b2327f7329f3be9423e22183836654223646de3c63e5f93a4c945abe80a9c9a5c81bfbd4b253f8b984c9de624399b2d2f7a8
-EBUILD kmouth-18.04.0.ebuild 772 BLAKE2B 8b5ca8777554aa552b6451d9eac8f6f9e40d59b39642c344b8f5576a9ea5dec215fece9321ef6bb90aff548766e2c1603425242cfbfd6839fd13840755e99172 SHA512 e5dec01f18741b121eaa940b2c39eac03d61043620dde414eb1bed4dc704b2c279b6b4e4a337050eeedd61ea36cfc6f9ca20f2b6fce4165848a042fe5be86304
+EBUILD kmouth-18.04.1.ebuild 772 BLAKE2B 8b5ca8777554aa552b6451d9eac8f6f9e40d59b39642c344b8f5576a9ea5dec215fece9321ef6bb90aff548766e2c1603425242cfbfd6839fd13840755e99172 SHA512 e5dec01f18741b121eaa940b2c39eac03d61043620dde414eb1bed4dc704b2c279b6b4e4a337050eeedd61ea36cfc6f9ca20f2b6fce4165848a042fe5be86304
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-18.04.0.ebuild b/kde-apps/kmouth/kmouth-18.04.1.ebuild
index c648621058fb..c648621058fb 100644
--- a/kde-apps/kmouth/kmouth-18.04.0.ebuild
+++ b/kde-apps/kmouth/kmouth-18.04.1.ebuild
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 73725b0bb49d..f3b0cc50ffbc 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
 DIST kmplot-17.12.3.tar.xz 3024624 BLAKE2B bb733da35bc751b853e0e7f0b22f215552417bfefaa12d0591fd4a5d18e9c693b891a1521bece8e4bce68b653758001621078b082db2513a3814fe23f366894f SHA512 c82c6560e41aa24b7eed69fb24b1f96825b36ea8c6bc82a3d73d95aef74ceaf534bb4e7da64b68fd3a7e291e96790cee123d1c6fbef06b578996ba3df6180af9
-DIST kmplot-18.04.0.tar.xz 3024400 BLAKE2B 5c3a5fd9db9f8535db7d551cab0520e178c0190f9b8d3ca6df9a7ce9b29d963342835ea861332a630a39e01272040ec9c0cc828fc6779f440f7c6a2212844426 SHA512 c395afd2b6134656f047b47e426003a3a3aa83459cefee2248c9d4c4eaf0c61aab773ed4af612cb6c9f28ffd5cc30a025b6598ec03695f58b4efbea42f420c84
+DIST kmplot-18.04.1.tar.xz 3028864 BLAKE2B ae83f3175d5dd4ad18ec25aa1ee286ae05c5a16dae49fe52b7366a2c2a4bd66b82d4a8e08398f299b32bc5422727d08cdd649e356fe5cf9bd5f7e7381183a721 SHA512 1827a959c106348008d09ba7269b7adb40d2ec3ba71abc8163333dd25b82f062778cb53329aad79057a71cf174d5ddbb032149c284f4779ba84e5df302544373
 EBUILD kmplot-17.12.3.ebuild 930 BLAKE2B efb2b3bd9ea45ca378ecb970201fc6e8b407d27a182b394e0b7c574e81306353977d0b6c0afd61a5a257157e5d5930319b75eba768514cb65818f2a1af0c3a9d SHA512 7f7d9085b96b736c20b7a2281000a0550e9041176b2ed543ef78240f44f649e8994a6f4aa29073313ec1af57422ffbc9df2f1f0b93add0b1ac8f8b27075219da
-EBUILD kmplot-18.04.0.ebuild 932 BLAKE2B 34fd54c966744b264388baa2dd271f98e3170df02333cdac402fd2189d221e9dc9fefc7e70671ad1ef8cad41c3e0b4835a54ecc888ffe02b481801c3096f6692 SHA512 3c10eabb2745eac8c98a436bd1ea9958bfa24a3c75912a5333c5a37dfbf1c8bca69ba3987cfdf1b31ee35f88c15f35c0611d97a14f0aab65fe3ac32220ded28c
+EBUILD kmplot-18.04.1.ebuild 932 BLAKE2B 34fd54c966744b264388baa2dd271f98e3170df02333cdac402fd2189d221e9dc9fefc7e70671ad1ef8cad41c3e0b4835a54ecc888ffe02b481801c3096f6692 SHA512 3c10eabb2745eac8c98a436bd1ea9958bfa24a3c75912a5333c5a37dfbf1c8bca69ba3987cfdf1b31ee35f88c15f35c0611d97a14f0aab65fe3ac32220ded28c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-18.04.0.ebuild b/kde-apps/kmplot/kmplot-18.04.1.ebuild
index 029f91d4ded4..029f91d4ded4 100644
--- a/kde-apps/kmplot/kmplot-18.04.0.ebuild
+++ b/kde-apps/kmplot/kmplot-18.04.1.ebuild
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index 6283007a3d1f..bd48abbe09ec 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
 DIST knavalbattle-17.12.3.tar.xz 1220100 BLAKE2B ed09e00653164e254fbf1fa259861d26507ce61df5d126343691b804067c0facebf0aeb88d32d7d4d8f0440e66bb886f5ab469a904fe66d9980c83a7ce6920ae SHA512 3f15e67cff9ea4a055fe20896787568e1171cd3de58b57334be1bc3a50c0922b87a8f81c0fbd7acbe793c5882aa06581e73756f91bf15cfce3047dfa057e26e2
-DIST knavalbattle-18.04.0.tar.xz 1220072 BLAKE2B 53c0afeacff2a33ab9e7127b194eb23407c7eda8f5eb7f3163d57f2c61c4cf7296ff5ca0afa736e61f0e05031f659837e0d7d0b96acb8cbeefd0939d1341276b SHA512 4a665d40ae7da861ca5e42b67766b3da820246b5c857c6ec73be28d81188811fb570e9fa8a21545bbedd1ceb682f3162be11e1885eb708baf4b0134ef2dcce7e
+DIST knavalbattle-18.04.1.tar.xz 1221288 BLAKE2B 9d542d459a42f333792bf4bd117ba2a6593c7e6d7b7193abfdf9132a468f7f22451bae3679248f3df6a0946089fb63d499ba22266532c819a208ccbaf2cd1975 SHA512 f6ce84d2e8cc7e76b42ab065c4e9f57beeac94cd79fd63ae01bca9d985a36263291678f244220ba89875bf5323e5f5a5f5d18c5fb59dbc2a5b33b440ccfb1ff3
 EBUILD knavalbattle-17.12.3.ebuild 872 BLAKE2B 6f45834f266fa08a99416868578f894d12c04cb13fd023b56f5c32c82c19b02af5ed50a38a3fe667a3eff4e49431b2699c426b463c7543c1bad19ba669b31aa4 SHA512 ac29b5cee1b9d45e47167cefaac334fadf27f3d47e493415bb571557fd6a44aff1ce8f8fac623eb25e5899326782363b97cfb68c42756d22d87b26281c67deba
-EBUILD knavalbattle-18.04.0.ebuild 874 BLAKE2B 0a4214d170991f89f402a8ea61dc85a4aff52cb4d9ed54db23cbf63f639d4f1b0eb9ea835673a3888bebb479ad88f6ec0c23caa81dbe30bb14305788f8e6c6ec SHA512 7bd9501435861e85526502a20f16aabb2115c0c805687ba3b7ad759b03cfbfebb2f762954e7476a54206e257af398c76bdc3c780e1444afa41afd579931d4e8c
+EBUILD knavalbattle-18.04.1.ebuild 874 BLAKE2B 0a4214d170991f89f402a8ea61dc85a4aff52cb4d9ed54db23cbf63f639d4f1b0eb9ea835673a3888bebb479ad88f6ec0c23caa81dbe30bb14305788f8e6c6ec SHA512 7bd9501435861e85526502a20f16aabb2115c0c805687ba3b7ad759b03cfbfebb2f762954e7476a54206e257af398c76bdc3c780e1444afa41afd579931d4e8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-18.04.0.ebuild b/kde-apps/knavalbattle/knavalbattle-18.04.1.ebuild
index aa760fb43133..aa760fb43133 100644
--- a/kde-apps/knavalbattle/knavalbattle-18.04.0.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-18.04.1.ebuild
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index ac7ae98b4716..7f8b396a421c 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,5 @@
 DIST knetwalk-17.12.3.tar.xz 981588 BLAKE2B 9ab231ff78d0ded0fc44a1f3d719f512edfc831f2eaad7a1622259c399eee6272441532ae24ed40f324cb8ec65e8484954c1f0087ea8c6021e640b7a499fb462 SHA512 c7fc0cd8622eadc3036a1a286736162a9c6240546741591b48b74d4b5fa84aec25b5764ffd05ef7ec2ab85ad97bee7c0ec63d3f009e07410444f09b99f26ea9a
-DIST knetwalk-18.04.0.tar.xz 981560 BLAKE2B 77e158f5a2b5f545cb19657c003c21cf3096c1af589ddd788513d0006ef149ac6a59880f841c6228e1c7042e5e79e6d1b54628f5a6a76481bf54f108127f61ea SHA512 3b746800b270865f853b11ac130208cb8f44e99b9ccf082c7b6f25a38fc131f605a848b7ed2f0a5405094c95522db9010707ce7bc81d8816242326b650ad4168
+DIST knetwalk-18.04.1.tar.xz 981420 BLAKE2B de2fcaa827a37680962c8d804f6cbbe7f70b938bcbd4d52304df79c82d8497b0a41df4e07e270ce090d9a3e56f1ac32176930d731d597866054c5899707d7aba SHA512 d765742422f8439d30c7fde125b671d45cde76482a620b647fd2817a3a9de990bb19340c22760a76d098742486d41c56f2267e01be62d873710645dcb08bade7
 EBUILD knetwalk-17.12.3.ebuild 864 BLAKE2B 0c06b84f708811b29b156ce4adaab1026eaa439538d5f7a599f9d9d0d6da5cddbc30ee13c1f245a6ac489ad23df5cf8f45d35edb8680ccc3842ce3144a7a748f SHA512 adf4cb12f6d2628806e9702f67dd45648fcc78105e0bbb652a6e8c02752740d1e54ad1c63ef953b613d0ed52d950913bc031561341d8608b674ad8e76743eccb
-EBUILD knetwalk-18.04.0.ebuild 866 BLAKE2B 9504fee5cc5ff740aec0f22f3b86e09dd4178c363bb3d3520a485957e1ef76f24760755638fad19a125dada4cc561e079b524daaab674bb48d1029dee1187496 SHA512 078ee1be05e95a9013294b346e0db0b4711d17723922f421f6b928d218ed694e483a59851dc1f9f19507cd92c2e5cdd4999370712a145cfd2564b0473cd82fea
+EBUILD knetwalk-18.04.1.ebuild 866 BLAKE2B 9504fee5cc5ff740aec0f22f3b86e09dd4178c363bb3d3520a485957e1ef76f24760755638fad19a125dada4cc561e079b524daaab674bb48d1029dee1187496 SHA512 078ee1be05e95a9013294b346e0db0b4711d17723922f421f6b928d218ed694e483a59851dc1f9f19507cd92c2e5cdd4999370712a145cfd2564b0473cd82fea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-18.04.0.ebuild b/kde-apps/knetwalk/knetwalk-18.04.1.ebuild
index cd1421b84e74..cd1421b84e74 100644
--- a/kde-apps/knetwalk/knetwalk-18.04.0.ebuild
+++ b/kde-apps/knetwalk/knetwalk-18.04.1.ebuild
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 80fb96c41de1..c6596bbbccf0 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,5 @@
 DIST knotes-17.12.3.tar.xz 335744 BLAKE2B cb49c9542939bafe89846470d3a799128ff8f7397cdff3185e281fa8c00df40966560403f60639c3afe688bf863c4566073f561601be188eaa88804847a0c1f4 SHA512 b3c24cecdbfb72280d2fdd83b1cab481691980a9a29cd93a33af2a62421186b06d4df98bbde484d50140d8db3d17b0ea6186208bedcab7094a314fa08e5fe085
-DIST knotes-18.04.0.tar.xz 333688 BLAKE2B 509c6eb7472d93fc79d4210d4696fe99c0ddb324e1af3b9e1f412294d577edd56f6adf71a34fc9b45753cc782782b6199425e71727743f2cf18c83f72d8aaac1 SHA512 2d5fa579b9cd8245fd0b32010800cd4e6de5dbefec4b1f090e445e100e47e5d3f92311ece0706a338867177682828981a5bacca2280e9b38d481c3ba9d45add8
+DIST knotes-18.04.1.tar.xz 335916 BLAKE2B 3b52efe6188bf1e0fd9b960c02b4ded2d5b0806da0eea75b61d0603a071a5ad322de145dfc350b4574b6dfe1be498623d3b41f64cefb388662db138d5c8752cf SHA512 1e17b687dd187a67df858f4060f16854539dd5d69bc2a112a44cbcb2b228392a1e89d4d7bac9115839caa45f1c5cab6b5ad6e134ddd9eb315954973b1cbae353
 EBUILD knotes-17.12.3.ebuild 1849 BLAKE2B b3c436a1c3c07292e46de05368258fcd55a914388f01ce7ad8e0dbfacd1ef0276be14fec8934ce0e887a95d677b00bcb736424b4b728b65d7a58725dc91ffaf4 SHA512 cdc0a287ad739d2db30ecef025af186a5fa16c92658f9e66928bfff76fe405f5be44f67b3df494b54e2e31b293086c6bebfdac8a1e071cf95acfa9c0014a5a68
-EBUILD knotes-18.04.0.ebuild 1851 BLAKE2B bada3858e1dc27170d669f330da0ad3b88857e484eaf06119bcab5bdb9900ae05958908412bf53fc701c07769c1de246c3fa227cbe139f9c3fa4d2e3aea5a05e SHA512 4a847cb9b48503bcba01629ab034fe83774d603960eabd8c3317eb2c5de3ddf92998f6a34a5eb10f44b7cc02331c880f1a66593ded255e782fb77f422d0a906f
+EBUILD knotes-18.04.1.ebuild 1851 BLAKE2B bada3858e1dc27170d669f330da0ad3b88857e484eaf06119bcab5bdb9900ae05958908412bf53fc701c07769c1de246c3fa227cbe139f9c3fa4d2e3aea5a05e SHA512 4a847cb9b48503bcba01629ab034fe83774d603960eabd8c3317eb2c5de3ddf92998f6a34a5eb10f44b7cc02331c880f1a66593ded255e782fb77f422d0a906f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-18.04.0.ebuild b/kde-apps/knotes/knotes-18.04.1.ebuild
index 95df2eeed40a..95df2eeed40a 100644
--- a/kde-apps/knotes/knotes-18.04.0.ebuild
+++ b/kde-apps/knotes/knotes-18.04.1.ebuild
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index 741a338a9af9..57d3cca584f8 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
 DIST kolf-17.12.3.tar.xz 923672 BLAKE2B 2329786f8dfbbee92cbcd84219b091bd30872b44179bf1f688997df0b4fb05ba4a2dc45c634873708b4a2dc365dec325b21af8540114814c81648015e1a7242b SHA512 8040362317639222c4b4046b65de77888d66daa3e7d99dec9661e8b868b253408f3f45b5636b4b5771e0bc07700d506810e95e7339141901947b8bec78b5e92e
-DIST kolf-18.04.0.tar.xz 924608 BLAKE2B 32e3703a31a5ae5909509505b94c345b384ba6c07e36f1647c7ea028d3148ae4f4b6cda7cb6ba93b5574114286f995b693df34200930ed7352d9573c972b3e03 SHA512 6559dca60c2df59e14e4a4d6c235d020a4a5901754f7eefc474f48f74a4cc0948ca504fd0ede5b10a9c1925a427459bc15b168de0f9d0c4af3eb48ee810bb2c1
+DIST kolf-18.04.1.tar.xz 924316 BLAKE2B 0b760a559f522145437d8fb2d217a6f48499e9d60253cd17c9fea40c25ac117410b38aebe2cc615f8ce3975af37ab1c8d44d5ba981401cce31aad90413e88540 SHA512 dcdf3d47bb71fc254356b5500e3c641843a40ecf3ee2269fb17f8466b406a394129a347f986edaf1a7d1024b653d413877c1471affa4b7048edb5e114d6fde5c
 EBUILD kolf-17.12.3.ebuild 815 BLAKE2B 00ef1d34aa586ff26f65db6fa933b43b20a5b9d483d9f43e1d370b7be06dedef78e7a49dd7d5dff2e244e506f3dce10d9754c714864d1369074d43e2ab1dc7ba SHA512 b3b84088137f392ce0996c59fc630083f1dfa7aac5978d4525adc747da630dfc5c69810aded6f23b4651b9f24ae54cecf42809e0cd517eac8170f7aa0041529c
-EBUILD kolf-18.04.0.ebuild 817 BLAKE2B 1da1133b078288f0198bdb6afada8cbbd4f9f5edb05bf02c57e4788e3b916b3d9464a46947fc455e5dc54b0502968fe9071b9cd3cf8dd31bc114c1dba20134f3 SHA512 d253cb1657b52798e4131ca7b6d48df356693d716195665268194b1b4b21338aaaff5ced2373619f09be9253c80e1aba49e419ac0c76ef9925dea1c6353f82fa
+EBUILD kolf-18.04.1.ebuild 817 BLAKE2B 1da1133b078288f0198bdb6afada8cbbd4f9f5edb05bf02c57e4788e3b916b3d9464a46947fc455e5dc54b0502968fe9071b9cd3cf8dd31bc114c1dba20134f3 SHA512 d253cb1657b52798e4131ca7b6d48df356693d716195665268194b1b4b21338aaaff5ced2373619f09be9253c80e1aba49e419ac0c76ef9925dea1c6353f82fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-18.04.0.ebuild b/kde-apps/kolf/kolf-18.04.1.ebuild
index c4fe51941993..c4fe51941993 100644
--- a/kde-apps/kolf/kolf-18.04.0.ebuild
+++ b/kde-apps/kolf/kolf-18.04.1.ebuild
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 89877b7ed774..c4edd15b9497 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +1,5 @@
 DIST kollision-17.12.3.tar.xz 272044 BLAKE2B 86178a9a39c79accfd21e8797feddff506cf260e81c407c32ab465894f37df9877619aecbc66619f04f10b887ca27ade0c47bc1a96d1e24ce34d81a04a51993f SHA512 e28d33f6fa0e52b08c674a68116586561bc0a786fc089922c313107d1d3b39ee89768192a203fc7473cdfe40fb67675e421f1058443703df859f1003371f1393
-DIST kollision-18.04.0.tar.xz 272064 BLAKE2B 1d91bee8d9eaa691c890b817ec16a40d665ed1b3e5f7608de590d23f450fe0cb1c5d54b25a7acbff154eed44b5674f09fb591cabfa639dee66cfede898c34248 SHA512 61ecc6322076612e08d32acfbe43f952d315aecea66655f091c4fe5b01408d63080231743c3fd576d33238b66e2866ff1a0ba952e3ae616acf3cde8e6e79d2f3
+DIST kollision-18.04.1.tar.xz 272544 BLAKE2B 8ef58b3d2d5422451c63a3711935fba4d5f27d36ed03e6007e810994f65ad757a106df4d8066908b644ce1a0efc1b71eb74ccc4a359745bec17c7567ad8a9ece SHA512 2b7f4801089b290b9ce03d9b4d461f47427a15236fb5645f97017a5d5586dc4e17e866c0e547965bb28bd1bbaec1e181cf1f762e1dbf6d15c038e50412a3968f
 EBUILD kollision-17.12.3.ebuild 677 BLAKE2B 4aa766c5a0d006410dfe46eaaddde0c53297a4f138d6441383a1331169f3bb4a553f3ff3b35a68f12d85c4c1c3462f71bcc1c6d64bc0ac0d63b580b3a80fc118 SHA512 ba86505711ba8223554c71eb569c50319f71653cb92b9e329b82708d543a8c5056a00af6172e91efc1d0d739b7038b098b53844889c9c28f04e6580a2c2f8402
-EBUILD kollision-18.04.0.ebuild 679 BLAKE2B 6c6b183428a7eefcc27771c0a57339e65830ba080e48ed47cbdbe387576f06412926368fc6e730a9dbb692539b86b9437f402c2fc4d650d23d46e15290551328 SHA512 d377731ce231e3e3ac3026fcedd6455cf361bf848d7d26be944dd67827fb33e1c1f728b064848c396abb5eb25f094500ff10bdabed3197fb781ec4a7c8ca5af3
+EBUILD kollision-18.04.1.ebuild 679 BLAKE2B 6c6b183428a7eefcc27771c0a57339e65830ba080e48ed47cbdbe387576f06412926368fc6e730a9dbb692539b86b9437f402c2fc4d650d23d46e15290551328 SHA512 d377731ce231e3e3ac3026fcedd6455cf361bf848d7d26be944dd67827fb33e1c1f728b064848c396abb5eb25f094500ff10bdabed3197fb781ec4a7c8ca5af3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-18.04.0.ebuild b/kde-apps/kollision/kollision-18.04.1.ebuild
index 159531afe066..159531afe066 100644
--- a/kde-apps/kollision/kollision-18.04.0.ebuild
+++ b/kde-apps/kollision/kollision-18.04.1.ebuild
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index ae1bcb510af9..5b0a90d65372 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
 DIST kolourpaint-17.12.3.tar.xz 5546236 BLAKE2B 9cf7aa982fc92fcead172a43bcd0a73b9fe88b05a893d51251600bf3a22eee8973f112874f5253bc127c8b287837a144d0f2a2e21b997affb73979af50b34797 SHA512 abe94f8bb56e975914302429f9d38fdd7ee5cd7b7942f0684fd993c2db0c3b7ab83b7562eed2c1e5d8330939df7705ba99dfe15249a5f6f1abb6c5b1e837d2fd
-DIST kolourpaint-18.04.0.tar.xz 5546756 BLAKE2B 31850ca33256284de0c8f177396f087e6416a5e2cb8bc99cc78940193e762b99fd5e07f5ed23b8d512d827fc44b04c0f4b970ebfbc9a1b30129eea23c0db31be SHA512 d3b58f445262801d05ef50479be87dea5bc4e8e83bfa7dbff9104d09c88b4a14617252eadc50d1663b261d3721855266633901d625b156166060502595480e33
+DIST kolourpaint-18.04.1.tar.xz 5549048 BLAKE2B cf1ac1548133b5085ae5d54e9e8703be3f7b642127b7143006ce864e646c7c6373e04eed8b4c5b13f776b14cce6447334a61d35267ba74e95441e08109c8f37a SHA512 000a2534cbbb7bb026db9371c113e216b39ec48818cafe0bda8d04fcb2fa10a59b5532098d38584807de0e3e9368a2cf99ec83ab557a95b4778e2674bc917da5
 EBUILD kolourpaint-17.12.3.ebuild 1034 BLAKE2B 6e9776b8a4bc28871147943f6a1be6c0e6abb7f6b94fba18d2fa4d8a98abb00ac20a495c8ffae4315d70f53adf3c57d96f9186def14d067ac15cbd7f14c24f0a SHA512 2a91e2766f47103d893779861492223455289982fc509eba3919aee657f240b984d1daece66659275f5aacdf2543aa833f254c54ed505db591a1d4df5385a921
-EBUILD kolourpaint-18.04.0.ebuild 1036 BLAKE2B df3ded586352185271f0fd744a2a07c8523a8bfad034cba22b576c1431fc8965bf2b4ad605fa02c173ed1503146ee9b135fb37074fc68400c069e6b995f917fe SHA512 a0454ea658f33609cf469aa8c5d808078d7bf19155f8bedaa6562cac479385ea21912f487b189a1ce92a2c1e07dc171da889736f6a966628ca23f24a9f36496d
+EBUILD kolourpaint-18.04.1.ebuild 1036 BLAKE2B df3ded586352185271f0fd744a2a07c8523a8bfad034cba22b576c1431fc8965bf2b4ad605fa02c173ed1503146ee9b135fb37074fc68400c069e6b995f917fe SHA512 a0454ea658f33609cf469aa8c5d808078d7bf19155f8bedaa6562cac479385ea21912f487b189a1ce92a2c1e07dc171da889736f6a966628ca23f24a9f36496d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-18.04.0.ebuild b/kde-apps/kolourpaint/kolourpaint-18.04.1.ebuild
index 5052eeec56d2..5052eeec56d2 100644
--- a/kde-apps/kolourpaint/kolourpaint-18.04.0.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-18.04.1.ebuild
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index 5a5605d1255a..52a2312e4635 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,5 @@
 DIST kompare-17.12.3.tar.xz 710940 BLAKE2B 421d6c9a348f7f50272fba87c3c92f078604c1f4d641514ed30b92a1f8582291b69f85bdeb027a390c6c71df783db54217ed7ba3b12d60aae398696c0589ac44 SHA512 19cf624d6e3362d3b0b6d384b08aea25b74aebbeaf7c8f6c4849eb233f07016189a393551c2a0a60b4b31094b4f5de1d0c1bd747c0829ee2f2276e570a22e483
-DIST kompare-18.04.0.tar.xz 711028 BLAKE2B 40b96752624c151c4bedeb38f463f8a39e78cc31cf5a97995b2818c0ee4b8d66b9bba1d4aec356a8100286107a0a3d57ef6455a0576612c51c6c884f831a7606 SHA512 cc11ff60faf503f6b99bd3a0b094d3ac7c74e35adb1f1d6d0575716756d85e5b910ae9e56b08bcb00a70e942b4a88fd3c46a383c9b877deee5b1518cc78cf8e4
+DIST kompare-18.04.1.tar.xz 712084 BLAKE2B 74d0694cd9e84f73f08eccc81bfe07ac8f28b9aaac35a62b3e501f6ea0c3b0c0e7261ec61d8b55b2f31d3bdd04c3ebc6c3c5696f48fc9a8b9fe5ea72c5206ad0 SHA512 2df9729c7d4437cca014a1ad4b2edf020644cdc8b9b16a464a7fb1d0cd97512afd5903cf4f45f31713caf8a0ec20cb2d9d33eb6ecb8693524d22760790d0d79a
 EBUILD kompare-17.12.3.ebuild 957 BLAKE2B 7b5ebca036dbca4a2306a6c090b758850cb904f34a845b5c74339b3b203b5c9df205a21189707be0d39097603340785456bcf7531986dfc2369bb8ac807449d5 SHA512 3dc0f9aa5b85f173d7150f074130d5b2a25262113c63a735bc14d2998cc2eab5da4a71ae61fbb340d6a8aa0fa6e89cc66c2622d1864d83b0022fe41b93573c4a
-EBUILD kompare-18.04.0.ebuild 959 BLAKE2B 3b70af60469b94895ec7dc93ae77e40aee70bef5cee9fea82c95b6e0f22f4b5515630905ec820a930aade616e7b06b35c3e004db673ce1f279b41347e6fb7d95 SHA512 73c12348fd0005db8f423272c661a3f7e5de65cba7f7732793d94db30ddaf542a39948611f9307cfd155471dcbebef49be8b00ae24f60524482c48a2279cc2a0
+EBUILD kompare-18.04.1.ebuild 959 BLAKE2B 3b70af60469b94895ec7dc93ae77e40aee70bef5cee9fea82c95b6e0f22f4b5515630905ec820a930aade616e7b06b35c3e004db673ce1f279b41347e6fb7d95 SHA512 73c12348fd0005db8f423272c661a3f7e5de65cba7f7732793d94db30ddaf542a39948611f9307cfd155471dcbebef49be8b00ae24f60524482c48a2279cc2a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-18.04.0.ebuild b/kde-apps/kompare/kompare-18.04.1.ebuild
index 5c3fbbe779a7..5c3fbbe779a7 100644
--- a/kde-apps/kompare/kompare-18.04.0.ebuild
+++ b/kde-apps/kompare/kompare-18.04.1.ebuild
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index ecb74e114bd5..5d523b9bb72f 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,5 @@
 DIST konqueror-17.12.3.tar.xz 7720068 BLAKE2B 803f1ea753764be169339e48f490f4e379eaeeec1ab048fca8fc75c82a0b952b9f1e1a3b0cd1f40f35f7412d51f1b8c909526c03676b8e946acebcfeb060296e SHA512 12d3b33b8d437e8f20bd329281c3b03600bc15d2ebbb85016b79d9f5da002f88f2906cc982bc3e5c94d8a9511880ee0155e6ac800e7186ad8368620b3ab5ff92
-DIST konqueror-18.04.0.tar.xz 7726188 BLAKE2B 84af194200333fd734b1aec7b7b2585b51dc0d8e6d311af69fd705e499da994ab16ec648a5b67d75e369034d0525827986cd3645db5b31bc559bdccace02be97 SHA512 c424836befecb8d5911534f91f4f344b03758562af047f150177e23f1c6b161c3e0c99a728130420cb59ad937619a9074654c6f0243bb4658b564d71448108bf
+DIST konqueror-18.04.1.tar.xz 7729888 BLAKE2B 22f03c2d8cc1a6c7ee4cc470a8aac9bc63188957f59929f1f27dc148fd47378b91cca7d2fafe9021a6e0c7cbdd066e02c47c1496134a76320c4e8cb0d7732a27 SHA512 7385c753fee216a728c08d3d7dd4645a63f95804a158ab4b0d38da69d1c8391ebba3e1cd6d8f5b349ab4e12c659c6a38d01dba43119828668c8f6080e3976be1
 EBUILD konqueror-17.12.3.ebuild 2782 BLAKE2B 356f538e8b789972345c451b56226ba2c8f14bf998f6e4e314a54047a9b1af2aea560b9abc39e43bb7471fbe5e4e53cce56c520a3dc521cb2b9c25022dd8854b SHA512 7c918eb59c79a1aa283ad7b9fa0d237c0fe68af5a4397002934db635cbcf2e4abbcb99a2c0f2c7ca6d7efcd52840605213be9730f2b96a779ca9d46ee0d591df
-EBUILD konqueror-18.04.0.ebuild 2815 BLAKE2B d6413c2b3e99bd5d8449f23b6c464afa56c7ba81128cd09a47de7433f5225cee75e9c6e502d8378f9922a037c9d2a3c73c6fb2d3d5e262ad18d4928a3a344049 SHA512 0088f4f318a8c2851cd1eb68b76922b4ff478393e2ab7259121c82a1584d143e3184597b571b1f4bfc97fec575cb474db5d897201634379da88f1ecb2dfbc64d
-MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955
+EBUILD konqueror-18.04.1.ebuild 3001 BLAKE2B 0589ca1207c070b35188e6cff8d90c24abcb2c0567bb2291ac525869f22ffd7824ec596c4798e396d7f8b55b60fcf72967f2ceb467037101d2360cf772afca74 SHA512 631bb163fd808a8950a094ea8d958098cab38e208a85afbb2146730cbe6379e89f116937a32645e86530beea1e4994c95371a7298f4b7dee0f948f9cf3d3245e
+MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/konqueror-18.04.0.ebuild b/kde-apps/konqueror/konqueror-18.04.0.ebuild
deleted file mode 100644
index 9f52a596a115..000000000000
--- a/kde-apps/konqueror/konqueror-18.04.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic kde5
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="
-	https://www.kde.org/applications/internet/konqueror/
-	https://konqueror.org/
-"
-KEYWORDS="~amd64 ~x86"
-IUSE="activities speech tidy X"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/zlib
-	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/htmltidy )
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-	activities? ( $(add_frameworks_dep kactivities) )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kfind)
-	$(add_plasma_dep kde-cli-tools)
-	!kde-apps/kfmclient:4
-	!kde-apps/konq-plugins
-	!kde-apps/libkonq:5
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tidy LibTidy)
-		$(cmake-utils_use_find_package X X11)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-		elog "For bookmarks support, install keditbookmarks:"
-		elog "kde-apps/keditbookmarks:${SLOT}"
-	fi
-
-	if ! has_version kde-apps/dolphin:${SLOT} ; then
-		elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
-		elog "kde-apps/dolphin:${SLOT}"
-	fi
-
-	if ! has_version kde-apps/svg:${SLOT} ; then
-		elog "For konqueror to view SVGs, install the svg kpart:"
-		elog "kde-apps/svgpart:${SLOT}"
-	fi
-
-	if ! has_version virtual/jre ; then
-		elog "To use Java on webpages install virtual/jre."
-	fi
-}
diff --git a/kde-apps/konqueror/konqueror-18.04.1.ebuild b/kde-apps/konqueror/konqueror-18.04.1.ebuild
new file mode 100644
index 000000000000..2ca638dfbc27
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-18.04.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic kde5
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="
+	https://www.kde.org/applications/internet/konqueror/
+	https://konqueror.org/
+"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities speech tidy +webengine X"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdesu)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	sys-libs/zlib
+	speech? ( $(add_qt_dep qtspeech) )
+	tidy? ( app-text/htmltidy )
+	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+	activities? ( $(add_frameworks_dep kactivities) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kfmclient:4
+	!kde-apps/konq-plugins
+	!kde-apps/libkonq:5
+	$(add_kdeapps_dep kfind)
+	$(add_plasma_dep kde-cli-tools)
+	!webengine? ( kde-misc/kwebkitpart:5 )
+"
+
+src_prepare() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+	if ! use webengine; then
+		punt_bogus_dep Qt5 WebEngineWidgets
+		cmake_comment_add_subdirectory webenginepartexit
+	fi
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package tidy LibTidy)
+		$(cmake-utils_use_find_package X X11)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
+		elog "For bookmarks support, install keditbookmarks:"
+		elog "kde-apps/keditbookmarks:${SLOT}"
+	fi
+
+	if ! has_version kde-apps/dolphin:${SLOT} ; then
+		elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
+		elog "kde-apps/dolphin:${SLOT}"
+	fi
+
+	if ! has_version kde-apps/svg:${SLOT} ; then
+		elog "For konqueror to view SVGs, install the svg kpart:"
+		elog "kde-apps/svgpart:${SLOT}"
+	fi
+
+	if ! has_version virtual/jre ; then
+		elog "To use Java on webpages install virtual/jre."
+	fi
+}
diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index a198affb5420..462e8ca3746b 100644
--- a/kde-apps/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
@@ -8,5 +8,6 @@
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="speech">Build text-to-speech plugin</flag>
+		<flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> as web browser engine (fallback is <pkg>kde-misc/kwebkitpart</pkg>)</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index 7232732bcf49..09307c07ebd3 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
 DIST konquest-17.12.3.tar.xz 658364 BLAKE2B 45ab884319512ffd4e8264b5cff389906c53552148825eb1028ae5bda9f324f00df19bb11a45573aa42f5c07aab0f451436fff1028bcedb0c73df4024993a4af SHA512 24c7dea266b3acbd7d006592c15a0ed28e55143a04ed107806bf9476eeb0ac8d30af18abde283e89433bb86f151d5e0363c8db672aee49368a53a963ad3bc7e2
-DIST konquest-18.04.0.tar.xz 658328 BLAKE2B 4215878c455198719a84333fe7d17c3e4e4faf771d86a4ba377a80ada1c4eb5abeaa86167e124d3b4d8738102412431ce4d772329a71d3c0dc9320c36a7b48ab SHA512 687bfa9dcd4c09a6b7bb0add9ac9560cbe4234e64baea1e75872cb74ba857925590f26d14a21b793080b5f4106c846a83aa04a6d4a94834fc5465304cb6726af
+DIST konquest-18.04.1.tar.xz 658768 BLAKE2B 2bc4ef09c14c1264c5c09005efbdb2111cab675c4c3263e9fc761d0cf20e01f058d67e05317952e9ee79365fb28bac7ad96f535d32520571d7cdbdcc54e2bd2e SHA512 44e0950c0de9dd988035cc6b9a77e20cd1860bc14769737772d92eb7971d23d6076f37ddab32c39a414ea2ec516d4ec2121152f4db651b61e7b05cac3baa46da
 EBUILD konquest-17.12.3.ebuild 791 BLAKE2B 3f0d7085c9c1c666655799412dc59a7a42eeba0bcae00a63eec0e6b633a7e5108088e30098c0fc962441f3d9e1a666ecfb3c6fcb5986d50e0d8685511d01a921 SHA512 5954afd4c9bed7e21e9b1ed5ab809e0e777e57a06242fbcf6cd87219a2d85d82c496e52186a730d88d8460262700a4ad247878e4f9db2525266007addbb34c2c
-EBUILD konquest-18.04.0.ebuild 793 BLAKE2B 4af4ecc52b869bbfd4b6aee14dadc2ae1e87ecab3cea02b1cdc50e062d6ee09b2085467bc56c3af5adf98df73e2dc78ebd24207d5d3af356b68bf4dc761193c5 SHA512 295bf448bb9e99118d2c8057831c437daf5dc42deb0032bd08416ddbfb8bf435f54ac1cc87b553c9ba7c4087b7d3bc88ad69c6471f4a12c5f16551591df09b92
+EBUILD konquest-18.04.1.ebuild 793 BLAKE2B 4af4ecc52b869bbfd4b6aee14dadc2ae1e87ecab3cea02b1cdc50e062d6ee09b2085467bc56c3af5adf98df73e2dc78ebd24207d5d3af356b68bf4dc761193c5 SHA512 295bf448bb9e99118d2c8057831c437daf5dc42deb0032bd08416ddbfb8bf435f54ac1cc87b553c9ba7c4087b7d3bc88ad69c6471f4a12c5f16551591df09b92
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-18.04.0.ebuild b/kde-apps/konquest/konquest-18.04.1.ebuild
index f2519a625009..f2519a625009 100644
--- a/kde-apps/konquest/konquest-18.04.0.ebuild
+++ b/kde-apps/konquest/konquest-18.04.1.ebuild
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index e1363708430d..222aaf606250 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,6 +1,6 @@
 AUX konsole-17.12.1-libinput-pixeldelta.patch 1914 BLAKE2B 27fdeb10eb73f0e935ade90c3c453256e5e8bde94ef4ae3920b6e6caeb109c8fba226698745c6d7116116e3c0e6c8aaf935e77c503bba52549874b861d26809d SHA512 0d9cda130728f6b5e618b73fbc9c07431b924d6190df8f91f7801b798822ce001e7b077fde2992dd8f570bac9e7af857576e149fbffbfe37ae4e9a7b3873cb5b
 DIST konsole-17.12.3.tar.xz 1026672 BLAKE2B 98f2f545aae26965009a79d196640811702e9444a21c665db1f4da277a1059943f192a31ea1020c52867523ad40bfe21bc09503ec2643b289da1ed69c7eda30e SHA512 973c47341ebe729442ba8f8a7523eccaf5da28afbfe236fd4ec2897f710c3967f22ed5cd8f2f997f631a5369625c830f7a4540cdf6953874c2f556f547c413a0
-DIST konsole-18.04.0.tar.xz 1039396 BLAKE2B d19333ef25c972eac943b0c551c105fb5b9019d63a36471335f52b4c05f5b47eaf672b37dbd09f6434d696663cff1ec348f78034fd7de0761be0e336ced55aa1 SHA512 bbfe004a2cc75e761cd80ebd08e5c86aedf3c43fa9d4273008f0bbda59277f85650a9d59201c3591f2112698159da4ea4e72b02583130a20a048b31e67353396
+DIST konsole-18.04.1.tar.xz 1043036 BLAKE2B fd5fe81f8e985b2a78f5ff4cca7e5b97d2359bca8d24a632f8807459b70c06f4500036e36ecb6f3891413e300b1486103ca8235092ddf53bd850bb96ce3bdff4 SHA512 cc73eefe0c7fe4e9ef91f4085ae19f658a5ce31e0617f2cb06c7faee57feae33fee6071aed63b6a599d8d0cad6fa9877908d64eda8573edf406205bdf70f2570
 EBUILD konsole-17.12.3.ebuild 1454 BLAKE2B eaa62cd6b0b0a5467bd2f66f48588a1c961d07e42441b1a64caa1533faa15df7a5549b3eb2ae4e59b6fd65f45f3ad0e53373509e61f514ff97a641c684131f64 SHA512 1ab838c8422d38cee71f1ec09613bd0b7077d844d037345144a2e905d63d90ba4c0f4a165ef7702dfd798a571cc03670b6fbb0ecba0d58704115f102bf8d5d87
-EBUILD konsole-18.04.0-r1.ebuild 1422 BLAKE2B 778c8136ecb75be65351a76e148c6623edcaf5c77c2d5c1102330d16636e8451887b0721eda816a89b22505109d19f5f0e0e20ae89f5b2f1715f88dcf396ed24 SHA512 07cba89c64e10561589be711e4e806d91fb6c4cf91c88fcc2033df0d2efd4b7097c20d4849dd78f08f568da8d16676b8c2a25df0dc969bf6f8e07fcb1b0d3879
+EBUILD konsole-18.04.1.ebuild 1422 BLAKE2B 778c8136ecb75be65351a76e148c6623edcaf5c77c2d5c1102330d16636e8451887b0721eda816a89b22505109d19f5f0e0e20ae89f5b2f1715f88dcf396ed24 SHA512 07cba89c64e10561589be711e4e806d91fb6c4cf91c88fcc2033df0d2efd4b7097c20d4849dd78f08f568da8d16676b8c2a25df0dc969bf6f8e07fcb1b0d3879
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-18.04.0-r1.ebuild b/kde-apps/konsole/konsole-18.04.1.ebuild
index c0b85015b179..c0b85015b179 100644
--- a/kde-apps/konsole/konsole-18.04.0-r1.ebuild
+++ b/kde-apps/konsole/konsole-18.04.1.ebuild
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 7588fb4757fd..26d899ed7e42 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-17.12.3.tar.xz 223424 BLAKE2B 57622ccc637d9a41634d90e764f1c9dfdbe60e7a77d13632397e41222dc1cc5b544f268451132a11f8a3118a9042c701e993eef512ef5ac1df05aeea6bc1d35e SHA512 18c8bc3deb273022543c209410403f7bf7a9b13bcbcf9be601ef011dc9ae6c0335d866d1e696b410fcc4751830cb824a1fe530299ae76fe92e2f785f6886bd11
-DIST akonadi-calendar-tools-18.04.0.tar.xz 220516 BLAKE2B 58be803415e1c6ff6f02930a356d3db1fef605bbf97abf0cd8b8ee05596881d173973bcab0af37f5c933f56ee2dcddafcf765e697d8667e94a662a8c304dc20f SHA512 cdbc1a59c5fe85928786ae8645d19322f108718e9c90fd55aa78f48bcceee98ebca328f814630fd188b7e22f1c889dbc112077267523c76adc622a2b8733cbee
+DIST akonadi-calendar-tools-18.04.1.tar.xz 221120 BLAKE2B f36fd0f32dd9554b992efb859b05ec1e09cdc649be12f7f0cd55ddb9b6db814763fa43b191eb3969eb02478ac85b465ab327c94832156e9dbd7c7613e9b889fa SHA512 7c9985a19882d31b698acbdf94eea25d6f572e7fd53927691777a4bf768b86c630c0801cd8118cb0770fa66a8949bf81a032d0c6e4c83b945eb1274cf4ca0542
 EBUILD konsolekalendar-17.12.3.ebuild 942 BLAKE2B 9488a6d4c482fd997d83dbba4d8a461af2c7594832bc30ca9ccb1de4a804021db5121a659bf1c2da3a23dac63f58d7ce2af33ff63b8906fc66e3915529cdc245 SHA512 944719833fbfcfa708a2f77b840782cd42b5abeb9d06339c07ea98e8f97f30bcf868a6e6c98d9d7230b76ed33e85691ed5f6e48dd0ffdba6c2e8d0acaa0d9a85
-EBUILD konsolekalendar-18.04.0.ebuild 944 BLAKE2B d7ebd61dc165d1b27f594b2ff0e9c8cfd7a7a420708bb818273028cb388338f57bdca34a729e0e078d5a67449d0a54f3842eabf2ac3156eaf8c8a398a28cb43f SHA512 1da4cd1ff978c206ac1123778984679c10801a2b20bb10f5853d83a598f8860470f8d2e22eedb0c015297a947ed809317bd165523f7e7f9e0a69fb4a2aabe199
+EBUILD konsolekalendar-18.04.1.ebuild 944 BLAKE2B d7ebd61dc165d1b27f594b2ff0e9c8cfd7a7a420708bb818273028cb388338f57bdca34a729e0e078d5a67449d0a54f3842eabf2ac3156eaf8c8a398a28cb43f SHA512 1da4cd1ff978c206ac1123778984679c10801a2b20bb10f5853d83a598f8860470f8d2e22eedb0c015297a947ed809317bd165523f7e7f9e0a69fb4a2aabe199
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.04.0.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.04.1.ebuild
index 5e43736100e8..5e43736100e8 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-18.04.0.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-18.04.1.ebuild
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index e039e9ce11fb..ed8e57288791 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
 DIST kontact-17.12.3.tar.xz 862984 BLAKE2B 3428fea3f4b207fabf3e0a486044f79487baa1c3d5012835f4d502c884212dd9973d90c8ad2dc2eb53ee17d47bc1d6dd40f75dcb2202b696406f9f054956aa8d SHA512 f6ec9c2e4631246aca06d6af1cd0681d7cd1477d6932ce24d444f3d74e9805dc91da62afb40093e088390778a2ca08c92ae186d30de99bb488406cbdda7a0c86
-DIST kontact-18.04.0.tar.xz 861444 BLAKE2B 6412202eaa82c102073c58c5c65b8490d6052c4c3121416aab1ebf4d13d26c04291c7def7d55632babc6af874762a50a859ed63f151b48b8fa750ace799199cf SHA512 53dfeea617c3977a2808abd83923ca42b55c25172890211ee782471ddaaf0cb158eec381f4ccd6bd2f4d097346a3d9c567ceb6b13f2ebfa70d9f114ec0becd15
+DIST kontact-18.04.1.tar.xz 862660 BLAKE2B 6a1830580977bb2b469867d872aaacf75d52e697eb8bdcdfc646b015286ecab694818814acea8a56d9aa4a7196b8d48fda68767e9af7942c65769c2f2c57070f SHA512 8e5b9b98c614a96b04ba6ef1e6b95561db373570f866753a15ba643e790bc4c843fb5169a7af4e64293b62fb054c2476c0cdf8661162f86c44528e8893656943
 EBUILD kontact-17.12.3.ebuild 1201 BLAKE2B 25a39047a7b805c48b0e125a9abdd90fd399f4adc01857261370205157d3dd8d92e7858d6be58434770ae0cc29eeed686894c7c8d377ff3bb9a114fb7bc93331 SHA512 8fb6256b7a1e35ab92642cf673ff334281deb9c6e8afde36dea0357d39e942aec77cd602186cc69e1f4e49f758c7fb6b4d995c938b8a230f465de270b4d252a3
-EBUILD kontact-18.04.0.ebuild 1203 BLAKE2B cdef8cba6e3df6aec11b61303dc23fcd1873131a3dc96ee29850bb122e44eb6e3aad6c4bb03d13b42ec956637f9f6d594ef64ff2b7859b3a84f81b4c6a461a35 SHA512 d37fe6a38579456611800285b765b19c957f18b0957fd4321fb93129b4fcb0a74d1ba75a16c634ab0a3f0f897e156b9fbe20fae26729f1f5660e57588033e882
+EBUILD kontact-18.04.1.ebuild 1203 BLAKE2B cdef8cba6e3df6aec11b61303dc23fcd1873131a3dc96ee29850bb122e44eb6e3aad6c4bb03d13b42ec956637f9f6d594ef64ff2b7859b3a84f81b4c6a461a35 SHA512 d37fe6a38579456611800285b765b19c957f18b0957fd4321fb93129b4fcb0a74d1ba75a16c634ab0a3f0f897e156b9fbe20fae26729f1f5660e57588033e882
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-18.04.0.ebuild b/kde-apps/kontact/kontact-18.04.1.ebuild
index e768a574bfe2..e768a574bfe2 100644
--- a/kde-apps/kontact/kontact-18.04.0.ebuild
+++ b/kde-apps/kontact/kontact-18.04.1.ebuild
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 7915eb228809..3ed05f591da5 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
 DIST kontactinterface-17.12.3.tar.xz 32768 BLAKE2B 3bdfcb9910bd733a937a90cf24b9af15b6dfeb5c41a996f86229a0cbdebaae3103e04fbb21f957f6e246891345deb7167d99cc492d84832e5ebba28910c2fde6 SHA512 e65bbfb7e717f60aafd47d4a0f8f37da3058a1c1f7b6ada3e806b1c292502a91bd2f7cb46a4e9f2512e8b4f33aa93fd91cbc891b68d89ddb14a33acfc1b0aa57
-DIST kontactinterface-18.04.0.tar.xz 32960 BLAKE2B 9d3b900b13e15e624a96037dfba20a616b967e34b979b6f92a33f6b698f24ef6e7314025004bfeb7a8a5972ff5a7e5acc1621a0283613ffd5129b12e91adfeda SHA512 588754479be3c4829f8d9d4b5b7c57797a124a034be8df4cf8b37c969509a9dd0d22a55d5a6f52e044f397bb30865a2b20aec0dc50a7901854966af7b33fc55d
+DIST kontactinterface-18.04.1.tar.xz 32864 BLAKE2B fd092d3c27951baa84109aab69e8ff49f31270e94954cf975eda63d659b0be34a3fbb825099a25a54e71800ceeb5faa47484690143bb3262e3b61f38eadefd35 SHA512 13ce42ef6e50d21070d73671af59e5ffc9d555e73b826460f1f385971b06758e9ab78173f053c829866840221508655c1af75097b3fa6ab13dbeb1da600bc08f
 EBUILD kontactinterface-17.12.3.ebuild 592 BLAKE2B 459a8ab4dc042f07180f7571e3a23d1e99051835e77ba7f60b79b188fa592f0ccab18991ffefa550235d1fe54fbbafa8ca7a2829ea54898051404f28b27fbe52 SHA512 7e8dd97122cb8ad60418dc70f39c153b8cf0f4be05724be1ed4890c87cecea3daede34b6f7df5dd36706699a4adc5da78f5ca34d3a4c96590f6c56681dba94c8
-EBUILD kontactinterface-18.04.0.ebuild 594 BLAKE2B 6dabfaa2233c3fd1fab75a4a8a9c1e2329f94ccdecbcc81d483ec354f27d9abc15e9b4b6ac231ae3e3f3bf562ec7e79239787764ef56eafcfc116287036236a7 SHA512 2f16ac78757ad95fb651605c1d71ce09715ff517fb00e46b7dba71a0281c420d35ef8f1bc45290ed911df7db31760b2a91cb71cc13da40f2365825914efac3c7
+EBUILD kontactinterface-18.04.1.ebuild 594 BLAKE2B 6dabfaa2233c3fd1fab75a4a8a9c1e2329f94ccdecbcc81d483ec354f27d9abc15e9b4b6ac231ae3e3f3bf562ec7e79239787764ef56eafcfc116287036236a7 SHA512 2f16ac78757ad95fb651605c1d71ce09715ff517fb00e46b7dba71a0281c420d35ef8f1bc45290ed911df7db31760b2a91cb71cc13da40f2365825914efac3c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-18.04.0.ebuild b/kde-apps/kontactinterface/kontactinterface-18.04.1.ebuild
index 9622e2e660cc..9622e2e660cc 100644
--- a/kde-apps/kontactinterface/kontactinterface-18.04.0.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-18.04.1.ebuild
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index 60cf6124ab01..cde794836346 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,4 +1,3 @@
-AUX kopete-18.04.0-oscar.patch 814 BLAKE2B a098ed38f9781f1f51a4d656cef8849da61fafac72371905061cfe1ea3d10f558c1d5227556a486b80f464d95cd0937b4ba0de5c9b891d8ef087cd8bb90dcc42 SHA512 d09dd7353380f6e6e5cc934831f8125c96077a754bb570118af2724fcdc7b83401a36ef03ce31ba99d0204fa35f6b2b395f980a98a52bc4ac9e9ca62c5baab7b
-DIST kopete-18.04.0.tar.xz 9748688 BLAKE2B e4fb74b1dfa8627c8d47000f0841c5d51c18098fb8ed20c14742fb63aa2f078366202dede55a92e6572ded532cb67fe9af320b308128702764e7e566e85a4e49 SHA512 50b7d4e7d219a723d721ae979c310e0b8d80a616876d833d1ea13d3c074b1cb16c08c4909849f42b292e8482b439070c054fd83c721c9128455eaf0bc75b18bb
-EBUILD kopete-18.04.0.ebuild 4664 BLAKE2B 1a11015093fcde521c639c62005f773b8450632c3c47e55942205c555a5be597b71c15ee112f1b5a79b87831f588da3e1cb737d2005fc54ccb22fb0cd7b59c38 SHA512 8189303d0b63055d688ca8a9da7eabde9b3fd70227b9a3c12bf0c5b84223285d32c25774dc8b7225228e5cfe869c59d21f2f5182b32f80c9f2a5c1b440bc8c79
+DIST kopete-18.04.1.tar.xz 9733608 BLAKE2B 33879b2d95c47f1d21e50b0577c82ce8a619d2967b8b6389cac11b0bd3b1235c9789b28e318f89387496639669cbebaa1e109d479b6365622bef74cb9d127d04 SHA512 2b503ba717d4b64823a64eb093bc4ddbdeb7cb7ae0a73827eaa4a8ae4ad3a5aacf33c4d9e3cc28d88bc4f915418135ddb6b236e5c9d8227e14c802f8b9385e6a
+EBUILD kopete-18.04.1.ebuild 4615 BLAKE2B b6d483eb30ee85504a8ff917549d13354be4b907827d61c398303ce594086c536a8570561fd0bf1e4dd5e719ccad49ad4281d3727c283f06381e59e1a0720fc7 SHA512 c56282f80044aa835bec79c03b0e4b03b54641c41e262cf02fa1bc0f56c52de09f2cd5fa5c6bca01f8ae7ecdcde4f13a2c481530e01ed3078948f7e68cedb799
 MISC metadata.xml 2351 BLAKE2B 0f8ef4e3906f98a4be58f252fe1beb8ff8a9bb872584e5be9432d63a4932872a81c3036a9cd0d72d98a1ce961ef79194b613b5115e19970e352d5b832bcb6b44 SHA512 2b0350f15c75e45326fc0a6c16f875a2b923726de45ff8558e55c7a592c3c033c0f518f85f9cb4dea3bf54b9c182ec0ea083f3b11b878d398df6d7429a3f75d1
diff --git a/kde-apps/kopete/files/kopete-18.04.0-oscar.patch b/kde-apps/kopete/files/kopete-18.04.0-oscar.patch
deleted file mode 100644
index 0b88c1174b71..000000000000
--- a/kde-apps/kopete/files/kopete-18.04.0-oscar.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b1f4fa1401cba2e359e5a4b3ea2bafd119fca62b Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Tue, 24 Apr 2018 06:30:19 +0200
-Subject: oscar: include buffer.h
-
-This header uses Buffer as by-value parameter, so make sure it knows
-about it.
-
-BUG: 393372
-FIXED-IN: 18.04.1
----
- protocols/oscar/liboscar/tasks/messagereceivertask.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/protocols/oscar/liboscar/tasks/messagereceivertask.h b/protocols/oscar/liboscar/tasks/messagereceivertask.h
-index 8f52cd7..908e903 100644
---- a/protocols/oscar/liboscar/tasks/messagereceivertask.h
-+++ b/protocols/oscar/liboscar/tasks/messagereceivertask.h
-@@ -21,6 +21,7 @@
- #include <QByteArray>
- #include "oscarmessage.h"
- #include "oscartypeclasses.h"
-+#include "buffer.h"
- 
- class QTextCodec;
- 
--- 
-cgit v0.11.2
-
diff --git a/kde-apps/kopete/kopete-18.04.0.ebuild b/kde-apps/kopete/kopete-18.04.0.ebuild
deleted file mode 100644
index bc60afeea28e..000000000000
--- a/kde-apps/kopete/kopete-18.04.0.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl v4l"
-
-# tests hang, last checked for 4.2.96
-RESTRICT+=" test"
-
-# Available plugins
-#
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
-otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
-
-# Available protocols
-#
-#	gadu: net-libs/libgadu @since 4.3
-#	groupwise: app-crypt/qca:2
-#	irc: NO DEPS, probably will fail so inform user about it
-#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	meanwhile: net-libs/meanwhile
-#	oscar: NO DEPS
-#	telepathy: net-libs/decibel
-#	testbed: NO DEPS
-#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
-#	yahoo: media-libs/jasper
-#	zeroconf (bonjour): NO DEPS
-# DISABLED until fixed: skype sms
-PROTOCOLS="gadu groupwise jingle meanwhile oscar
-testbed winpopup +xmpp yahoo zeroconf"
-
-# disabled protocols
-#	telepathy: net-libs/decibel
-#	irc: NO DEPS
-#	msn: net-libs/libmsn
-#	qq: NO DEPS
-
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-
-COMMONDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt5(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
-	meanwhile? ( net-libs/meanwhile )
-	otr? ( >=net-libs/libotr-4.0.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	xmpp? (
-		app-crypt/qca:2[qt5(+)]
-		net-dns/libidn
-		sys-libs/zlib
-	)
-	yahoo? ( media-libs/jasper )
-	zeroconf? (
-		$(add_frameworks_dep kdnssd)
-		$(add_kdeapps_dep kidentitymanagement)
-	)
-"
-RDEPEND="${COMMONDEPEND}
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	ssl? ( app-crypt/qca:2[ssl] )
-"
-#	sms? ( app-mobilephone/smssend )
-#	winpopup? ( net-fs/samba )
-DEPEND="${COMMONDEPEND}
-	x11-proto/scrnsaverproto
-	jingle? ( dev-libs/jsoncpp )
-"
-
-PATCHES=( "${FILESDIR}/${P}-oscar.patch" )
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON
-		-DWITH_qq=OFF
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
-		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
-	)
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			jingle) x2=libjingle ;;
-			xmpp) x2=jabber ;;
-			zeroconf) x2=bonjour ;;
-			*) x2=${x/+/} ;;
-		esac
-		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
-	done
-
-	# disable until fixed:
-	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
-	done
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! use ssl; then
-		if use xmpp ; then
-			if ! has_version "app-crypt/qca:2[ssl]" ; then
-				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca package with USE=ssl."
-			fi
-		fi
-	fi
-}
diff --git a/kde-apps/kopete/kopete-18.04.1.ebuild b/kde-apps/kopete/kopete-18.04.1.ebuild
new file mode 100644
index 000000000000..d0421ecf7aa2
--- /dev/null
+++ b/kde-apps/kopete/kopete-18.04.1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl v4l"
+
+# tests hang, last checked for 4.2.96
+RESTRICT+=" test"
+
+# Available plugins
+#
+#	addbookmarks: NO DEPS
+#	alias: NO DEPS (disabled upstream)
+#	autoreplace: NO DEPS
+#	contactnotes: NO DEPS
+#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
+#	highlight: NO DEPS
+#	history: NO DEPS
+#	latex: virtual/latex as RDEPEND
+#	nowlistening: NO DEPS
+#	otr: libotr
+#	pipes: NO DEPS
+#	privacy: NO DEPS
+#	statistics: dev-db/sqlite:3
+#	texteffect: NO DEPS
+#	translator: NO DEPS
+#	urlpicpreview: NO DEPS
+#	webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
+otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
+
+# Available protocols
+#
+#	gadu: net-libs/libgadu @since 4.3
+#	groupwise: app-crypt/qca:2
+#	irc: NO DEPS, probably will fail so inform user about it
+#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	meanwhile: net-libs/meanwhile
+#	oscar: NO DEPS
+#	telepathy: net-libs/decibel
+#	testbed: NO DEPS
+#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
+#	yahoo: media-libs/jasper
+#	zeroconf (bonjour): NO DEPS
+# DISABLED until fixed: skype sms
+PROTOCOLS="gadu groupwise jingle meanwhile oscar
+testbed winpopup +xmpp yahoo zeroconf"
+
+# disabled protocols
+#	telepathy: net-libs/decibel
+#	irc: NO DEPS
+#	msn: net-libs/libmsn
+#	qq: NO DEPS
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/gpgme[cxx,qt5]
+	dev-libs/libpcre
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2[qt5(+)] )
+	jingle? (
+		dev-libs/expat
+		dev-libs/openssl:0
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/libsrtp:=
+		net-libs/ortp:=
+	)
+	meanwhile? ( net-libs/meanwhile )
+	otr? ( >=net-libs/libotr-4.0.0 )
+	statistics? ( dev-db/sqlite:3 )
+	v4l? ( media-libs/libv4l )
+	webpresence? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
+	xmpp? (
+		app-crypt/qca:2[qt5(+)]
+		net-dns/libidn
+		sys-libs/zlib
+	)
+	yahoo? ( media-libs/jasper )
+	zeroconf? (
+		$(add_frameworks_dep kdnssd)
+		$(add_kdeapps_dep kidentitymanagement)
+	)
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)
+	ssl? ( app-crypt/qca:2[ssl] )
+"
+#	sms? ( app-mobilephone/smssend )
+#	winpopup? ( net-fs/samba )
+DEPEND="${COMMONDEPEND}
+	x11-base/xorg-proto
+	jingle? ( dev-libs/jsoncpp )
+"
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON
+		-DWITH_qq=OFF
+		$(cmake-utils_use_find_package jingle LiboRTP)
+		$(cmake-utils_use_find_package jingle Mediastreamer)
+		$(cmake-utils_use_find_package jingle Speex)
+		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			jingle) x2=libjingle ;;
+			xmpp) x2=jabber ;;
+			zeroconf) x2=bonjour ;;
+			*) x2=${x/+/} ;;
+		esac
+		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
+	done
+
+	# disable until fixed:
+	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
+	done
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! use ssl; then
+		if use xmpp ; then
+			if ! has_version "app-crypt/qca:2[ssl]" ; then
+				elog "In order to use ssl in xmpp you'll need to"
+				elog "install app-crypt/qca package with USE=ssl."
+			fi
+		fi
+	fi
+}
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index d736e8fc2059..0e1f9d379cc7 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
 DIST korganizer-17.12.3.tar.xz 2257368 BLAKE2B 3ecd3ea0711df1d7d45f8b2e8efa0942e0f1e189b08c1fab73c18aa8358ad2175c2b4f69101d29fe062894f9e614e35a72d7bae39872221b63edecf3ff70d8e0 SHA512 c6127e3d0c8a1892b1da4435885076172f6026f83fd412a0069ce0cd75156e7211356b07032ec2f673d5d38787bec352f03aff561143e50f61909ae7445bb686
-DIST korganizer-18.04.0.tar.xz 2262752 BLAKE2B eb99083d7ac9d1cdc82f17adaee3adbd3cdda07581d88c9fd8719e518b1aad61f083c157346753c1a280395fc1660a3a4e4d2e8c4a3638679303c2693ce5305e SHA512 36322745bac3748fc7fe3b25e780c214ef32eb1f905374c8725d24e7d37a32d2eb61f65c6ae49c4470a1ada3c32792d5cdcc63371b836c7a1ca909889b30f7b6
+DIST korganizer-18.04.1.tar.xz 2267120 BLAKE2B cf0c4a183e425280d043f04d530bd708d09ffdbaa8e89aef3fe124908c31090535e87e26eb87f77d595035a1b0ba64d61f7809678b4f9ddc8ff6fc5c8a226c70 SHA512 ae4965523f48fbba296e4db721799f7fa997d36139f7393091da4091c836326504838225801e850bc493df55fca3f14e31cf86e44d5d115e1617a1b163477d66
 EBUILD korganizer-17.12.3.ebuild 2443 BLAKE2B f38ce60432d217eb8058f7d6e3fffa1eef7b3d166a33c5cbbc3fae2c9f3e3cb350fc34f99b8cff9195ef3e3c29679411c01a4a2e962c10024914e316df59bf5a SHA512 b9fa737cd0da1572db7caaa16a44b746bbdbd31ab7195fdf423a0d0b67b12c196718bf5aada4a7ce89c3f9c1ac00305d94b4ea915ef722e4991e04433a8c3035
-EBUILD korganizer-18.04.0.ebuild 2445 BLAKE2B a9ce7dcfde048a202b542e3f9b8599236b33806ba28df437ce22d14f6a42decb8eac26e36b1728cf14ed20539459c0b125f73dc080658708e2bcbeedbc5cf158 SHA512 62aa03dadfad2d0dfb94e6b0c82df767fd8fb388421840b40a5851b450591526fa07c373632e7157bf62f874b92ad55db5c1ae26d25be9470c84e16e1d93e8e1
+EBUILD korganizer-18.04.1.ebuild 2445 BLAKE2B a9ce7dcfde048a202b542e3f9b8599236b33806ba28df437ce22d14f6a42decb8eac26e36b1728cf14ed20539459c0b125f73dc080658708e2bcbeedbc5cf158 SHA512 62aa03dadfad2d0dfb94e6b0c82df767fd8fb388421840b40a5851b450591526fa07c373632e7157bf62f874b92ad55db5c1ae26d25be9470c84e16e1d93e8e1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-18.04.0.ebuild b/kde-apps/korganizer/korganizer-18.04.1.ebuild
index 23f6fc99a125..23f6fc99a125 100644
--- a/kde-apps/korganizer/korganizer-18.04.0.ebuild
+++ b/kde-apps/korganizer/korganizer-18.04.1.ebuild
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index 8cd8c68bdf45..cd13ae7d6816 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,5 +1,5 @@
 DIST kpat-17.12.3.tar.xz 3566240 BLAKE2B 0fc1339871589216ca0ed037e89c12fe9a0e66279a51c71da9913ad035b528dd0ae9ed59b07f656142bed1a27b8f1214f9f4ea4a1231dfdee3ee69ed819a5b41 SHA512 e30ac4a80c81285513d730cc331e2c93c208bc2d6a1521914675bf46307f9b90b612e2ed247224cd9495b443cd67efb6b01a009c62727abc127e112d94f0d25e
-DIST kpat-18.04.0.tar.xz 3566372 BLAKE2B 13c3f0fe06ad59437beb7a3e31a79352f9e9f800dc2b3fff0db55b1dc9eae7234ee64ecfa7ed016bff790e62c0573a02371121f8b2357d1a8636108e70e8b7c6 SHA512 a25bf031e71a6e663d2bf4b3e8ad9bb8b53c8f3f4016092cea20347ac5ad4c4837c5bd643d00410741923bc0a9b88afb45fda8f37f85599b4ab975c096679235
+DIST kpat-18.04.1.tar.xz 3564944 BLAKE2B 4c43b3a9b5915a637bbc28a95e3d148c4fb5b588276cfa86128b2a9efa1af004af4452ec46063676f94dd926f9ceaddbeab20f41df3c799e1522eb1eeaf55d3b SHA512 4ebaeae39171fc9a26c1494a6eddf467cb6ef19d8b1293f9a4a7d0d24978b34671141917f4e8b2a1fc9874d31c3dab07b3fe6189487492d76df4c6a9fc20f760
 EBUILD kpat-17.12.3.ebuild 853 BLAKE2B 8724d194b60c10f9a0386989e414b1d9d0fade5392c76f21c348c4b3d9fb14db11a0ee6d76a46a93f0abcff7067791a72db01709e14229eef7977728521955e9 SHA512 9a0cbbb1783a646df6fded9fa68a2a192b30bf861f0cba51778b353e0f82cc8375b7ba30987c225e3dd80076382469dec16b58fda35f3cf560a02b6be90cf2a2
-EBUILD kpat-18.04.0.ebuild 855 BLAKE2B b39433cfbcc9b56c1bd3b5a9766f152ca01efe3dfbf80596867d5f9c2a120339b7866897cf43655db4c29a85d495fc5f2108fdbfe106bbfd4dc4753b4479fda6 SHA512 d44200a9121eb25577898f4db6fcd233d3a27e2774d969f2f96c381e53662fd8db813b789eb810d66924ca55050775b63ccc4d104528da99b675f0f67fca9fa2
+EBUILD kpat-18.04.1.ebuild 855 BLAKE2B b39433cfbcc9b56c1bd3b5a9766f152ca01efe3dfbf80596867d5f9c2a120339b7866897cf43655db4c29a85d495fc5f2108fdbfe106bbfd4dc4753b4479fda6 SHA512 d44200a9121eb25577898f4db6fcd233d3a27e2774d969f2f96c381e53662fd8db813b789eb810d66924ca55050775b63ccc4d104528da99b675f0f67fca9fa2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/kpat-18.04.0.ebuild b/kde-apps/kpat/kpat-18.04.1.ebuild
index 14604a38fb25..14604a38fb25 100644
--- a/kde-apps/kpat/kpat-18.04.0.ebuild
+++ b/kde-apps/kpat/kpat-18.04.1.ebuild
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 47bad3b14b97..37b591f1d677 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
 DIST kpimtextedit-17.12.3.tar.xz 141572 BLAKE2B 04c091748c8f4c5cfd9e57de3a1888d755aae2b9e6550f19738213cea21a487f65bcfcb5ff7e71dcce7a64a7c4a43b073442ef238541f090a108ac49f5760306 SHA512 0dd7891de260c2497ff0b44340a6a79994c512ad906db4bffe0217cff0fda11f27c86fcb89bd43a40668bcc8068b76b9287ad43de6a277909585b6b2737953cc
-DIST kpimtextedit-18.04.0.tar.xz 142684 BLAKE2B e184529616f2c60495a64e01f75c567be32f17be6211bfc4e873bbee6aa4eabf4b06790e87a932e45c30807ca64d52a52f2829a28980a98a727212184564f523 SHA512 fc4f3eb7731378839c1c9cbabcabeb24f600c5e67f3f9d1e3a32bcc0068513d66fd1438293aae30d576f4eeb604f66512fb47c5bbc4ccf0ac29e585391ba1b8a
+DIST kpimtextedit-18.04.1.tar.xz 142852 BLAKE2B b84583a70d262232355babaf478e49b6b00efe0abb461d1f426399a685dd54a108e829b122cc8813eba1e92c068c173763582caa202142ee38f397d89ec4206f SHA512 c5b74261653cbe86e660d56f556d17da5d57798b6affc860e502fe8ce8675005204f62ff568fbe49df62ce237b4c6beae1196e5beba61412b59d263649e8b8a2
 EBUILD kpimtextedit-17.12.3.ebuild 1129 BLAKE2B a2e761276a599082c12b2a2567ec078a53bc09f946cd06d57e5d61eb40aa35380202b7f4369a6cf0f6e5e6468cecbd2f674791c9d6002a91293d13c18a44e11f SHA512 1c09e0d93b126047052e1655df2877b5538ab13964eb42a918e1ed08c5c345e6674819f3ff6a578ecd5f386cd98dc7449f7eda6cf1f0f5643af3824919400e52
-EBUILD kpimtextedit-18.04.0.ebuild 1131 BLAKE2B 630c96348004565c7a2f78bfdf5777bdb2ef3d7a527e4c0a1d6414771ce8714e22e1e5b7bf9deefc378af14ebfce7bf6145bfbdad1c1865f6810cb2e49cae785 SHA512 559fbfd7903cdd25c624a262fde1fb9859e151bc4065a80e3eeb82247a13b597bc5b2244df3972b928abcf333c236b6325640e54b01b73e36983d6534913ca52
+EBUILD kpimtextedit-18.04.1.ebuild 1131 BLAKE2B 630c96348004565c7a2f78bfdf5777bdb2ef3d7a527e4c0a1d6414771ce8714e22e1e5b7bf9deefc378af14ebfce7bf6145bfbdad1c1865f6810cb2e49cae785 SHA512 559fbfd7903cdd25c624a262fde1fb9859e151bc4065a80e3eeb82247a13b597bc5b2244df3972b928abcf333c236b6325640e54b01b73e36983d6534913ca52
 MISC metadata.xml 399 BLAKE2B ec34ba2aa27c902fbadcc80e20cb0454169efacc5560ce722010c720d036c96ae381f8b07d2565fb1f4a74e56bf684123e5ebaba64621c3a0d21c37e8d2ac394 SHA512 8a6dca910cce7710df6cfea5320dd39d6037b2718bb46276d5a2f141f85b8ba7b56b0c73de2f8c93f4bed110192d1c3f2bc9f76c2f489c002e388673fce16893
diff --git a/kde-apps/kpimtextedit/kpimtextedit-18.04.0.ebuild b/kde-apps/kpimtextedit/kpimtextedit-18.04.1.ebuild
index 4df08dc9cce6..4df08dc9cce6 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-18.04.0.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-18.04.1.ebuild
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index 5994d5787e3f..dca5d9b23074 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kqtquickcharts-17.12.3.tar.xz 25516 BLAKE2B 3f9e906bfbb6de0e70855e721b08b52f78be415b4b862a8aed8210c5c5f51648d01092151646231b3f6ef49c1d884c978fe2d9b74924d22f8f6198f8612031bc SHA512 496502071f079798ef61c7ff2542ad77f5cce505efc6492d18c998e017ab6eb2b0b4c6f7565511ba951ec21af45e6f0e45b58586d69ade3867ddf07e5e5de913
-DIST kqtquickcharts-18.04.0.tar.xz 25520 BLAKE2B a9e8035155bb647d19c15361bdbb49863c26d1b2db4f4a3918b98cd115169d71cf4ce8e0d0b6279305182ef6efc7b82ddd654d1affff6be6be294777cab8fe06 SHA512 e00fadda30c0be441de59e4062300f9e2761d5e1a88325cb5c5ae4096335dbbe496534d2fcc7ce67dc59a5bd7694a4991723222e67ab4d07721c801c10bd53fe
+DIST kqtquickcharts-18.04.1.tar.xz 25700 BLAKE2B c4a169ab702e2e6bbf94989de903a478c6363eab20f73572bd30b72f09c5cd903362f12804da00eeafc8bbdf46dc36d685588cc878f5e9650a2a50a1310c2264 SHA512 60b853818d8f501a20af6636ac67fac3e59472a41470b6d2771ae0066b4402710f26210aefe2556e0eaa5400fb9e2f9e6db5cf6905d5e9e4874de630a2d4bac1
 EBUILD kqtquickcharts-17.12.3.ebuild 308 BLAKE2B d7cf5e9111fa6601dacc8c513226c6633e1a9c267522b2ccff1781f5642e845aabe57be692c6ede94aa76496df5907867636d6125eef33e242f7cdc6912c7698 SHA512 d7245eefebe52badffb56eaf5c63e54009ddd6843dbcc130d8eb62d4618d4d418b2e592b5d050c940d70acd139ee688907906edce8fd051b11ea9ee793a73c7f
-EBUILD kqtquickcharts-18.04.0.ebuild 310 BLAKE2B 1a8188f042b79b458a146cd412ac47916cc3884ea6fc9b3ab5a16fca9bdefe2cdd73972705104c3fc5632a91c4511ba7c036d61a84fba059fa8b481e96ae2c67 SHA512 72a31b499061b26e1c41431067a9d6a52a74f111346c2fcb5e1ed5528c848f64077a7dd70e31aa356c3111caed838a596bfd4f26ac675d846f873ccf9eb645e8
+EBUILD kqtquickcharts-18.04.1.ebuild 310 BLAKE2B 1a8188f042b79b458a146cd412ac47916cc3884ea6fc9b3ab5a16fca9bdefe2cdd73972705104c3fc5632a91c4511ba7c036d61a84fba059fa8b481e96ae2c67 SHA512 72a31b499061b26e1c41431067a9d6a52a74f111346c2fcb5e1ed5528c848f64077a7dd70e31aa356c3111caed838a596bfd4f26ac675d846f873ccf9eb645e8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-18.04.0.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-18.04.1.ebuild
index 25309fd1765c..25309fd1765c 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-18.04.0.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-18.04.1.ebuild
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index f8b2ba0fad4b..d613608b587c 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,5 @@
 DIST krdc-17.12.3.tar.xz 1554384 BLAKE2B 800a1365d3bf73573e0b36510531d215f7297b666805bb8a27a1a311e8125307e18d6d0b8d860c92e20bd4c81747a8aebb8ae8fd36a1034b15e32c10728d90a9 SHA512 aefd7f2ae3120482d9b85550eaa5ad5e771e4bd2663c0646d0256f95413ce27d45ee843a6dcc7ce5c6b33513e72983d528ac3e4e41e6a2eef61e094aaff2b82a
-DIST krdc-18.04.0.tar.xz 1552568 BLAKE2B a7b88e014ce46b7dd3a1889d91412aea3130f9c9038b6657a3e3e2ef9385f08999aa867aae4b3096f27631241505c160748c74b1d8f39c073a8d4acf7a5a9b52 SHA512 fd471f38be7c5846934efbd86b4cc2a2f6496d46d4d281ba7193d35e75f43483ddae063400e08d404f6b61e86b0b6cc12fa5be995207a2195eb3782362b65f0a
+DIST krdc-18.04.1.tar.xz 1553624 BLAKE2B 2c1a41e6516708cf5e57a5ca3441dc16a804d49b499ddeada702baae9b448f455479b0c00ce7a9efff5f28d4790b0bdd8bb434e07d4b64d8663febcf44fcd2ae SHA512 06b9713adbb26be6b5f5e0201d78b4fd006b5b83b5b3e3dbd8e927e695ad008e7bef0d4273e75bae845fbc9164f5e293217f05174e19360758712624a7bd58b1
 EBUILD krdc-17.12.3.ebuild 1175 BLAKE2B 6206722e0bc1d69af854ae2a41512651cb216e6c4e1db5041785fbd0439c1fda773158f3f3983483cfd7efa1f4264460a50580467ba9512ff0a811f31075e41b SHA512 65e5f03c34946e9c14a7637a075e6bf2a3af3433ccb6197f94a9676b89bdd14bc185109c419e15c085162836c9108ed8fe19ab4b39bc8891c172eae3450c71ed
-EBUILD krdc-18.04.0.ebuild 1177 BLAKE2B d1e1598816451bb7b14f62e6a77d4e3ea8141805793202d381366255b52fd2e4bb3539d0327332cadcaf8a7c40f789b59efa64f0bb701d2a91893300efe9f4b5 SHA512 0bf55091823829480b807e59534214f1d10104c92b437b59450480315255470f50bdb9c6a188ad34debd6663d1a99f2fc927c4f117781f0bbcf4178e604dff17
+EBUILD krdc-18.04.1.ebuild 1177 BLAKE2B d1e1598816451bb7b14f62e6a77d4e3ea8141805793202d381366255b52fd2e4bb3539d0327332cadcaf8a7c40f789b59efa64f0bb701d2a91893300efe9f4b5 SHA512 0bf55091823829480b807e59534214f1d10104c92b437b59450480315255470f50bdb9c6a188ad34debd6663d1a99f2fc927c4f117781f0bbcf4178e604dff17
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-18.04.0.ebuild b/kde-apps/krdc/krdc-18.04.1.ebuild
index b2db820336ce..b2db820336ce 100644
--- a/kde-apps/krdc/krdc-18.04.0.ebuild
+++ b/kde-apps/krdc/krdc-18.04.1.ebuild
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index a646cf75eb15..3a5a38be9b7c 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,5 @@
 DIST kreversi-17.12.3.tar.xz 913036 BLAKE2B c76b01192e3ca636306007e5b3014d4af20f38f98403f337af2cc72ffa076b76ff6bf5f9ffb4c1e4b7145a6f48528076848572d93837e1f9496968bdc90156da SHA512 dfc0cc5d4b49375754a1928cd45d87bfe4b6d18e62766828bd3ada8bdec017df12f51d18e432980449879f4fd321c38c75fa5a2c3919397f1363860d5d52559e
-DIST kreversi-18.04.0.tar.xz 912708 BLAKE2B 8f825f70a8d23de2f7e77b2597556a8c329fd1d9a9c839011ea0011b4dc9f6de66ab3b4503415db95449793461bedc77aad9398e9628f30ccd19a577b498c1e7 SHA512 e0fa09276f0267c906486f52a2b5f0558f12f9867f46bcf9a8b592f076b73c270fe7ccee94df75e4503daad25afb9538c73ee400d771a7385d266da40911cf6d
+DIST kreversi-18.04.1.tar.xz 913484 BLAKE2B b2474fa85da95db0d4df3a148e5bbd5f633b9f69ca65c5eb5367e3cb71ae7974a86f53e0db95b5b5ece1a13f4e283e1d461297375414cde86106b54efebd94b2 SHA512 feb10efac9a8be20f813dda272d398e79b1df7c64ba69b51a38471bb91997e0146ef93c95076bf9c18fdf329cfdd85d1c66fff33e4b70f9779e200eee85afb92
 EBUILD kreversi-17.12.3.ebuild 929 BLAKE2B be265893561a6148a0bbb33c1d2664af84aa002a40f6539a7dc07d3dbb6be2c889094d3ac76a2fc91bdf3fc5b7c54454c9d4f7eaf2e2ea824e8d3a373ad2d491 SHA512 0272785202f8ede0810cef15e8724aff7183e366e00c7cfa63387922d67a2e13a7bc43c3dde9eb638593b19cbea4b2f5978f44b4d16b3ad7db7dc7501594d7c7
-EBUILD kreversi-18.04.0.ebuild 931 BLAKE2B ded588961b76ac18e507125686f38d67dd87682642dc3e9d5278cc81c75c68954b21729420c7cc8469d8c20b75ce5448accc20c9ff5338ebbd8ec727a538303e SHA512 a4fd2df9c133974db526ea85c911293e62c934c5b033f7320b8cf306ce84609b55cc687df0b84636df93c322541d7149a46e6777d171609b8717bb74a35c4cbe
+EBUILD kreversi-18.04.1.ebuild 931 BLAKE2B ded588961b76ac18e507125686f38d67dd87682642dc3e9d5278cc81c75c68954b21729420c7cc8469d8c20b75ce5448accc20c9ff5338ebbd8ec727a538303e SHA512 a4fd2df9c133974db526ea85c911293e62c934c5b033f7320b8cf306ce84609b55cc687df0b84636df93c322541d7149a46e6777d171609b8717bb74a35c4cbe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-18.04.0.ebuild b/kde-apps/kreversi/kreversi-18.04.1.ebuild
index a18a0c64d8dc..a18a0c64d8dc 100644
--- a/kde-apps/kreversi/kreversi-18.04.0.ebuild
+++ b/kde-apps/kreversi/kreversi-18.04.1.ebuild
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 597c6b5bb6d8..521f98fde48a 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,5 @@
 DIST krfb-17.12.3.tar.xz 995712 BLAKE2B afe6fa51e0b44b96a2bb7f1da1cb5b35c901219d6f8d0a086ec5d73915aaee47dd039d2346649d0aa5aaee280239dec9a2be1c52a436c4caf2a7bb17fd5d4898 SHA512 934bbd9e6b92bf6e6a2b46ac7df03fae9bf2d604a0fe9e5420d16332576251e621caee1057b0e743a32cc38bb38b54ed95a6ef99bfc613754a5fe23e8f697a53
-DIST krfb-18.04.0.tar.xz 994844 BLAKE2B 4d46d66ffba4e10409975f02fe77364201e7417a03e563b3ddf2656319f268dd8a92f5a8fe83281b5aba4b17cf032875a4d593e90ff0e3affab0233669bcdab4 SHA512 a161bd1ccaeb975abbda5e578d3843cf23c044c4e7986c0de1aab0329b6f99957698939b02d5f232ede7f0abeadbe9f3691f9d2bec36bc2aed15c161b73f43a9
+DIST krfb-18.04.1.tar.xz 996076 BLAKE2B ffb4ff50713da04d6feb787a18a239c0040379e825b155fe0632a4cb71b76f34b6b881fc48c36694c615f6f95346e609014762e307a30ea99af25ee9e70de6d5 SHA512 f637055b8aaef32c28a5199a24b783e1e169791e9e28470c73c342eb7aad98c0b6ae517bee7da4be1692eb1a96fd05f73b1dc52b44630aebbf48a3fa36b0a4fa
 EBUILD krfb-17.12.3.ebuild 967 BLAKE2B 31a7a97ddf448e04a6647a706fd05e9be0a3cf1abe6b1f95ae0d3560203318f2faec4f0b4d719b2dc995b03acb9de7f2ea9888a2fc5a85755a6331ae5778a9c1 SHA512 9b65eae19b6ba77d51add635b0b7d5f6d987b22a0200e46f1deecdb75059ed69339433c801be23f974a707c5c85526d5b066ac0e326570e632931ba8fec8a9f3
-EBUILD krfb-18.04.0.ebuild 969 BLAKE2B ebd6a5c1d982efc735b1bfe75e758dd5f23b556412ca78396f291ed054526e55752ccf83dfaa4c13be8ddea1bfac53ff3b42dbb8df2719e92ba19323f1dc73da SHA512 039911742a2b627be7e9fbe64085b8182faf73097bd9e34f3f6bf5b4cb41a68c628c208e570de34b4544ff64e07a3bc84b80bdde03ce302d51e0eeb061fd07e9
+EBUILD krfb-18.04.1.ebuild 969 BLAKE2B ebd6a5c1d982efc735b1bfe75e758dd5f23b556412ca78396f291ed054526e55752ccf83dfaa4c13be8ddea1bfac53ff3b42dbb8df2719e92ba19323f1dc73da SHA512 039911742a2b627be7e9fbe64085b8182faf73097bd9e34f3f6bf5b4cb41a68c628c208e570de34b4544ff64e07a3bc84b80bdde03ce302d51e0eeb061fd07e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-18.04.0.ebuild b/kde-apps/krfb/krfb-18.04.1.ebuild
index 479224e0ac41..479224e0ac41 100644
--- a/kde-apps/krfb/krfb-18.04.0.ebuild
+++ b/kde-apps/krfb/krfb-18.04.1.ebuild
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index 9ffed06a923c..1829dabe1662 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,5 @@
 DIST kross-interpreters-17.12.3.tar.xz 144424 BLAKE2B 0eec653e071c026e3485c33325d9656c271e59ec187c166f2440cac8095f6ada195ffdd07622d05a9a1be100b4c6b06265771b2245a3ea79b00a2b1c5ea21fc4 SHA512 2eb261cbf57c505766dbc1d7086350f8e93b0c4da804464488701444a650119350b6ffded93beaf9956ee5974701ddaa3354838341ade3d080877918c91c6c63
-DIST kross-interpreters-18.04.0.tar.xz 144468 BLAKE2B 666633945d407dd9a7733f3f3676425082bf538a7ffaad4764368a769fa279a45392b35427b7a6d905e5994b81ab0af31bdcac8b67f3389d4ce7ce27cc7b5b6c SHA512 fe114664c2079e914d150e2125a6549b0189d5ec5a58a88c53cc6f9da4ba077b1fcbd4f49b376f568708b4b65e7c8038650de436b37018417509dee6b71fc18d
+DIST kross-interpreters-18.04.1.tar.xz 144844 BLAKE2B 0cbe2066da80b327e629b78647f4175f55871fc9b23262a3c50f95bb5dfd74a6b623be181695487c3717e1288577a39ba4aa24b28e2ab4bc0fab161c90c254b3 SHA512 9b1b94a19aa8c8e83c75cbdb532545af8bb95c6d3dfe0e51d77a36107d309fe3a2d562c835cfc392348020c2397efa0135c6bc8ce9435e8bc9c7b4c67ccb3edb
 EBUILD kross-interpreters-17.12.3.ebuild 852 BLAKE2B a41c05e9e3a4463898168dcf2256903b44cb4710bbe7eef54e38720bd598176158c3e528ed0c11cca9e170f0a55c551103bbcf57f1aceaccf4f334f21b49a403 SHA512 4aa4a2f5a807e6b33317d6033cdaa525702d98341f78962bbbe1487d0557214ba8fb6e919cc78950d08ca11e2677b7b6b11ce153e46a939ae19e730e1c56dd48
-EBUILD kross-interpreters-18.04.0.ebuild 854 BLAKE2B 1b77ec3193b2c667f3f2bdb057a92bdd954d7ee67d7c4d85621a7d85aa3d094feb34a7a635d502c00212564027321babcf17103c0ac64c9e011e6184e71924a6 SHA512 cf0972e54f2da0fe0f960d476b2092d607642cae78009fa3087cfa9b0f71fcbe5cb7852ec7a353920f813a7d570320902f9b3456357af6c59f9bfdcc69f6cacf
+EBUILD kross-interpreters-18.04.1.ebuild 854 BLAKE2B 1b77ec3193b2c667f3f2bdb057a92bdd954d7ee67d7c4d85621a7d85aa3d094feb34a7a635d502c00212564027321babcf17103c0ac64c9e011e6184e71924a6 SHA512 cf0972e54f2da0fe0f960d476b2092d607642cae78009fa3087cfa9b0f71fcbe5cb7852ec7a353920f813a7d570320902f9b3456357af6c59f9bfdcc69f6cacf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-18.04.0.ebuild b/kde-apps/kross-interpreters/kross-interpreters-18.04.1.ebuild
index 0ef8019aaf2d..0ef8019aaf2d 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-18.04.0.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-18.04.1.ebuild
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 249e0ceb8741..e1907190179b 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +1,5 @@
 DIST kruler-17.12.3.tar.xz 259608 BLAKE2B b79ef372469b76d5734aa758b18e570c9aaba410d24f76f80a97e64bf35e61d0ac578a37dba088eb2c2ad10a8a46d4a5b24376a36a5e5f770011d51cd7230990 SHA512 e505604e01916226401ce0bbaabe8660910ca6a3e4f0e7213312b1f889ea86023d394e7ef7f821f29251ea1b16d44e3f270298304aff2f65bb1b5a937eadf23f
-DIST kruler-18.04.0.tar.xz 295680 BLAKE2B f1c0fd90cfca216892e20f61f432386d468ac3dd5428dd685da5e61b386236369af3543c39c366b8bfec2342e70292fb599b143ba97564fcd35044ecaa4664af SHA512 3ef46db7f601c3a9a4ef30f44635df7fc40b5a8a0dbc93914cb03113d37b6b6bd0e88bea9071c264b23fa375458acc501c529a1e69fabd296658b6de7208957e
+DIST kruler-18.04.1.tar.xz 296076 BLAKE2B 720efb511e5668d26e932134204f37e485eda6732afafc3c1dda14c863e57baa26dfa776957330f667f8db35fe87d02393c21e1fc47caaf108f0a4bfdf12b99c SHA512 a373b1350eb294989c15bae586b79c114d8121337d159fc22e00444f20f6ba9ab0fbb895d99ef996ed30e95e675b6ce71be8330f8292297312aa6f4d76ea571e
 EBUILD kruler-17.12.3.ebuild 844 BLAKE2B 2dca8d115cb3241c82e077a2ba890874fd5ea94a09f8a47c99f5b4ae2dd195e5f9770e90a4ffc7e8704423b84358f87c64d00da40bba4a844c188f9fe206ff59 SHA512 6bc2032c25a9c2c903aa305544488269822b689acf312585ead9017318494c0c8bff8ebd87e9298bf5eff5ea9567a5778fd839bb6c89ed6dc19ed2aae429de39
-EBUILD kruler-18.04.0.ebuild 846 BLAKE2B a078943cd2ca7950ea8454e6a6bdc47c7146db0a60188b95f0d9905e946d0f1e3d6710770390643c8c32a8a4aaf3b446a7fb32afb5ba879666a3c3e466117f7a SHA512 c514fd769c844711d89ca0067b28b42b1ac705364c609be198d47768fbc48f1f8151490f994666c50f14bd8a0b9748efdb022f4c07ba9ac7d0192189006d0eee
+EBUILD kruler-18.04.1.ebuild 846 BLAKE2B a078943cd2ca7950ea8454e6a6bdc47c7146db0a60188b95f0d9905e946d0f1e3d6710770390643c8c32a8a4aaf3b446a7fb32afb5ba879666a3c3e466117f7a SHA512 c514fd769c844711d89ca0067b28b42b1ac705364c609be198d47768fbc48f1f8151490f994666c50f14bd8a0b9748efdb022f4c07ba9ac7d0192189006d0eee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-18.04.0.ebuild b/kde-apps/kruler/kruler-18.04.1.ebuild
index 77f5502679f9..77f5502679f9 100644
--- a/kde-apps/kruler/kruler-18.04.0.ebuild
+++ b/kde-apps/kruler/kruler-18.04.1.ebuild
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index b41afd61002d..3937b16b17eb 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,5 @@
 DIST kshisen-17.12.3.tar.xz 708896 BLAKE2B 736271af515dad98556f6003b7fef81be7a7d56ed4a76219b479370cfb064e53a19fc829ae3049bba8ac902d5a29ea77aad2ee70457ca540e38f41f7d9e2dacb SHA512 50599330d51f4a08de050b2f4af764f084c505a5de09e3044cba00b687d9daa81618c8d9526bc76e4ab3fb53fa84e28a2f1508b992a05e284240649cfc1a0b96
-DIST kshisen-18.04.0.tar.xz 710788 BLAKE2B 0a26795703a997b3042dc4e0c2ea087ffb0782997ae847fd8e52b71e377edf36864c5724d4819ee5e1924ae5f5c2e768640fc100137e388301f9b02613dd90f7 SHA512 cac07d1cd1c91e91afef00cd26c65d6aa2e05a3bf6594917f3798313c7e15ee0482d6a2136627beb46dfa6cbcbd612af097410c81d40ef303ddb860e0c91a66a
+DIST kshisen-18.04.1.tar.xz 710728 BLAKE2B b8808372920a6ef16fa192114ae85c57cbba5450927426a3ad83b957656c466fb4973d71dbb76b33255bc71a53156c62b37b6dd58e81af4b324f586459761926 SHA512 1b05cc50e310ecc29d161de373f645e354777da34ae1c763f164f0db78474b9ee3264ef5cfc23979f8aafe57a40931b065999ed8fc4a694fb722fa034256065e
 EBUILD kshisen-17.12.3.ebuild 778 BLAKE2B 287c583e113f4b8dd114318ab6d66bf34171193851d65c02c9cc92a8ea5940823b90fa543ab15deb6030e987e371b9cf26ef6199896ef4d5c68e1b178dbe2824 SHA512 ddcdf43eebd4d156e7df00bbf8eeee016d7c16f72f84d3813996aae88b63e938d94f23f88594dd0d20e6139e06be3c880004d7fde01a1889946c36725aa99c60
-EBUILD kshisen-18.04.0.ebuild 780 BLAKE2B d069380134f5bcbe8c979c5de039a7b5033dd35ff3505c9f5635e06ed0e5aee5a994c3874d24716735a5b84df2f1bc1648150677488e6e88d4ce0d859fdbceff SHA512 0bd4cb9f1f0650a0aae00bab0541f78a4a9f169b59922075e08181c30ae6f4e97b61db444ed86667132d2397284598f5577ec47f1112b17ca1357d198b996f49
+EBUILD kshisen-18.04.1.ebuild 780 BLAKE2B d069380134f5bcbe8c979c5de039a7b5033dd35ff3505c9f5635e06ed0e5aee5a994c3874d24716735a5b84df2f1bc1648150677488e6e88d4ce0d859fdbceff SHA512 0bd4cb9f1f0650a0aae00bab0541f78a4a9f169b59922075e08181c30ae6f4e97b61db444ed86667132d2397284598f5577ec47f1112b17ca1357d198b996f49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-18.04.0.ebuild b/kde-apps/kshisen/kshisen-18.04.1.ebuild
index 907e49003ece..907e49003ece 100644
--- a/kde-apps/kshisen/kshisen-18.04.0.ebuild
+++ b/kde-apps/kshisen/kshisen-18.04.1.ebuild
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index 281279349428..8f78b3329dfa 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
 DIST ksirk-17.12.3.tar.xz 6987416 BLAKE2B 280cfdbe3254d6ca6a63be411f1b96f2d892323fcc72b8800982461712d9e16b1a76f824c355e227db0d862fc8ebecdc73210275dd394b76aa1669cc2fe9e1b0 SHA512 dc18e40bd3db456dd5313365bc531c597ac4724b887465585ce4ac496c2086c078e059aaebc2e7f3e554fb3c51dd4b103e55017474020d5663209ffaf16aadce
-DIST ksirk-18.04.0.tar.xz 6986612 BLAKE2B bad4f7274c5260b4851a7fe57c022d731d8fc828cdcf57f485f425177c5b05efb930532f04e6163759d81bfa5116e89657338534e3bdf7fcb709ab049b6dff4d SHA512 12bc289bbbb5992095b74fc5801437003f9f4e78d060048b581f433bf7c79e70720824d84f0eaeb90061dd5513da98cd55af2d801140c266c254a5e82c8c3c4b
+DIST ksirk-18.04.1.tar.xz 6985308 BLAKE2B 1a61eaadcb5303f87c12558fbd16a1f2c4e92091f2cd4eff5df96d02cb9d6c5383825421bdb13b7d367f2cbe932d0545e0336fd6e71b56aa25b6eac5d2f82215 SHA512 59d064f3a2d9b3bbc731ee5ba33c13515960fa4c4040dbbc27cfef4d672e5bcbd71d45d3c77d6cff123573f9b5b7b3b704ef78d0c7e9665b843f0d8cf5b1217c
 EBUILD ksirk-17.12.3.ebuild 992 BLAKE2B c23517b1e85f4b12db1417bbd326834aaf1af327883e98a61d3eec720f1e1a18aeb43f5c2aa94a33b14cfaf266996c2e0ee2cce99c428e04cde9b1aaed2f9b44 SHA512 9a40f9bf1d56099ba864c113e828dad9d5543381016970c51a1cd66456cb25b37d02aeba727d524aba1a0e887b2538e51e4f0e4a4b64f1353edd0b956671e1c8
-EBUILD ksirk-18.04.0.ebuild 994 BLAKE2B cd08b8b936d7a93ebe93d00f6844952bc444306c4347df62cccb72b6f9af813e551d8b67730714feae3a1458f9f04461fa2b116190471599f1ad962e52297ac5 SHA512 9137101978c70391a671149bac924352ec42a0245a3167a44f7cbc9ef2aed7710e61ac3a27aeced5ccc9fa75fd46b73eeb6d2ec20a1893ac38b21dddd99bf310
+EBUILD ksirk-18.04.1.ebuild 994 BLAKE2B cd08b8b936d7a93ebe93d00f6844952bc444306c4347df62cccb72b6f9af813e551d8b67730714feae3a1458f9f04461fa2b116190471599f1ad962e52297ac5 SHA512 9137101978c70391a671149bac924352ec42a0245a3167a44f7cbc9ef2aed7710e61ac3a27aeced5ccc9fa75fd46b73eeb6d2ec20a1893ac38b21dddd99bf310
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-18.04.0.ebuild b/kde-apps/ksirk/ksirk-18.04.1.ebuild
index e147ac059f48..e147ac059f48 100644
--- a/kde-apps/ksirk/ksirk-18.04.0.ebuild
+++ b/kde-apps/ksirk/ksirk-18.04.1.ebuild
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 96aacdddc924..9cc3e89c8f85 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,5 @@
 DIST ksmtp-17.12.3.tar.xz 38496 BLAKE2B 448a00e29c8bbd8143b5a18848aa6a1bf9bbc2f0b9270ff90c695e3b44c7fe6c055442cee685cb32259bd5fb9bc913ca0d302e68a3d600d0fadebb303fa7ff89 SHA512 9f11e39cfc7fc56a2e84b7a33ea832c3817069d8e91980bef936d3cffacbce320af1d31ead13b3d7db56953d6aa4bb0a91ffb28cbc6d2cd1d435bc9e077ea197
-DIST ksmtp-18.04.0.tar.xz 37812 BLAKE2B c7738dff480c0dd600e04bfec636996bd213a100d50d53ae0fd0af7911d2b8e3d01ed4764e6c91260337b25931e3e1c2b816d92e111d4adaac8aacc55b44e9d9 SHA512 741c86b15cc4256788cc9476db67436af17563dbd0e87918096c95b992885cbc9bc7d43f3c8b6f52626d8e6aac4d3b071ac01adc651db7f5fa5dbeb263b260dd
+DIST ksmtp-18.04.1.tar.xz 38080 BLAKE2B a68f6a03b8aee4cd68a6a4aa309dd355b391748c953d10601a7fb78f1b0848b118fb25574751fc70e6881a265130239b2c47a8826a118ee6bdc9de7fc5b1ed61 SHA512 9593421d6cfaef49cb2aa2e4ce09cf0f956b6901b312ac7d60d28859e7e26ada8e2637e9393b1be833e9e66fb0299ca4993c67af8a208375149268a3ed2bec07
 EBUILD ksmtp-17.12.3.ebuild 491 BLAKE2B 0d8c11d06da656a119826b39db7a9134334fb0efad3e7c731e4b9b4d435460b2dda02f8340e5864b89c236bf9e669aab0f401f5fdf4e32daeecf425d8605cfcb SHA512 88050509a6d5ab2286bcf680d77be6f781c9eb9936813b5c839bf887b8459d923fe17983504bd461cda3bc251cd8b0608a3c20bfcf50ad5d8511718f4ecdb7f0
-EBUILD ksmtp-18.04.0.ebuild 493 BLAKE2B 0227d2a472e6819e5961a812af3f15e6ef92c5a0b089c813b5ed206915c77d320b06fe7464b4945a51f55c153dce0452b0d3faa1fec2e4e72135cfddc7fd1649 SHA512 951d85a292c545396672d20369ee9e9582430e56fd910f4898c59a8fc22709ebb8ef22cb1dea9b0a642b964e1637161351a6db5635d7cb1bc325ad4e146bd337
+EBUILD ksmtp-18.04.1.ebuild 493 BLAKE2B 0227d2a472e6819e5961a812af3f15e6ef92c5a0b089c813b5ed206915c77d320b06fe7464b4945a51f55c153dce0452b0d3faa1fec2e4e72135cfddc7fd1649 SHA512 951d85a292c545396672d20369ee9e9582430e56fd910f4898c59a8fc22709ebb8ef22cb1dea9b0a642b964e1637161351a6db5635d7cb1bc325ad4e146bd337
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-18.04.0.ebuild b/kde-apps/ksmtp/ksmtp-18.04.1.ebuild
index 237add174dc6..237add174dc6 100644
--- a/kde-apps/ksmtp/ksmtp-18.04.0.ebuild
+++ b/kde-apps/ksmtp/ksmtp-18.04.1.ebuild
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index c64b121fb9bf..e862401e95a9 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,5 @@
 DIST ksnakeduel-17.12.3.tar.xz 606008 BLAKE2B 5f0860f9b5c2848e7a4ce1b1b01c49df05280d5e7369b09fc7cc458aaab6f40c6f9414c19c44f9445bf8ec8a1be73191d8f9ec8a8981631d66f519d4919fcc4b SHA512 aed3e2f9744dc8b3a85aa3119a68f9a5081703a69c7f75394e23c9a5bb8308b4a2a2feabb6f404ecbabbc6e48fbbc7c38f592fd66a840a0628f416f0d724b4c8
-DIST ksnakeduel-18.04.0.tar.xz 605988 BLAKE2B 301682fb4131649168cef95f040e558de93b6cc9cc02b73cff6d0d4411509d7c4fa80d8acc1d8d98b2de7c1a11ba853a06d356e27a94b217eb2926e8dcb78ce2 SHA512 5834d71177ed720e91b00edd31abe1503d925395f56e0c2afbd3e51ce799fc568ae2877e604d7fd9d750b65f289deecb9450c71f4a35dc74f8141d16cff39f3e
+DIST ksnakeduel-18.04.1.tar.xz 605440 BLAKE2B f7e7ebd827829f4d85653fa6f2c8a915e760c5310457ec33f1b3cdefba6b739e84ee63087d28d0082ac4278553070e7e870ff4f9d43054e8dda8442dbe9d0c19 SHA512 58a67080e81a4dabb1e2816866dbc240168e9e1ee4ee3d264f98daa711ddf31b7f65c753fab540f2a593583f3d4e26bb7d902e0f1b1f6f74ebd28d12bc902640
 EBUILD ksnakeduel-17.12.3.ebuild 799 BLAKE2B 49dec31ff6c24dcfcfc3810913d57aca0ffe7b897c65c78336ea245e0bd979dfe8650a0cd6a3f156e9be5f4a209b09d1e28a1bcca7d932f5e35b1ce139de1f39 SHA512 1dbfac43ba40f312124b25bb6b3170f5e85ce5ed7da0b083ecaa023558fc434f40e74fdb7e23290df763178a52c3f15e442b20740a3bb4ba0b194fc40c1c73b3
-EBUILD ksnakeduel-18.04.0.ebuild 801 BLAKE2B 1a611f1d5d84d3bfd30126b7a17b03eb34be062a965805be3a0e4fe47228ac94c6b955f77e448f233b8963cbaf9570ad02715957da0296c4fc8222f2a48a9717 SHA512 86b3777fbf8ddab82b9ad9691cb54ab31612659c124af790b8f1207d5912dc171c8e4afeb66a9b5e5b9b25c7f882f61caef31067addeb606a18ae2a919e862f0
+EBUILD ksnakeduel-18.04.1.ebuild 801 BLAKE2B 1a611f1d5d84d3bfd30126b7a17b03eb34be062a965805be3a0e4fe47228ac94c6b955f77e448f233b8963cbaf9570ad02715957da0296c4fc8222f2a48a9717 SHA512 86b3777fbf8ddab82b9ad9691cb54ab31612659c124af790b8f1207d5912dc171c8e4afeb66a9b5e5b9b25c7f882f61caef31067addeb606a18ae2a919e862f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-18.04.0.ebuild b/kde-apps/ksnakeduel/ksnakeduel-18.04.1.ebuild
index 7bdccd636b12..7bdccd636b12 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-18.04.0.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-18.04.1.ebuild
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index d4ce4a3378ee..a34578b4396e 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,5 @@
 DIST kspaceduel-17.12.3.tar.xz 609992 BLAKE2B f50359fd07ca4580e4532e1797c8d7e0e083b16429aa1a8202a38c74c0a7dcbfd41104003497449572fa299b748c28598749d2e8dc4b50e997bdeabc272fccb0 SHA512 c4a9851ef9af9d9db4248800548a844e5ec64c0f368c5aac18efa2172155e2b7d10daa1c7f0e7bee3161faae20acd3b4a3a10dfdc75f197d07dc981a633752c3
-DIST kspaceduel-18.04.0.tar.xz 610076 BLAKE2B 2aaa7924657a0c94591465c52c3159ad51a4c494386aea1b94ee155075c125615eee14998b4ab978338a1759c4134cad403d9968b8ccfffd932b63fa76d12243 SHA512 c84c11bc02b0126d6ca3cf5f8b8ac653279689d665f8f4ce93bd49ae390dc8f6af9630d5741a79a3c302288a3505649c72b8587923ca50c7e74c4925d36cd897
+DIST kspaceduel-18.04.1.tar.xz 611112 BLAKE2B e17427d8bc540852d76093b43a8c08314e0bc892f18845f9c305a9b4ace59ad2a558e5533d9a468ec73add6147600b7cc9f120276f8f20d9bf25d7860e14805a SHA512 9d3b663890c688a43fdaef4395543c3ffd48c8714db9c2b7d31f2b5786b1344161e5ea50ecec278fad724f75cf5a0bc20060f252e836c01e19e1efa93b37d820
 EBUILD kspaceduel-17.12.3.ebuild 752 BLAKE2B c4b0dab1f8fe500bd162eda61631e9b155962a7a6c31f292e39c5b21434a86d0bdbc58afb31b94fd06c6f229863bdf16b32f5100fea08fd5db7152d6fbb1ac0c SHA512 4d7187ab554af0e9e8a8bc7b8a9ff64f3f120c10bcdda8f39c6674aa47b07fa48be65357f73e397f218ab93ad8334461eb06bafc3c017dbb6765425b8d9b326a
-EBUILD kspaceduel-18.04.0.ebuild 754 BLAKE2B 3adc0b4f2e5684930df2ce805f4f73747ef54959147ca2f6856ec9be17ad6679a98b3aeca90785bc4e91c74daf137e9ae1eab29453a614e245566c9160cc227d SHA512 a96eb8ae4de358c2b69d52a5eb05faa16dbcfba220cc1f3a378cc6798bfcdd9cc4cce41ff9c2880f05508aeae79f03b5d88d3eafee6806d8c2b68503f15099e7
+EBUILD kspaceduel-18.04.1.ebuild 754 BLAKE2B 3adc0b4f2e5684930df2ce805f4f73747ef54959147ca2f6856ec9be17ad6679a98b3aeca90785bc4e91c74daf137e9ae1eab29453a614e245566c9160cc227d SHA512 a96eb8ae4de358c2b69d52a5eb05faa16dbcfba220cc1f3a378cc6798bfcdd9cc4cce41ff9c2880f05508aeae79f03b5d88d3eafee6806d8c2b68503f15099e7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-18.04.0.ebuild b/kde-apps/kspaceduel/kspaceduel-18.04.1.ebuild
index f04dfdae0a5e..f04dfdae0a5e 100644
--- a/kde-apps/kspaceduel/kspaceduel-18.04.0.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-18.04.1.ebuild
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index f27028bd8ce7..90d8186d4031 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,5 @@
 DIST ksquares-17.12.3.tar.xz 215668 BLAKE2B 779f1b9dd804b008fa14353fedabdde12ddccb003314b7d326d8606537fe71e3827f2cc4179140ed0dee067eb6445e6f90b532509542011d754ebf44f2a272bd SHA512 d22db7bf1563005c7ae1bb64bac77211be7c0ab0fba47832f91759a88814d5b4ed97f121156599f9203025657167f4f6ed542ecec7c64da3dcb7503216b9345f
-DIST ksquares-18.04.0.tar.xz 215792 BLAKE2B e102e8a8cbe672fcb096d54133021981d9794aad193d77a3398fc6b0c4977c634bc21436f145ac6e38fb072a9d8e55df0c9fddeb3392b17ca26eff1d30e47480 SHA512 8156bd22bde4735562d20bd1b7c8a971b41a561232eb32f868eb1dbf1400320f43c3fe35397e99e860cf8b7dffd76a1e6836720c889172cd50e2497d7b125d0a
+DIST ksquares-18.04.1.tar.xz 216720 BLAKE2B 36339bd07af90eacf55c9e7ce0890c9643f6af7ce35d26a01dc0a8d152c6882f49661db5b8059b00005820ba2f7b24d61396c7e6dd0ea4ec145e7a385d959ccd SHA512 fbeb28e5eebea5b6fe808761d891d423e6f7503b031f5500a0582ad0fdd0310e8756d1bca578844c11c06c7d24cee079ea26e078aa3b5c48a4eba2112f0a3a65
 EBUILD ksquares-17.12.3.ebuild 753 BLAKE2B 527ea5200d86e94fe946f3ee106694729f0d7517807907d7a5acd3b4403b3b8e36245ac2327b29be254ccd664dfe277c31c2fd9031cea2d65172036ee3dd30e8 SHA512 37bafc3b3251cc6bb4651e13bf4db0c9de0a1fd8fe0f019c33e592e318eb4b8a7f6bb6b1e88f47f839d9c49044b22c5e6b67728287dc3b0aebf9579aa8c69514
-EBUILD ksquares-18.04.0.ebuild 755 BLAKE2B 34666b61861ef5d4cb094c3fb98bdf38ab93f26db755f9346573b9f18c82f08ba79ea6094388fad2d5791a1ee04f8377594f97e5ddc9d024f243fba449a66c41 SHA512 074c44d9b495cebe06681d14ea9a1b1af3cd83c97c0126b37cc2a3d2b3a6f22e845d7eb09cb1fedfa7b786190e0e9487b84a1adbc72798bd38b9c99686ae3679
+EBUILD ksquares-18.04.1.ebuild 755 BLAKE2B 34666b61861ef5d4cb094c3fb98bdf38ab93f26db755f9346573b9f18c82f08ba79ea6094388fad2d5791a1ee04f8377594f97e5ddc9d024f243fba449a66c41 SHA512 074c44d9b495cebe06681d14ea9a1b1af3cd83c97c0126b37cc2a3d2b3a6f22e845d7eb09cb1fedfa7b786190e0e9487b84a1adbc72798bd38b9c99686ae3679
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-18.04.0.ebuild b/kde-apps/ksquares/ksquares-18.04.1.ebuild
index 2a05f5517dc7..2a05f5517dc7 100644
--- a/kde-apps/ksquares/ksquares-18.04.0.ebuild
+++ b/kde-apps/ksquares/ksquares-18.04.1.ebuild
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index 65e701c71623..75f459194f0a 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,5 @@
 DIST ksudoku-17.12.3.tar.xz 1635656 BLAKE2B 19dc7c25d38db5b86b83abfe4a68b45ce0499e3ff8850649d9c9b4b77623662e57146011d8ba1dbdc2f8b06a19e3fa08a47873d51b677466aa1364dfae52be72 SHA512 4c35e01d793dd8358350378766b85f7567a91c18d9637aae7cfd752255fdf84cdc028c70ba32e7b0e71c6bbd4a2a1b06d04257524fca3ddb7dcc411ff983d841
-DIST ksudoku-18.04.0.tar.xz 1636428 BLAKE2B 5fc0a338ba4a0d6edb26dcbb86f9d6bef28eac266aae54e9aec7ffdaa069d31215c1318ffd9163ff1064398f84da57d5efff69cb3b279ac9a99aa66fcafa2d1d SHA512 35ec6382b1e0a9a24ae30b848b724d8610e76f0f945000518a40833aa3f1a48ebc8d0689d0e715e5aca5e7546d325aaeb5ce2966e4295496fad1cd69c3b67d15
+DIST ksudoku-18.04.1.tar.xz 1638940 BLAKE2B 50f22fae22f9142aba625b0e457ea84d4498568730cd1b695c13d913e6f2628bea4f5691a056f3bf087fd040d5f4aa1cccc12ccc7699e1e3966ef814e18ae7bc SHA512 9aa7e5e4d4038f902450193b1befb5f8529c129f68c1172139199f00c1829589c1ed2ad6682c0f78ae970a5a89edeeebaccba1c582ae6437ab75d04693420a02
 EBUILD ksudoku-17.12.3.ebuild 1134 BLAKE2B a3974c852ae75b254b7b6788daad23ddd899df4d163be21c6f4209b779eeba49a7d7fac7274ea323a814231179b6cfb09d016448fd9e0cd787cb9d3c07e59c50 SHA512 bfdd9f816c958358db157ee94f1f22c9bb77d2eb404e505ff2da78481472111fdc255d9b04092d761da064cc479994c024e3fb323e748beb5284f7a25309ccdb
-EBUILD ksudoku-18.04.0.ebuild 1136 BLAKE2B eeae04131cb917f58883f5e8ba326c6f9ea8f581743bc8847d22a1fbccc1d329454b9102e499999ecaa96920ffa4139f2c8107861b89760d91a787ef3bacfa5f SHA512 00123512fde8754b05e13f98ee3b26f1caa4c3a370ab913de29eaead31b4faddbd1f9fb1901f094f15ddf0f9096b7a59a452ec13287793ae7988c662f9c39963
+EBUILD ksudoku-18.04.1.ebuild 1136 BLAKE2B eeae04131cb917f58883f5e8ba326c6f9ea8f581743bc8847d22a1fbccc1d329454b9102e499999ecaa96920ffa4139f2c8107861b89760d91a787ef3bacfa5f SHA512 00123512fde8754b05e13f98ee3b26f1caa4c3a370ab913de29eaead31b4faddbd1f9fb1901f094f15ddf0f9096b7a59a452ec13287793ae7988c662f9c39963
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-18.04.0.ebuild b/kde-apps/ksudoku/ksudoku-18.04.1.ebuild
index 816d157b242d..816d157b242d 100644
--- a/kde-apps/ksudoku/ksudoku-18.04.0.ebuild
+++ b/kde-apps/ksudoku/ksudoku-18.04.1.ebuild
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index e491fbdcd1ec..b8b4e8596adb 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,6 +1,5 @@
-AUX ksystemlog-18.04.0-qt-5.11.patch 831 BLAKE2B a607688e0bf621519ab9fbc15a18b2abe8330c6f44a2b206bb425bf650b535bd763ebd781e7373c9aef27824332149f1b5766b5c886a8664efc67a7bacf89e28 SHA512 1e5d1ec492ace0b996e9c4c4b4c622955810e37be414f2fbdb158bdca544c743fb57b568e2e8a96c1873569fc8a6d218ad28be38a9aff10404a377ba8bede3cf
 DIST ksystemlog-17.12.3.tar.xz 1782044 BLAKE2B 0679e1f79edf65dc99958932d1e60cf4e5979d02786a97b0f5181a819b289ceb3dd219b4678dd84537df4fabec0560a6cf112fd55adb1155da2060b826acdd39 SHA512 b9f1a56a4ec0c26cae5556f3454d69fb7f186762affe95008ee4403071a42d1c76cc2b8451fdd19b3d0302fb0f2b1e7c8e04f84b0efae6fda3ceac90d83d9b61
-DIST ksystemlog-18.04.0.tar.xz 1781444 BLAKE2B da505697b4dfb1924d30b94504f76b78a1048bfbeeffc48b26a9e6017fcda729c4b809f14ff35aa50292c3127b15d38f9998593aabcd28d929152e9f23de11ff SHA512 b23a748f3e1fb46a56f469cd9fd3fffa21c5614af1a96cab142d247545dc00f2c17c50495086c7e5694a7259e8ce6944f25e580a743143089b1332f8e1378e56
+DIST ksystemlog-18.04.1.tar.xz 1784856 BLAKE2B 91ae07e9b968f695efcd3e5ec8a3b17286eec3a786d55423e2d4db7a486f9ce41ae817eb16204e792ac39f4e0a4a308fd22bc2f51af66852d649bd526667dd34 SHA512 714cb96ccd5201c4e6716bf8520bc315cf17fcb3485568cb50578fc011c42c04d63704272209d959d70dc00e2457b46aefd2d011b0ddf8cd6f4dc1db00fad698
 EBUILD ksystemlog-17.12.3.ebuild 1564 BLAKE2B 3c90337a6c5caca3d546aeb611e8545be0cb9fc2d840bcb5bb1b41f837b7faaf1dfc8537ce60e3de21bec325173a5e968b3d55612b1d2173f2af69aa65f0fedd SHA512 ef1ae57fd6276bcc9bb529b2a142b3f83774f58fe93f727320c5ec8ca696d1b6d5ff8a2a8f7a7ff4268408516050f989c6467ed623075a84d6db26dbad12a77b
-EBUILD ksystemlog-18.04.0.ebuild 1612 BLAKE2B ac2e47c3a4cff00ea4f72800d6d54a25c87fb69fac2a96871d9513e64f3a53607304b0ff7807cdb1182a43d95db6279a73376563cde46f7d3a984d58ba04449d SHA512 f71e9445e7dfcf500ee7409945e7d9167547224b12fd30bde002189b8fef0e3dd732672a083f8195913ab862d3663559c83a0d34a17aeb569723e0659482eb35
+EBUILD ksystemlog-18.04.1.ebuild 1566 BLAKE2B 4e4b5120e06c4602c24fb80d11749d6d27b4e2830b879680162c47969688baef6db86ac036f807111dacbbf8f68a50b2716d0450108e62c63b6984d57ae39d49 SHA512 f197ce7053e9d69e276f1950b80d5cf47bf4693683fa65fed355efe0b7e3adfec58aa0c2606ffa75caee9843d771d2f435546eb16de98096db31e7e1452ea060
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksystemlog/files/ksystemlog-18.04.0-qt-5.11.patch b/kde-apps/ksystemlog/files/ksystemlog-18.04.0-qt-5.11.patch
deleted file mode 100644
index efed562efe60..000000000000
--- a/kde-apps/ksystemlog/files/ksystemlog-18.04.0-qt-5.11.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3ab2bd7564bcb9518892704e47634053875fac14 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 14 Apr 2018 01:18:05 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-
----
- src/lib/CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
-index 5cabcba..30b97f0 100644
---- a/src/lib/CMakeLists.txt
-+++ b/src/lib/CMakeLists.txt
-@@ -49,7 +49,8 @@ add_dependencies(
- 
- target_link_libraries(ksystemlog_lib
-     ksystemlog_config
--
-+    Qt5::Widgets
-+    Qt5::PrintSupport
-     KF5::I18n
-     KF5::Archive
-     KF5::ConfigWidgets
-@@ -58,5 +59,3 @@ target_link_libraries(ksystemlog_lib
-     KF5::KIOCore
-     KF5::Completion
- )
--
--qt5_use_modules(ksystemlog_lib Widgets PrintSupport)
--- 
-2.17.0
-
diff --git a/kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild b/kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild
deleted file mode 100644
index 0c60ccb04012..000000000000
--- a/kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="System log viewer by KDE"
-HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd"
-
-# bug 378101
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	if use test; then
-		# beat this stupid test into shape: the test files contain no year, so
-		# comparison succeeds only in 2007 !!!
-		local theyear=$(date +%Y)
-		einfo Setting the current year as ${theyear} in the test files
-		sed -e "s:2007:${theyear}:g" -i tests/systemAnalyzerTest.cpp
-
-		# one test consistently fails, so comment it out for the moment
-		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" -i ksystemlog/tests/CMakeLists.txt
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package systemd Journald)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/ksystemlog/ksystemlog-18.04.1.ebuild b/kde-apps/ksystemlog/ksystemlog-18.04.1.ebuild
new file mode 100644
index 000000000000..613a2eccdf4d
--- /dev/null
+++ b/kde-apps/ksystemlog/ksystemlog-18.04.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="System log viewer by KDE"
+HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+# bug 378101
+RESTRICT+=" test"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if use test; then
+		# beat this stupid test into shape: the test files contain no year, so
+		# comparison succeeds only in 2007 !!!
+		local theyear=$(date +%Y)
+		einfo Setting the current year as ${theyear} in the test files
+		sed -e "s:2007:${theyear}:g" -i tests/systemAnalyzerTest.cpp
+
+		# one test consistently fails, so comment it out for the moment
+		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" -i ksystemlog/tests/CMakeLists.txt
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package systemd Journald)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index 5aaaf653bc04..bb355a5ff184 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
 DIST kteatime-17.12.3.tar.xz 297228 BLAKE2B 48bd8240ba9b8c5d31522ac5a5fa84483709f18c690b88af003c0534b70390a92c11c90c280b1021bb0e3ebc9e6b2191dbbd0ebe5f188e30b9d248d6222ce187 SHA512 658f08d6d11705d4bae1c458a44d1910ebd1297b6d245e3b866fc6355dad517081ca2feb6a33cd7e0629eaafcbf0d6007d94c54f1aea6bc4a45bd423c10f4f49
-DIST kteatime-18.04.0.tar.xz 297208 BLAKE2B 55996ce694a0a0b11f8b60c96ed5cb053b8adc0440ce2689d58549135987b7b0703549976873ae0653cf78eca33eccf457d5cb1591083262a18ecdc5d0fec779 SHA512 c3a995b691fbe43ea8b59ff50543126b0da2a438b195c557f922c1bf5d73e4fee5d1ef006ebe194c885c3d398d5846a96fd35db82b08e950ddf74c0c81598bfe
+DIST kteatime-18.04.1.tar.xz 297888 BLAKE2B dac2d69ba5fa1a386fc96bd1e3828ec8db054ac63eee130660e89753cfc4305ba0a1c592eb9fbd4c8fe5c8a09c4f2fe235582973e68a6ffea4b96984a3b3ea93 SHA512 5057bd44aed7101d2323040c2a0712a24a214b19ad1a965464295ce5ff0733902e8a55a98503fb3901000233a8b21831cc03f59335f617b7a5ac493ff82e84b6
 EBUILD kteatime-17.12.3.ebuild 718 BLAKE2B 06cbb4252bcdc2d843e2f162fff7e915db999203d1e0ce37d3e355587350bc311e838aae0b4069250cc10207d81b8b68e0bf1789cc709960879680686aac268a SHA512 80ee20c830c03c3b364fb562d08e09fe50b33186336a7409b476b5e1d786b8a36c56658954b33a413006ca5bbc5743f11144a67d82693740633d3001e4a80d61
-EBUILD kteatime-18.04.0.ebuild 720 BLAKE2B 7b22415e088d49fac77aa261a0f6e00074826295ef889336e933125e40324410ba48ef681ba6435cb7cf3e4a0cfe5ee671e1d69d2d1274a9a5616cbc8911a586 SHA512 d436ad0d811c8cb6c174a6cfcde05eca6286c51bbb907a255c039960f303278e30db94f170bd382d373c1f04951e158793fafe9e5a7a322e680c074c752c5631
+EBUILD kteatime-18.04.1.ebuild 720 BLAKE2B 7b22415e088d49fac77aa261a0f6e00074826295ef889336e933125e40324410ba48ef681ba6435cb7cf3e4a0cfe5ee671e1d69d2d1274a9a5616cbc8911a586 SHA512 d436ad0d811c8cb6c174a6cfcde05eca6286c51bbb907a255c039960f303278e30db94f170bd382d373c1f04951e158793fafe9e5a7a322e680c074c752c5631
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-18.04.0.ebuild b/kde-apps/kteatime/kteatime-18.04.1.ebuild
index d6175c6546cc..d6175c6546cc 100644
--- a/kde-apps/kteatime/kteatime-18.04.0.ebuild
+++ b/kde-apps/kteatime/kteatime-18.04.1.ebuild
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 2e06b9ed56d1..7887fd09bf6f 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
 DIST ktimer-17.12.3.tar.xz 452056 BLAKE2B 2b1916d8b26232824296893d4ed0c9e3db510b8e6dda93a8b547fe83e490e2d646b7d6abddbf781730bc831c7aeaf05ae478658b85fe1395069fdce090f3b437 SHA512 89445386f152ce0960f0de9c84d50701d30811a526933c3bcc4441a29b5ee71cbf7e3f674b49ab8554f5e58e884f46a6727c66c60f273d52dec5d597e053df5f
-DIST ktimer-18.04.0.tar.xz 454600 BLAKE2B 7cd1d471839dd50ee1313c48ef4122c8799763112dfee2eb55ca4c54bc7454ccde1e716374c60579cad8eee372482346c965e3ecdc34ee2fd34eb31d7bfb56c9 SHA512 7bc95539988ab8ab00ba00a0ade688d27efcbfdcb4f6b5dbe6f6474a1aaa1218580b37937030a62ab8f14cf3207ef81c6445a9692f09d87f7ae15c6bb7145c58
+DIST ktimer-18.04.1.tar.xz 455220 BLAKE2B 17f36c56f8896f80bcfb748316c1073fccc361292c6c8561c0cfe91b4101343cedfe77a5b311ad27080e3ba46fa54eb42d8e000f24eeb5a83a6fbdbb2279a217 SHA512 fd43c136df4c3c740be74cdee9aabebfce8b1527b97f17f357c15d5963f53c743f4d63a39b231654c99eeef0728d200639bce2d0ec0c780f8d69ddafe14716ba
 EBUILD ktimer-17.12.3.ebuild 660 BLAKE2B 37955088d78d5daba9a62a36db829157900185ef1b934d99d2567782185c2397c1826b13c9a7b4ab5c3212ea9c5ed04c2eba48226c3acdbf7d40278545a8961e SHA512 e7b802fc6f09b0bb488546c02891708c4c8a5ff442c68537e8b2ed64c2559bfb749b2c390bd8699adaff7a37dba3e3be270be631dc61ba27ab46584217fcb2cb
-EBUILD ktimer-18.04.0.ebuild 662 BLAKE2B 8318d70484ae17a9e0f41dc423a44f204b535e7c9671301097d68482d313569aa552a7dd1e6142cf52ce0c6c290cb231b727d6d7e769f9c37a5a3bd4e7a1734e SHA512 dd1be55288079829704847d901181329b252ee506732978cb53bc838648b8128e6effb0f9e1a626ef0ab39fd8e37f8e9f5c97e7f63575923ac3602b40e3e0996
+EBUILD ktimer-18.04.1.ebuild 662 BLAKE2B 8318d70484ae17a9e0f41dc423a44f204b535e7c9671301097d68482d313569aa552a7dd1e6142cf52ce0c6c290cb231b727d6d7e769f9c37a5a3bd4e7a1734e SHA512 dd1be55288079829704847d901181329b252ee506732978cb53bc838648b8128e6effb0f9e1a626ef0ab39fd8e37f8e9f5c97e7f63575923ac3602b40e3e0996
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-18.04.0.ebuild b/kde-apps/ktimer/ktimer-18.04.1.ebuild
index f21e3aa1385a..f21e3aa1385a 100644
--- a/kde-apps/ktimer/ktimer-18.04.0.ebuild
+++ b/kde-apps/ktimer/ktimer-18.04.1.ebuild
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 09eaebb7a465..0c3e5743b691 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
 DIST ktouch-17.12.3.tar.xz 5105460 BLAKE2B 1878e633bd2aebe9f3da34a53d3ca868f1b1585c55bb0bfe6a05ac18788480caa3385ffc6f0249c0687aa0a44e65f4db4a69e75880550aa0f29b42b1bcc6d2f5 SHA512 6fb3f1ee7062331047aca2d44159bc47717cd0fdbf72e97a19e6bdf0fdd86df35f05405b724cdb0401c42b6a390eae7e9aaf26caddaa9f15e44c9ee7388b6c9e
-DIST ktouch-18.04.0.tar.xz 5110572 BLAKE2B ff85494d22d90710ec7c1b3d0edf0a990ce07a4b5fb95e3abaf9606acc67dbb3a7a88efb4b20f68fa8a9a5c61438f0e0a3b53a93e972ebd33a78f2770cce1f14 SHA512 ec4114fc7799ad5f774c2c7864e7d1c29dd98b1ca4c6c3f0e5694f40efc423d265c56a4643dda0b99d896d7a2009d139b62f595eb1f3a20c9badbdc43a1e403d
+DIST ktouch-18.04.1.tar.xz 5110224 BLAKE2B 2864e349b50d78b799fb2592ffa7b576df0a854bf64a14697269c487add2137e7b485c74d91f1dbf6de380a4b4b241b314dfbe4d14ee3b9da1c7256d2546d310 SHA512 b907f0e32fada964cfbc58cae7555eaabf1b1b3f39b8d67a02af1b0d81abe9db15d6502e33116e46a3b263c2c14af1ad6d0536a602dfaf5a0087c47b5916ff49
 EBUILD ktouch-17.12.3.ebuild 1111 BLAKE2B 3595076fec0dc3b9e18b41285dd9ec7cc8c2bfd155555a25537d612c2e946b038be06fdfb3b7b86296238a12a58f6dd4e28a0d3697bea836fa2e672575d9d660 SHA512 ba126e96bff53bedb5210766322cee11ae7f5e828aab493a58b42389131e098f65c879b32ca0f3f1f5876d32faa006754ab8d146639302840460e4bc29d8f5db
-EBUILD ktouch-18.04.0.ebuild 1113 BLAKE2B 22f4ddde7dd55145787c72259495d40470a683024092a787e037347c6f2195614e608fe4b433e84221c23b735f4326e9abbfb6dfd77573a1cfa8e50b2356f303 SHA512 5e866834706e18c4d1af4319fbc0d2d135c13cc7b3099b631393addd93bbd777f620ccf97374311f63d349fe13893ef6c34bbb2631d5930c3a2e6f7d0b31dd8c
+EBUILD ktouch-18.04.1.ebuild 1113 BLAKE2B 22f4ddde7dd55145787c72259495d40470a683024092a787e037347c6f2195614e608fe4b433e84221c23b735f4326e9abbfb6dfd77573a1cfa8e50b2356f303 SHA512 5e866834706e18c4d1af4319fbc0d2d135c13cc7b3099b631393addd93bbd777f620ccf97374311f63d349fe13893ef6c34bbb2631d5930c3a2e6f7d0b31dd8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-18.04.0.ebuild b/kde-apps/ktouch/ktouch-18.04.1.ebuild
index 548ca5f0385e..548ca5f0385e 100644
--- a/kde-apps/ktouch/ktouch-18.04.0.ebuild
+++ b/kde-apps/ktouch/ktouch-18.04.1.ebuild
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 86ac356c9128..4771113f3515 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-accounts-kcm-17.12.3.tar.xz 262800 BLAKE2B 63db8496c2a21114ade346ae060b1ecea49faf8df101cc6ecb465ef0c5b856d54f6240dd7900f0917fb9729182b32c376634e6fdf29cd94c5e2d66e4d768fce5 SHA512 5cb33357fa974e383a288f7af4785b9d18e35445130a01a3062e127be4f01039a4f65e894cfc5fe2f0002cd8bd837b066be03e5e19f4fed89a8a0bef5436f43c
-DIST ktp-accounts-kcm-18.04.0.tar.xz 262652 BLAKE2B 47c13ad5273afb635731156d41ddb3632896cb29fb644fa44af405eadbb7ad5f98d947da1ed957e00eb72cd6746e3ca3ea367bf828b9a47a1c257eed73738467 SHA512 a2d353bbc9b8ba17a355daa7ba0ceb00d4cabbcff955b535e69dbe29a8359ba9cac99b11fcfc201bce4e7336266f2e99470aab2a4dcda3593c1be84f8ab95155
+DIST ktp-accounts-kcm-18.04.1.tar.xz 263620 BLAKE2B 946df24cedb24081eabb4035e6a9310c854ab2b284ff80dd16222f2f16505c4fe5607b305dab87bc48f07067f8b6de59da361a02a0028fe3c97101f0b4915731 SHA512 68074dbf2190b34f0ab3a643135d399f4b016624d85a6363f8f7b48fa43b0c7ee8a5b7c2551fcd1126e34c07141c55c470f50e50564f0bb94566d23845bd842a
 EBUILD ktp-accounts-kcm-17.12.3.ebuild 1515 BLAKE2B 39bd4bb71f741d222d7d468d71f34f00d442fef3eb8c605943238f4681d3464cab0fad1fbd1a06078d9b3ad64db33d54a62762fc51193bec9934ee253ea42d79 SHA512 fa5225abb028f052b8f1a4b0e28512e6675588382b50a0fcd4c0395024c510f7e0b1673d3aaba341baca65eadc2154f8969cd0165c65a49270100b3b17a32d9a
-EBUILD ktp-accounts-kcm-18.04.0.ebuild 1517 BLAKE2B 48f2ffed91735d4272295c4bb97c89b9e426f10e764b318f777522ee3b5ffcb1b9d766349915c39cc0c1dbf410d09aff8072ba3122d406e8c3cd14af7ab423ea SHA512 09d7da9b05ec76456133d73b1f5900fe1456d03c91736ff3a308e1c6e55734e1cb1abbd6c17a77b8849358692f2a3814f08d76e716e08459d32f48c1e49057f4
+EBUILD ktp-accounts-kcm-18.04.1.ebuild 1517 BLAKE2B 48f2ffed91735d4272295c4bb97c89b9e426f10e764b318f777522ee3b5ffcb1b9d766349915c39cc0c1dbf410d09aff8072ba3122d406e8c3cd14af7ab423ea SHA512 09d7da9b05ec76456133d73b1f5900fe1456d03c91736ff3a308e1c6e55734e1cb1abbd6c17a77b8849358692f2a3814f08d76e716e08459d32f48c1e49057f4
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.0.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.1.ebuild
index 0bd40b4ef69c..0bd40b4ef69c 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.0.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.1.ebuild
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index 0cae39a328c7..641c1f09878f 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-approver-17.12.3.tar.xz 37044 BLAKE2B 7c9f25572a3a1bd9d38adbfff60a161900d2a02fa1a02f95be2412f4ecc3682097f63dbe4b0b29a8f6e5cbe6a63be63f405e74012816dec21a8fdcea0625eb96 SHA512 30668c4ee3b03b11a4781b57f4c8ba9c596c4e965016522ed9d6bd579cf42f9cc394c36ae1c4035288a1821276a392094a6c6b9bbf4e0bd6f94c3e46546ca4e4
-DIST ktp-approver-18.04.0.tar.xz 37092 BLAKE2B af1147ad3480f646ee6dbb9d19e4b32062cc86f2d4860507be07dfd019aacf3485f5bc0a0d7216cb9b06e58259065347fa30f8c7724758598c5ed127852e9a47 SHA512 7637995cea5df28fa8e39357be6c68f440e06ce838808282aff0200968df1a6c19cf0d465e4d344265f6086a00cc110957f6b0654b51946699275f4919b5c457
+DIST ktp-approver-18.04.1.tar.xz 37076 BLAKE2B 173140dce0fa9639ed1325f07701bb334b3f411dceb01d874af8099772b1ee01d94923953627074f7575f0ccafec0c7e6283220f88d948c051f8a81140011035 SHA512 54be0d61fc537a4696b65cac6e10c5eb8f97f6ed3ee3599100c0dc306a58ec6f96acf8602fb5e7a027c883dd7edfd740c368cbd17a6fd0b03bc921d71ab1ad4e
 EBUILD ktp-approver-17.12.3.ebuild 676 BLAKE2B 27dece05da5da88d16f3d81d4824a7eebc02cd9bbfb3cd5a16ff13fda8f1b0528e2ada5f1255c977743a1317eebcb23f081a186b85cb1a103cf477083886b7d7 SHA512 be36ec7dfa033aaf1618172cc4ce9a7a1ffd81fc5bae4e606489b063766a896c0743aba06ef359409f7fe6005fc0a0740e2ad4ced0bf00c0e6e3b40f193ff87c
-EBUILD ktp-approver-18.04.0.ebuild 678 BLAKE2B fc2e7bbe1593511b7f1e6df21cfc923160759e6444f45f511c427dd1b8b748a50adcb6aab1bbc3232aae16083d3e0e8c727c41c0bbe445dfe1b52c789f29a425 SHA512 39a4495a943b4d041cb3b229558272cc0fd8ff17be19af01c47254a2113ebc070ea7fcc6546a9c9368d7c1b1af90dedb4806561b7a92d6353f88dae0757e9297
+EBUILD ktp-approver-18.04.1.ebuild 678 BLAKE2B fc2e7bbe1593511b7f1e6df21cfc923160759e6444f45f511c427dd1b8b748a50adcb6aab1bbc3232aae16083d3e0e8c727c41c0bbe445dfe1b52c789f29a425 SHA512 39a4495a943b4d041cb3b229558272cc0fd8ff17be19af01c47254a2113ebc070ea7fcc6546a9c9368d7c1b1af90dedb4806561b7a92d6353f88dae0757e9297
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-18.04.0.ebuild b/kde-apps/ktp-approver/ktp-approver-18.04.1.ebuild
index 58706d972a41..58706d972a41 100644
--- a/kde-apps/ktp-approver/ktp-approver-18.04.0.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-18.04.1.ebuild
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index f6f57732e44a..fad3d5cbbb9d 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-auth-handler-17.12.3.tar.xz 46260 BLAKE2B 22d2089a51776a0adc363422fe93b7a179f8c7fc143c42197ba8ed43e74c35b91558444f116d9527cd009235a670563ae73aac4a135c393da84a6083069584c6 SHA512 08b6a5e0b1a4ade40dd93ac8c515f4120e84e5251a7117c824194c47e35e30992e6afbd371c46ca8f29684caecb3f0e0ae26ab8d9c090019ca9c78336f24478a
-DIST ktp-auth-handler-18.04.0.tar.xz 46216 BLAKE2B 00305a105f10f5e94b55b119c13d549428e5e5da582ccd1ccac30735b389ba64f073373a1fb527c2ad20a80ed6dd64d21cf37815254bba979b9a5e6296fa7fb4 SHA512 9b14cd09078fb690bc6dbbbf4d1e90afd4b613c30c1ea35210e5a984809583171e7ecccef1f5ba7bc0323890c634a4b1fb7c101ac393d7aded02a6a93fb7f42c
+DIST ktp-auth-handler-18.04.1.tar.xz 46428 BLAKE2B c8a155eb666e35ba122449ef1ad2427480531d9101dd302934056ae886ccc24afceff41e4ad2f267589b21ccdd3559773c9539e069d26a347c84110fdb255e69 SHA512 cafb91bdbd746bbdbe2ecafaa9d5b2d140e4db72bfabdb804a662d51f22bd3b4b309831dc233bfd76f86190075552b005a7e80e5aeb06c2f5e4c652501637445
 EBUILD ktp-auth-handler-17.12.3.ebuild 827 BLAKE2B 237e604a61a6c5ac61a2541a0daa73d1afb77db4ad747305f14a8ea31cad8c443fde4249e3729f77071c95e754750e5875d5d58a5609e9af8796e31a892ca1e4 SHA512 47e2ff24b54a5a88fd2ca27dcb5e7f8f0bc76bbf78e111263a3fbca089b29c72e38c7c42fc0d0a74acbfa0564ddf39ae9ff319804879e7e8c9b8cb24cbd88345
-EBUILD ktp-auth-handler-18.04.0.ebuild 829 BLAKE2B 1e90ee2f5a17492191a56be9bbfc1cb26e394c2bf6d3bc1c57f3f5256708c0fe0e42a0917251cc0c4f4a4644380529cd56a83651923635ec9215e5cfcce15a02 SHA512 bb41447b6482491ee55f860b305d93837a1540b162285ef14a560959439c3ae96c4e01b6b894275cb11ea3beb74236c31389f67b771578a3f718788f9674ab38
+EBUILD ktp-auth-handler-18.04.1.ebuild 829 BLAKE2B 1e90ee2f5a17492191a56be9bbfc1cb26e394c2bf6d3bc1c57f3f5256708c0fe0e42a0917251cc0c4f4a4644380529cd56a83651923635ec9215e5cfcce15a02 SHA512 bb41447b6482491ee55f860b305d93837a1540b162285ef14a560959439c3ae96c4e01b6b894275cb11ea3beb74236c31389f67b771578a3f718788f9674ab38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.0.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.1.ebuild
index 2420ddb40f4e..2420ddb40f4e 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.0.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.1.ebuild
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index f162d7f9db8d..be2065ae96bc 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-call-ui-17.12.3.tar.xz 96532 BLAKE2B ed43fa92c5ccb10b831c3577a1a58f91195d50c3207b56e11911f0a153fea4705a5a2b99de950e40647730473dd53815333819cdc933bdb71d2fa7087a1bb5c7 SHA512 9fc96b1e83b95a2e6d2793631c94ff1092e72fdd78b700ed7d44bd1dfe7dd2c010ac86ab7baea1ddaad02c99cbf75b27f8d42da43867fe84d2d7dc245aef0ea4
-DIST ktp-call-ui-18.04.0.tar.xz 96580 BLAKE2B 0bd7e1c35d8d03e9022878057dade9dab5a76d2afd3330fced2d118ba4a6232d21a18de3bcea021c9e283c8ff797bc843f0d034a9ba2b18e832ac31e2b276bcf SHA512 f8ed549b6986b6d6eb4b4285a4d9da3d0a3f1fb6d37481e2d71019db52ad80b73c6cf1a69c5eb6b5aca8d9aaae1ffaf444955eadf4e9efcdd2099ceed008c5ad
+DIST ktp-call-ui-18.04.1.tar.xz 96688 BLAKE2B 46ee7dfb470833413e813255c366adfc25b02d3d9a2c63c9ac0a874c33e4d78d57477e3989778ff3681c0fce0a3402b9beeedc80f735b7d7ebb566fbec8ded67 SHA512 e1ada15f1560e7ffb4745ba8820be64abe04f3433bd0bb2dbdd0b12ac846c1416ddceb16c33a448f191f9b66988cb2d54ee7ec36ce52924b0a0fcc4be3f2e16e
 EBUILD ktp-call-ui-17.12.3.ebuild 986 BLAKE2B d96de4faed6b79fc39132c4b39f7f747d3295e6a8e8d6246e7470717b8f1632f35a52e9265857f260c6f3776209b281af8dba8fedef29bb8a3733dbf7fa67fe0 SHA512 d9d93eea87d6b24e113835482a9a48af0e0bb24ce6d6e4ae5aca97bb5506ae932624931df319240a586586eef89bd07c79d0b01b053b1b8d48ef3d4c577ee385
-EBUILD ktp-call-ui-18.04.0.ebuild 988 BLAKE2B df355a4c0202bb4806aae3cc920d3403a36078d209e061ec3c17e69923cdd7bf9c0276e7cbd4cc793332d0fecb32e663e9760fb85bdb8312b840c7fc64583fc7 SHA512 a7d7fa274e4b223836b68ab0ef7edab29464bb09d9515e0f52e412d96abb4da608ee0df38d79179daffe879c24bee06591fafba5e7feb2eb970411f6f688d00b
+EBUILD ktp-call-ui-18.04.1.ebuild 988 BLAKE2B df355a4c0202bb4806aae3cc920d3403a36078d209e061ec3c17e69923cdd7bf9c0276e7cbd4cc793332d0fecb32e663e9760fb85bdb8312b840c7fc64583fc7 SHA512 a7d7fa274e4b223836b68ab0ef7edab29464bb09d9515e0f52e412d96abb4da608ee0df38d79179daffe879c24bee06591fafba5e7feb2eb970411f6f688d00b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-18.04.0.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-18.04.1.ebuild
index c0ba9a38bb85..c0ba9a38bb85 100644
--- a/kde-apps/ktp-call-ui/ktp-call-ui-18.04.0.ebuild
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-18.04.1.ebuild
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 64c0f3133dfe..b8ce45575840 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-common-internals-17.12.3.tar.xz 441184 BLAKE2B 65b3e4e830e5d90f9318d160ddb3ec239772a840973464b95c0b6dba1e753a5a12120896a31aa9d6663adfc235591181adb4b0f938a3a56f7f18d63ff4e1146c SHA512 7662017f3186ed0b70dc02a6af33b0f0f5547c2a3da5f76855cbdaa7ce8bdc31cc43929033b040cd1d7bea0b9606dfb440ee93a8ce5d0f9835363775b95c9cf1
-DIST ktp-common-internals-18.04.0.tar.xz 442288 BLAKE2B aa59570e86eea9fcc2d24922668bcdfb745a01afb685be8a7db8b872c8d614504afb04fa4199ab95d164de88a49c39190a005b186b3ae3ba9ba941fa039fdf39 SHA512 3b2ccf58fd8359e407a2b17de8709349b19f818873940572c5b209d9c14dd35dc9cddedf5ed86f89975ee6b2a9cd1ad5c7430b78049d1ef20df2fce0c76f3133
+DIST ktp-common-internals-18.04.1.tar.xz 442268 BLAKE2B a21617ebd2f0d61533bbf405de4ff873b8007d47f5bb7aaa65c6499d74d326e45488799dc879302d0d363f73aeda7d3a8c4c5c55f4c4d581cdb128e8906f8efa SHA512 05dc4707dce1e53a30c03edc5b8768dcc9c51a848996b86d13fc3e910762779a2070ef30bd08598f96c0c58ae3a93d9421c26dc102e5fd14de2cb1a8618ecb16
 EBUILD ktp-common-internals-17.12.3.ebuild 1575 BLAKE2B 40d89f97145068b5b6e27077941ba229f258698a3b05bedde6c966d22ae5ed39801ed4310d6dfbd736578d9f5dc8853b671b73d7dc8d50f65462c88c8e483844 SHA512 11ec9de3d9940f861e4eae9d3dcf1cbe4291d108f414c7a0bac0c1362cfc3d7831cd0ce7cd1ce5ecef8d7f58b01e5245da6e10cbebbde3b3ef568a83d99e3d60
-EBUILD ktp-common-internals-18.04.0.ebuild 1577 BLAKE2B 13d5904f8057dc070c46a30faf664df43a09f0a27aa60bb526cf8c254c97ff4feaa3741531888c54591acd0aebe1670934c08e2f24fc63348e677ddade7f0abe SHA512 883bdb30443d1b8999bb0ac2d984224729f2baa5f572824206da23a247fca8a47d46edfe8987c1dfaf1ba11065062c9b071a2fa825b5ab97a21245448bee9d23
+EBUILD ktp-common-internals-18.04.1.ebuild 1577 BLAKE2B 13d5904f8057dc070c46a30faf664df43a09f0a27aa60bb526cf8c254c97ff4feaa3741531888c54591acd0aebe1670934c08e2f24fc63348e677ddade7f0abe SHA512 883bdb30443d1b8999bb0ac2d984224729f2baa5f572824206da23a247fca8a47d46edfe8987c1dfaf1ba11065062c9b071a2fa825b5ab97a21245448bee9d23
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-18.04.0.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-18.04.1.ebuild
index 6325d2580a18..6325d2580a18 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-18.04.0.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-18.04.1.ebuild
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index 80bcf77f269d..9a5345296baa 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-list-17.12.3.tar.xz 131508 BLAKE2B 55f46331693029939137067e98d252cf6b8efc816b96e597042c2adbaec3bbefdfe5bf027ffda47d9ece869285107425da27661f2b5d0bc63c438843bffdabfc SHA512 4ceaad321e180a121ed8dc10001932c070042544fbab6df1716d882ff429a51615fa3d97615c443141f0e709eb78aee6a013a2e36159d500494bd406761c8983
-DIST ktp-contact-list-18.04.0.tar.xz 144584 BLAKE2B bdb331347fa16ba97995825bd1139425cb99a573dc8d2a1025e4139967202745d07dbf2719f23b3984b225f7a31a09cc0e72f8f15f8af72968e35026d8250159 SHA512 07fe169f4609d560a099b8fec63e790002ebe3e2697cb0fe997d0e901e75354cc634b39c4eb66df9791194d441503167b180c42bc6caa3684692b0eec9ac13d9
+DIST ktp-contact-list-18.04.1.tar.xz 146448 BLAKE2B 40d84cba9fdccb4c2f4640ba9cd40b8a9c6751a191b6d1e3bb2be85204071ad52ccad21d52a5c01b2afb1f7ad6e0e46714351baf104e14502d176d6e655887c6 SHA512 390ab4410252ba889b228540ee5aaa237d2ddd8f60b92fd0ce037fe2f361e844ef07d945f07346787b14aec0f6c5b9c6463c34fe7b65e8f7db32233f29ae4508
 EBUILD ktp-contact-list-17.12.3.ebuild 1032 BLAKE2B 81c466f9879a9d4cc03c073c74ecc85ee7787a4ec026dc9ada56d75102cee2d026b8c3235d905927fce3c3e62edfb075c46b5053b9482ac064bd45449e22bacf SHA512 914e0ff38721394f9b828072c806a7884c32f9ca93e32196566b0b85025db90d97e4be207b4a805fe7afb0db9ff411fed4aca561a99bbb35ed68191f54751239
-EBUILD ktp-contact-list-18.04.0.ebuild 1034 BLAKE2B 56bc019c2d9917f22c97d7590c00e838b817369bc5c19e3b7fa94a695a5d2e36651b677f6461571a331a9a38e255f606e22d7033a160c3b347cc5a526095d3ad SHA512 7a6442a27d413edd477ae3f4463d300a6eff463df6b5288ed5cd0f16d5840472c10e78679706215a66ba55464049496019fa808e415befe2c885d2c225be7186
+EBUILD ktp-contact-list-18.04.1.ebuild 1034 BLAKE2B 56bc019c2d9917f22c97d7590c00e838b817369bc5c19e3b7fa94a695a5d2e36651b677f6461571a331a9a38e255f606e22d7033a160c3b347cc5a526095d3ad SHA512 7a6442a27d413edd477ae3f4463d300a6eff463df6b5288ed5cd0f16d5840472c10e78679706215a66ba55464049496019fa808e415befe2c885d2c225be7186
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-18.04.0.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-18.04.1.ebuild
index 93ce9c752242..93ce9c752242 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-18.04.0.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-18.04.1.ebuild
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index d9ec109a13c2..cde10db369e4 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-runner-17.12.3.tar.xz 40100 BLAKE2B a328c6f8af07e2d7a3d1bacad077fe83e39d412ad1517feda7a1f0f17aed45fd503e22fa3064cf57e3687c572b1dde4a99df48e36405ba1662edbab33614f5c5 SHA512 b2ebd74bc9dfd893867fca624a1e4ccb2b999b27b87c2f460735fd0c1e7d9627765d012cd901a9db1d5d6df79a587da3d2457d7a2afd504eae8b41cc9917cf9f
-DIST ktp-contact-runner-18.04.0.tar.xz 42344 BLAKE2B b1e129c34ba8dcda9cf9e05238068921ae8112043d8fac78f0c9937101dc26bceb457b0ce60a5061b227950f7e2c38166c46c54fc6d4ac19f4657531aae84dd7 SHA512 b3d0ac82b9c81ce4b0ff6100c2c40acc4e5d0098f134155152cb932e9c45608a55e9cb9d7c08400d97f8886d4326758acce86a54e89b153f4bb4669c24f54b17
+DIST ktp-contact-runner-18.04.1.tar.xz 42512 BLAKE2B 0b9ed1139ae67d12908675f42d74957821c820994ecf1e47f0adec24df4d6ed11a56222bdfc1183dbadb9a3fbed42d669b52e4c63524c595f4d922206e6b8f7f SHA512 3fcc7407dd730323773ec49adb1f6755ce392e21bc342f018eb911049d9e980e03e5261ac9834edababe97c5bfc4d62d1cece2d8b80f9c9f64a7402418c14c48
 EBUILD ktp-contact-runner-17.12.3.ebuild 602 BLAKE2B e61fc57cf35cb8129dcb9c034316c2ac66fad4b4e91d7055cfc3a9cff345b5a22706678ff35487d660c78f1f861768abe94a079e3ef0cca103be7e1c2ee2b10c SHA512 28eefe0bd03dcffbe5f6707ffc9b54616f795434fe9d6a932c666f203c004973c41bf8e71b0fa57aa2ff1f346027bddf75e61c6246f22af36970c1584ad91288
-EBUILD ktp-contact-runner-18.04.0.ebuild 604 BLAKE2B 6622ba50a4d80fc7b4d1d363ea4c70784959f9a4d7ee0e14d40ab895acffd1d9ee82192723d1aba091c0967cb153efe696835c1c3bf638b2416cb1fd80d839f3 SHA512 5948d7f4be6801e6f4258d79bfce0a59fd87de8a0635a95fb27d717dd8dfcabf99ccf89c90d37c43dfcb7f8a3175b73aeb5dfbbbec9d0b143e28bebdc24675ec
+EBUILD ktp-contact-runner-18.04.1.ebuild 604 BLAKE2B 6622ba50a4d80fc7b4d1d363ea4c70784959f9a4d7ee0e14d40ab895acffd1d9ee82192723d1aba091c0967cb153efe696835c1c3bf638b2416cb1fd80d839f3 SHA512 5948d7f4be6801e6f4258d79bfce0a59fd87de8a0635a95fb27d717dd8dfcabf99ccf89c90d37c43dfcb7f8a3175b73aeb5dfbbbec9d0b143e28bebdc24675ec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.0.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.1.ebuild
index 9aba85ad01ae..9aba85ad01ae 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.0.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.1.ebuild
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index c6b4e295d822..aa62c90eca7f 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-desktop-applets-17.12.3.tar.xz 43220 BLAKE2B c1d783c2c10481e4eda0e18cabe6598d8ee5fb0342f3d3b23f75916c66b2bebe6e43ac330fb224b1380d8fdfa746ed458e447b1525b3b23ad15a6ed2d4f8d1d5 SHA512 e6f1edace6b543c56b85b79f421c0023d28495c5dbf6d821f729970161a8d097faa03433051f385117d4b0968c4d877ecc5b0134b94feddb73a577763de63a3a
-DIST ktp-desktop-applets-18.04.0.tar.xz 43144 BLAKE2B ca239601aa7308aefdf5be3b3c1c79fd0f2ca047c4c5b32ecfe1fbb0258d89c9c662db03ae96d31abe1f93a7fb98280bf3d4cd9ded53cad8d68ada956f3a2e8b SHA512 525a964bc0f50d5cc85d471210957f7585a7a62bb3b1cd04935ac9e4be1249a9b4c9d1230a490638e244d22ba3f154c1662c9c9b4f047cc82b600707ce981d08
+DIST ktp-desktop-applets-18.04.1.tar.xz 43104 BLAKE2B 1933c210de28a8456bf1ab86abf2ecc015f2408c16964cac81241cba5d77def233e9ede4444d874b21bf5d7e81fedbd25274a6298cb43010a24aba57446529c4 SHA512 88d850f5733c665fe77ba5e7079a155554c04164e4637ed838e945ddc8853f30d9a1f60328e5d7f648a288b02d9edc3fd80f950af4d41062b05c674260e9aa35
 EBUILD ktp-desktop-applets-17.12.3.ebuild 572 BLAKE2B e2dd4ee48db45d71f005e75677cde0fb38304368dddfb448870ee5aeca7a68ef017d45fe215a8f6a264390a48747d2c62b93f45527b1e976b2ad0461343c7f68 SHA512 2da8ae5261b2abec7f5286e308e31a048a2d794b6fd40071bc192401dc320ed1d87e78ba865cb7496b8c614063e8f557c7c097abf416a6ca4bfab962636d2eb5
-EBUILD ktp-desktop-applets-18.04.0.ebuild 574 BLAKE2B 1851b413a5b983170f7e860ab060b37e568045536683a592e487b5809d114b88d21034823ea822ca28d23756c6a1b7d84c7aea11e3169b8fe39186511c453b14 SHA512 9be0e929b6e3875531784f3c6e6d396ad5f1d529570f988d11e1e225329765b20ced20117b8e0bcb44dc16347b27843e665010a76d45e23a8c98b26de2639e53
+EBUILD ktp-desktop-applets-18.04.1.ebuild 574 BLAKE2B 1851b413a5b983170f7e860ab060b37e568045536683a592e487b5809d114b88d21034823ea822ca28d23756c6a1b7d84c7aea11e3169b8fe39186511c453b14 SHA512 9be0e929b6e3875531784f3c6e6d396ad5f1d529570f988d11e1e225329765b20ced20117b8e0bcb44dc16347b27843e665010a76d45e23a8c98b26de2639e53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.0.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.1.ebuild
index 71c40a130e42..71c40a130e42 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.0.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.1.ebuild
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index a658ff802f18..f21ce40eae5e 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-filetransfer-handler-17.12.3.tar.xz 45968 BLAKE2B d982a94ec787124d5d6df5284a1effdeb58c4f1dd15e7a9bfd6e017f8acc172becbfe83162b9769ee12a3617d1dc7348efde4e563f95e771976cbb58d3d1cfc8 SHA512 145b3616523c224b479107b94de6b267151a9e6b12a412a86abf8da7a1f0b18fdb88783167149e84641532fe4ebf5105d64976155561f3ce7d23139ef58825c3
-DIST ktp-filetransfer-handler-18.04.0.tar.xz 45984 BLAKE2B 2ef641b80397168d11ba1814111358f2312f500c4c2124344d807fbcef8525b3d0b4c0476f95f8c19041271d20c64b86492c0cc523de3094b015503e0d663e78 SHA512 c34e44fc8ec27b06f6eea0c80f4132a04f008b0f8ae3580971a73d184061251cac57ed56ac7989e4ce5bebeda09d46ae14e462d7493b26d38b3593c880c9fce1
+DIST ktp-filetransfer-handler-18.04.1.tar.xz 46016 BLAKE2B b38e52599f1f30cf5808bc26bf14ee12cdb59628f617b81c6cc6fcd4b3be0a32422965d0e307439330a8c24a40f71e1cd0face09b8cfd968b94a81b95c7c3519 SHA512 f34f2dad171162d430a38287532eb09841e90bda073406782db99f792b6ef8358eeefbc011dc726ad4e0d94f07c9a929b9188771687752b2ff4b62f916a6e84b
 EBUILD ktp-filetransfer-handler-17.12.3.ebuild 618 BLAKE2B cf226ea7a2f1f229bc6d48fb99dfb341fc1fc8f3f5fd8fbaac9c21ecf0ce7a39fc1abe20a65e799517036ce2bf158daecd52428b6905d31583ab422cbf46e89a SHA512 f441d634b4b082e5456777422ad0c423d5f5931dd2b7f3af04fccd1fc766989244e4427241bdd1e76841def3a1f32437a6833897d8dfa20de1aaf4343b3266c1
-EBUILD ktp-filetransfer-handler-18.04.0.ebuild 620 BLAKE2B 593dcc7dd236df4297f96770b92fc759329eab0c7e6489961c47e2fe9748eed796380e92a3f47063c0d67b05fc36d042b818938508c8fcb617b23ebeec55b040 SHA512 ff66dba93e4ef81b2d53e34865dba2ecf9f517a814134bc67cdd350e68adface3a82815eeefb5edf2c086da89b71dd87c25969b2c8757e8b3b68f559fe7c366b
+EBUILD ktp-filetransfer-handler-18.04.1.ebuild 620 BLAKE2B 593dcc7dd236df4297f96770b92fc759329eab0c7e6489961c47e2fe9748eed796380e92a3f47063c0d67b05fc36d042b818938508c8fcb617b23ebeec55b040 SHA512 ff66dba93e4ef81b2d53e34865dba2ecf9f517a814134bc67cdd350e68adface3a82815eeefb5edf2c086da89b71dd87c25969b2c8757e8b3b68f559fe7c366b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.0.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.1.ebuild
index a8e607bd7257..a8e607bd7257 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.0.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.1.ebuild
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index b56dd83e8a9e..a7a067592d95 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-kded-module-17.12.3.tar.xz 81256 BLAKE2B 690a858e80614ecb1f3fa465361010d846acb73c4a92d9355735cc6cde97648894182a11065aae28954f093a09e4e950ff5e104f0b6675caadae79126ddcf913 SHA512 0d804705662ed87fe56217e603ade5b0ad28b3dc852a7f6fb005c42b033464ae92f866ef00e52e80cdb67c2e107d94f104f3e0b7ce7bb7660cc4555f4e414d57
-DIST ktp-kded-module-18.04.0.tar.xz 91460 BLAKE2B 4cc22f801feb81d4427b5a775cf5ad50c1f832067fd7d3947884842eefe79bb68f04572f201e171ae2811becf85314d4ec276317ea6d1c3a2b7b5fbd6a61f9ae SHA512 6b7b8c67383e5ed60356da28eabd030b5c004cbb99b1879cd3395dcf10d6628b5a65e9263a6ca61d56277f76a513df25ab83752274be74aa277168ab408ce045
+DIST ktp-kded-module-18.04.1.tar.xz 93268 BLAKE2B a2fbad722bdddf1dcb8a2e7720db869d6c60415d79ef9bcac243acc0352c50dffd605d1e467e5ea32a291389499f33b1bebdc02ee5ab04ecb0882cef6725ea36 SHA512 eeb6b3a7c00cd9ee302d60a4f4d77dba0ae24967e6c1a82e268285ff8d6dbfa53f904a4ebac80e7ea5b223d96314ab1b6eb65a8f7e92ba5f681026b4428d18ed
 EBUILD ktp-kded-module-17.12.3.ebuild 977 BLAKE2B ff58345e59fac7e503b76fc1a3a290c1447d4c3791a9227296749d90b0e0d23c6ba689e32ff2623298df2f0ea3eae7d83562c6ffdb693b8e19ce94465f660807 SHA512 1a911854ecc01b8955542d1a0c0e416a23cb7455b06d0840371d79a27f3fa29418f82f52b86656a037832b2b09b05797eb8c40a23c5b5e4c7bcde0c2e35e519f
-EBUILD ktp-kded-module-18.04.0.ebuild 979 BLAKE2B 62dac52cf5e965eabb275e915d898a86347509755c7414de327027b249ce23324ce34b5f9c48eb50c23d11b702241c53a8d955f3efa440b2985e5175f8a7eb4d SHA512 23bdc7544d762b335a2f0b41538bd81517338570905d1019a4f2f7d9790f73f44a6b763a8847e592e2cdde9188d0f97839dd683c6df0bc2a7370e8680edeff3d
+EBUILD ktp-kded-module-18.04.1.ebuild 979 BLAKE2B 62dac52cf5e965eabb275e915d898a86347509755c7414de327027b249ce23324ce34b5f9c48eb50c23d11b702241c53a8d955f3efa440b2985e5175f8a7eb4d SHA512 23bdc7544d762b335a2f0b41538bd81517338570905d1019a4f2f7d9790f73f44a6b763a8847e592e2cdde9188d0f97839dd683c6df0bc2a7370e8680edeff3d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-18.04.0.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-18.04.1.ebuild
index 6d59197ba41d..6d59197ba41d 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-18.04.0.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-18.04.1.ebuild
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index 91e34857e65c..3ed2755509f6 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-send-file-17.12.3.tar.xz 28820 BLAKE2B 267abc501fa4d2890e5c530ed7df132cad2a56800d3008f72dd3599779e1ba34c14f82635991bd43035af25087ec2c36dd14c79384819a01c2f9e4d3a7050f95 SHA512 887a7d4008f77fbc48355c32e4716f164df77c901ba4bf7eb0b0305e83b03e3e8fd38e7b5381532e3037f42b60055e65c4b49e1510799000c3951c67ee2a0ef5
-DIST ktp-send-file-18.04.0.tar.xz 28696 BLAKE2B 3998d44e189aca636df777d4a081ea7600fb1e8fdefadb1dd348da2c9d2150caff2375b0eda812964ddccca46fc776f509ba0596c4acbacbbfce7d20c6c2e784 SHA512 6d2fc71fb2c2803bc7df102c2b0aa1d4e27ec0c7d2a94e5ac0cef363be3a8b1f7ca463affde064d16efaa32cf622583a3828fd026e561314378a54916407fb53
+DIST ktp-send-file-18.04.1.tar.xz 28776 BLAKE2B 778b68c20012e90460befd1b82577eb51861c256b1a54373dc94179d83348787397bbdfeb99897dbe52056cfbd775583ab7925e82b9c19eab56c2891bf600619 SHA512 19e1f90320eea7087ba1ba83f47b747110487b27e2aa6041b47d85abe07ff2681aa65924eaaf47e604fcf81ce92587703a1df34fce0db6e81fadb5c20e1e4a2d
 EBUILD ktp-send-file-17.12.3.ebuild 825 BLAKE2B a70d898988364281be37568053a6177286bb6156b18031a317e0d17514a40f527e3dd3f104ec3fcfea6a3057f300f9942b8ce8e2619cd05d250dcabb103294ca SHA512 93249abba02c9fe9d9b9e9d990b4497d4cea760dc8c41f0eda35ee701c5a64818bfa5ce67f5e0d2ce082309f26cc53556cc79508c84ca9ea6313a8d0700172df
-EBUILD ktp-send-file-18.04.0.ebuild 827 BLAKE2B 7d38262647862837204cdd934c6d57f4982cdb6150814a81d839b8efa2172e680e5c609658a2ad8517c8e21368fc68df5104e51763ec6ba8014d48e103c2e28a SHA512 091f5ff352e87aad765423053b464eacac61cbefde4cbc3b095673a4657292516673fd4bd52634f594ccc25593bf8409b5e1571cf5701265e639c6c34abe2d12
+EBUILD ktp-send-file-18.04.1.ebuild 827 BLAKE2B 7d38262647862837204cdd934c6d57f4982cdb6150814a81d839b8efa2172e680e5c609658a2ad8517c8e21368fc68df5104e51763ec6ba8014d48e103c2e28a SHA512 091f5ff352e87aad765423053b464eacac61cbefde4cbc3b095673a4657292516673fd4bd52634f594ccc25593bf8409b5e1571cf5701265e639c6c34abe2d12
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-18.04.0.ebuild b/kde-apps/ktp-send-file/ktp-send-file-18.04.1.ebuild
index d297bb178cd7..d297bb178cd7 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-18.04.0.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-18.04.1.ebuild
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index 9c0d20ab2eb0..e80dcd648ee9 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-text-ui-17.12.3.tar.xz 468592 BLAKE2B d4a4aadce200e67f40ec16382902f386ff06bc14bcbc0b91fd7ad0193eaf31e9bf7b1e8fefdf80dbf1cbd6e3e100a61fefcfcf1a67d4dd578f2191760877519b SHA512 2ae0dbfac8f23e478cf208be610cb2d5b73648b1bda43af75f4fa33dcbdb00a5342a19c4b2b6cd8c5a59a07ec6ca3a8d3d8d95cbc42d24c4b74ff40ee22b427f
-DIST ktp-text-ui-18.04.0.tar.xz 469208 BLAKE2B 83c1974017bf493c8eb5766a10a3157bbe83895e3a31744d740d4d40ad5b9abb14c5d3eeac363a880e249530b6f9ac94d4bbcc014bf65a85eb09cebe82d8d59d SHA512 163acff7ce2b766093b2eedd92ec2c3cffa246d78fe76763ddded5e036127375c7563e9ebe9462cc6d7bec1e9955874436ebc16173cbde76b779a903688dd6d6
+DIST ktp-text-ui-18.04.1.tar.xz 469716 BLAKE2B 9c29b03ea734f7f7bcb616f57fca6385d7860ec7780e9a5a7d7e940720056a5861eeff0562f8940af22229f6671017a82b3e16af7d5c37d8e4becd4f011ab8fc SHA512 4e35f6383e990e4941c1bade47f4e0044b740e7f35fa226bd96ea77395836bd883710d751b2901cdd11e8b453be42812827c5a299d37efcba4c6fee31b50413a
 EBUILD ktp-text-ui-17.12.3.ebuild 1487 BLAKE2B cde9527f6ec6e11917ac0e4c0f747658f3f680b313cc969ab4e839682849cd0d93f4419e96067838901bf127b8c114ae2956bf344c872c5e8796d3fdd5b8b4d8 SHA512 562849c9bac6ed0c34bbace3ddeccaa36cfed9c48ec957640d2fdeba30e6ee64ee46a67c9e689ab9100a20dd7a1e00a60ca88c73b3d37550ac1901e19dd32884
-EBUILD ktp-text-ui-18.04.0.ebuild 1489 BLAKE2B c36a18cf0d96100167035bb215b826ec98eb208654a2946cf170123cfd1cbb6c59cea679c5ba1288120d2608308b9809208d4a6d3484dc1c23840d93fa7049ef SHA512 0a64956660b2fe4212400ddf29bd69dda53cc7ad1c708181319d68b283fef21acbd1cf3801b0832ac6eb0e610835afd69651a8aace292c166ea17c6e0f8a5cae
+EBUILD ktp-text-ui-18.04.1.ebuild 1489 BLAKE2B c36a18cf0d96100167035bb215b826ec98eb208654a2946cf170123cfd1cbb6c59cea679c5ba1288120d2608308b9809208d4a6d3484dc1c23840d93fa7049ef SHA512 0a64956660b2fe4212400ddf29bd69dda53cc7ad1c708181319d68b283fef21acbd1cf3801b0832ac6eb0e610835afd69651a8aace292c166ea17c6e0f8a5cae
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-18.04.0.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-18.04.1.ebuild
index d8d737632890..d8d737632890 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-18.04.0.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-18.04.1.ebuild
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 63eb06cc8ef9..4f05278450cf 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,5 @@
 DIST ktuberling-17.12.3.tar.xz 32802036 BLAKE2B b80c4fcf37315889270de1e9cbef3ce70817b6823a5f20305d05e4213be0714d3a6fb575c388d77fc264b32acf9458e1317bd29ca4021cdb9524b13bde0a76da SHA512 f92d1f97c725bbe45e2590b3873978a321fc5fc78930e21f98274ec34eb665d71542a3451e7970c964e5f3cd7a615f472f6e4f5656562f6c349d45807ed2bda1
-DIST ktuberling-18.04.0.tar.xz 32802132 BLAKE2B 1e817009d00d6d650b3b84b160e6ca2969e2f9ac3f29184a74441aca790744c2650b267010fce4d51c6051c3c3487cbd8cbfdf4ed3bf9b905f8a133bbe6d51e2 SHA512 fc3b6e9e45d92a364b15b484e9a67b5ad880acd202cf005e64db64d2f7f0a5da1abd7a99650b7a6f74015aeea5db46bb657967b13fb6d0da51d81dbc5a8c1709
+DIST ktuberling-18.04.1.tar.xz 32796220 BLAKE2B 33d1d330d35695468fab0826f03321021160876dd9c17354a802e539a729add8808b4d0366de6bc8117e392a0f94a10965fb17ed56e9c8a095021b0262f9a54c SHA512 eab5ba3c31a38be8d6f0db325856510752508dad843db5cb749e6a542437a7fbba45d2bb76d0dc78d6f53ed3146c687add677413c09aa67260d26709aa79016f
 EBUILD ktuberling-17.12.3.ebuild 975 BLAKE2B ec8f1d47106ecaee3fb5fb1d87a30a65e0015031bd4c0721b7038e9a7546b230e3e68374f856bc6d9e19820290c66cfdc401a4e3187952ab92e05664a9453f49 SHA512 4a8c6fd5a2492d094eaf7dbd351630b8224ba8529d16a026e9f99883f3f0aa4492372c2f14e2d8cf12cf47fefa4a36075c74b49c4ecb5de51e437a490a68dba4
-EBUILD ktuberling-18.04.0.ebuild 977 BLAKE2B 299bffd77102e299e2416972dddd86fd96e627e656162b2621c2505acd3993562868046c11f958cb858baef5f4e833bca0ed2b408042b17eac8c17b3f66ff7ab SHA512 10095f2c1f4d4e021815fd8d72d2dc2c5be57adfa67be12b3153225db93303a0d38263650880a982f436e1a13999b166e5eff28a149c79c830f96c98ec1084b3
+EBUILD ktuberling-18.04.1.ebuild 977 BLAKE2B 299bffd77102e299e2416972dddd86fd96e627e656162b2621c2505acd3993562868046c11f958cb858baef5f4e833bca0ed2b408042b17eac8c17b3f66ff7ab SHA512 10095f2c1f4d4e021815fd8d72d2dc2c5be57adfa67be12b3153225db93303a0d38263650880a982f436e1a13999b166e5eff28a149c79c830f96c98ec1084b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-18.04.0.ebuild b/kde-apps/ktuberling/ktuberling-18.04.1.ebuild
index 6f603a18c561..6f603a18c561 100644
--- a/kde-apps/ktuberling/ktuberling-18.04.0.ebuild
+++ b/kde-apps/ktuberling/ktuberling-18.04.1.ebuild
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index 60af4f3d6414..2d8836e89032 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
 DIST kturtle-17.12.3.tar.xz 1608852 BLAKE2B 1f8fa96742f08bb3e9ff4be1c6b2f1cc9bae22acf9e54f69a19a74f621fae9cf55bad26f4baee1313e03ea3a575b21f5d45d66541f712c128b823718fcc7936f SHA512 5510621296a824cdedd2454cbda21e5eb906bb72a79addae5ccb19d011af813c29c7702166bd2e4b728a3cd1d62589842b44983af01af10d3f6a13536afcff2e
-DIST kturtle-18.04.0.tar.xz 1608744 BLAKE2B 19213ebc91f536fc26ca51ed8dda393bc39d8d81fbd0fe3e935f2eb102a94e69ba8a82b40a6de388804a6d311092c4d0c4eed81d8a16d4a79fa865551fa29e16 SHA512 97e20b5357826b658d608594ee8e3eed111c8f6b51096ad4f0ff69053e2c4cfd829347fc6abcf11d4a6a5e6bd4d481c7e421a50dd6275d068140e06e06120253
+DIST kturtle-18.04.1.tar.xz 1608868 BLAKE2B fa92f08d97eb112fb6304f67ae509c84271263049209a14cd57e127924118a55f320b3320c34f095094263231d12727181b1921d797ebad40a90f364e5ec2126 SHA512 4e5fb4f1994bf2eee633ecaefd888d745d589de16531a10ddc8a821212ce79d918a0b2b61e3af43d85bb33d9c2865d82f4d8bb6b7b5364de1cb1798b96c669f6
 EBUILD kturtle-17.12.3.ebuild 843 BLAKE2B 0efee60c3bf185f01be78b64a97e73d630ac9d194c4211b9baba35551de7994e120832f6b4615490c678029b5be3a715378c76d2de1b913ea8c82279a1c496bf SHA512 e61ee8e395c453417cfbfb1cc7f6f1b6fea53b02f3ae2046700f42e3e5129e9cf081cba65526f358c7a43a3133bd3997362a2be5911ffadf1256d59958f0b684
-EBUILD kturtle-18.04.0.ebuild 845 BLAKE2B 0e90bf87697adf33bbaa56b35c9b17d9a6ba93c1cb97426bafd41726539ff3e8770f9864978683c720d59e642b5d3ef47f302d697ae57184fb8b1859018f8db6 SHA512 a4c17a088109a03edaf0f9e951a1dde4025ce91a5bb483c62247787652dc244efbb8d0042ecc7781324240a1808ab5ce540cd7ca8cfdbf1c136b37599ce8a3ca
+EBUILD kturtle-18.04.1.ebuild 845 BLAKE2B 0e90bf87697adf33bbaa56b35c9b17d9a6ba93c1cb97426bafd41726539ff3e8770f9864978683c720d59e642b5d3ef47f302d697ae57184fb8b1859018f8db6 SHA512 a4c17a088109a03edaf0f9e951a1dde4025ce91a5bb483c62247787652dc244efbb8d0042ecc7781324240a1808ab5ce540cd7ca8cfdbf1c136b37599ce8a3ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-18.04.0.ebuild b/kde-apps/kturtle/kturtle-18.04.1.ebuild
index f1c34975ae1b..f1c34975ae1b 100644
--- a/kde-apps/kturtle/kturtle-18.04.0.ebuild
+++ b/kde-apps/kturtle/kturtle-18.04.1.ebuild
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index 8dc345dc428a..fcc1954f67ed 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
 DIST kubrick-17.12.3.tar.xz 307056 BLAKE2B 737e97392692bc9aa7e1ba67d1cc04e370824932248586ab1a6a04afe4f4a3f4feea6e8dc86a4f39e56714bb01781c637d466d6eea6c950d22146d61b7fedc1d SHA512 4aaa118514674458513ffc8b4ce0d5cad479d33103302979e2a9ee6f9ed7955147dd42d8f31ba73a6ad39e1050ffbd48f85d8eab6954bad834fbf1e6b92f39d6
-DIST kubrick-18.04.0.tar.xz 306988 BLAKE2B fef75ba6eb3302e8de858504ed9c2bda8d1181d353ed6a00cbc3f831a17a2a4e7b90eea8b6568855b89653004ba6e4cc721e4ced5087037ecb3bc11c244fbf23 SHA512 238b2856cc532b5b4872e5d859f4b377c9e819f60ae6577839d080159b00d6dd9c837ce1608522c8b73ee1f8e64af47435c75a00319747f2219ace6584c5b925
+DIST kubrick-18.04.1.tar.xz 308268 BLAKE2B 26430abb4f6c59db6b5f8666e589d7e33672e31821f0124bcc01ab75d2da51f00ac06f138f638615c16c6904710568c8216bdcf612e2497551d905dfa0615e6c SHA512 479d545c1dea21e3025de75c13c0c00e24ad7176ae4775d49b34ae7121e5856c550dde7672bcf97ac2cc5f03725225fd6a392a9d609a0eb3fc09d0e0c1f9a839
 EBUILD kubrick-17.12.3.ebuild 749 BLAKE2B da0554f2e3eab3029a90b6d791de0f008d9f16f2d241da6943c3cb526ac3bc620e0ecfb9b96e760d35805ff3e09c121fe0bd71fbb291bb1b79a326da4a5f95a8 SHA512 d0a1c727665ec7b34e12d3970f109d31187a0e54ace76dd7214cc9f1172b9581a61af9791a4f12830c6a5b9714e40aa65611da6032d826771dc18253b5e2b89b
-EBUILD kubrick-18.04.0.ebuild 751 BLAKE2B 6cacf182b70e54fe782431103279e8651a04bd005afa323c309f622b9b74eb16c68b37cd11e5981e5370812c05ac24081521ff91c9843be6efd78b809845765c SHA512 01bbcc27c295fc836dad806987e8a3b3e786762fc7f4be0dd33aeab430a58f644e96adf3973cd444df9cab24a70962e38776afd3dd8818b45bee21ec480bc1bd
+EBUILD kubrick-18.04.1.ebuild 751 BLAKE2B 6cacf182b70e54fe782431103279e8651a04bd005afa323c309f622b9b74eb16c68b37cd11e5981e5370812c05ac24081521ff91c9843be6efd78b809845765c SHA512 01bbcc27c295fc836dad806987e8a3b3e786762fc7f4be0dd33aeab430a58f644e96adf3973cd444df9cab24a70962e38776afd3dd8818b45bee21ec480bc1bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-18.04.0.ebuild b/kde-apps/kubrick/kubrick-18.04.1.ebuild
index 49fdf450e365..49fdf450e365 100644
--- a/kde-apps/kubrick/kubrick-18.04.0.ebuild
+++ b/kde-apps/kubrick/kubrick-18.04.1.ebuild
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index 4cd9e3582d13..81950c573665 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
 DIST kwalletmanager-17.12.3.tar.xz 778500 BLAKE2B 106e4cae3ec45f1782f838dc7fdf6722ebf766120ca922c6ff49a469afe09c48ff2dd81607094864a56f69355408b292e5dfa68138375bf1b2e48415f9227766 SHA512 b06bd097c580dc70d51388a12f30bd0ff0460d6dec5789333e460037ee3d132886e004c1fb1cdb13add6e588bce554d72b5cfb33bffa205b0edfebcf074610ac
-DIST kwalletmanager-18.04.0.tar.xz 779064 BLAKE2B f5b64935944ab5aa814eedd93a5d995b5475bf92a3fac0d0731782b8d1a5b1582841676a7aba61dfb3b10f70aeb3f4c20be9854802accdcea57491df8bd2ae22 SHA512 dbc3fe9d8a238817b1a67f6c564569d08124baa2639b366cc0128de54884df2acf5f5ce32a3ba024fe14db236b7a357b3db7b38cd40ea26c75ac4e4cfb1c944f
+DIST kwalletmanager-18.04.1.tar.xz 779080 BLAKE2B 1243f09df3dd4b489867bd44554e1e4875b9778bb26b2b532ff7ccc1227afd6bafdec28a00a95d2580fcb3b2e883f9ef51f622445910f294bdd99ccde119c761 SHA512 6ce72cb891aaccbd1ec01225409455a70571083d0809a2d2eb91a1da7f3f0cfce66af2a51e3c14c0eda0c8089ee353ebd865f2d475f422b6d3f95fee82f1c747
 EBUILD kwalletmanager-17.12.3.ebuild 1246 BLAKE2B aac270c42cbeb8fb891dd9d65a8de55d51993e296ad3e56ae59015746f6d19bf3b6fe70e857ca2a575c94b21ae69dba5c1d2b6151457a8027faacfc177e54450 SHA512 18f35758834e8b4d9dc2f32d87d998ce4b36f278c6f24a76dfb9c38501382bd986abbf0181ad68c632b303855c9d882d6b8a09a89535965e9dc7e2779673766c
-EBUILD kwalletmanager-18.04.0.ebuild 1248 BLAKE2B 1c1648ca2ce4e47e83986f21e29f868372e726638d87570e41a71128b1c2bdf8c0928a63e8a29a123004c86a146d5b2732b5201649e69b77b22468e0d46fe9c8 SHA512 03769d48ada6730a20e40906a42aaa80b1fc3bd773003636b27728e70f2e9ac4a77a83ef3f0263ad38a6adfabfd99542f46d14f171f3210e16baca82a6a25054
+EBUILD kwalletmanager-18.04.1.ebuild 1248 BLAKE2B 1c1648ca2ce4e47e83986f21e29f868372e726638d87570e41a71128b1c2bdf8c0928a63e8a29a123004c86a146d5b2732b5201649e69b77b22468e0d46fe9c8 SHA512 03769d48ada6730a20e40906a42aaa80b1fc3bd773003636b27728e70f2e9ac4a77a83ef3f0263ad38a6adfabfd99542f46d14f171f3210e16baca82a6a25054
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-18.04.0.ebuild b/kde-apps/kwalletmanager/kwalletmanager-18.04.1.ebuild
index c557ba43034d..c557ba43034d 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-18.04.0.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-18.04.1.ebuild
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index b3fa299ca619..170417a71ee4 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
 DIST kwave-17.12.3.tar.xz 4757724 BLAKE2B 1479b75aada209ec45fc69a735f789512f8c81177a469e7f87f55e8063f8bf2421b7c901aae0886f6aff238ff6ed9acec2b872fa61d596d30251745ca5553619 SHA512 008df107d05c5e9d07a9b8f64ad261a03bfdca64c8ffc098be6838a4672bce2d0c00f9fe4afe07cd7418390e0973720c0bcc1703ac4ab8fb5e0bbd5fee9fb503
-DIST kwave-18.04.0.tar.xz 4758208 BLAKE2B a40f78a9d1e1fbee03bf79cf3e0c3fbcf65a1830c93714a851d2113ff594b6ccd4057c8f3ef357c4fa7ae84350b47bd0446442cd2c4933a6e4ff7ee7578feffd SHA512 93620c058e7bb148097d4d834cd2034bb3f2586a10063038077f0fda22f5caff788c6fca8c2ff7b922fac19c43852942535c3d29cb73f91a5593cd94300de56d
+DIST kwave-18.04.1.tar.xz 4761628 BLAKE2B 3f209119be07cb338c1b3eaef1e26dc93ac0af374099fbf8b42b97bd6db5231b09c793a0b197af73783907b830f8f4501e95ccfbf964ff69a58d05aab1e71d47 SHA512 91d11151ecf955d1c8d287c2f7d5f212302aec7b8b351a5318ba6e43638b1a6c53aa089dc544c05a401c6cf8ae99bfaaebb8467f44eb1e4e694caa5d924b906c
 EBUILD kwave-17.12.3.ebuild 1987 BLAKE2B 9b5d443154717b131c0f807a64f76e16dfc38b993c268003f778ae80d285a4fb63b124b54b0762b81dfa84c8dd69e722df52aebbd218c2f4761363f2890ef612 SHA512 c80dcbd90fa9b0aba14d7d007c940646c477a8be7d3d7f97449bd267628676da6f72d44c0af285220b5d3d64ee6fd958a6239f52e6600e345cee4ef77ad2d7d7
-EBUILD kwave-18.04.0.ebuild 1989 BLAKE2B e8c7647550262f52d7f74f0aeedc8aceef0179c084b845195f7f41eb32b38bba4d67f7fa9ec5ce65d308601ec5cf5ab5c95eb3d9af9d8124395626cd455da6d7 SHA512 728ec4b1fc1ce79f7856f8a28c1566512a132d657c6997b6cbda6f9adb1f8bea02161330e9ca56450806705841e71c3b1c87402467cd74a0b2b3795ff259a08f
+EBUILD kwave-18.04.1.ebuild 1989 BLAKE2B e8c7647550262f52d7f74f0aeedc8aceef0179c084b845195f7f41eb32b38bba4d67f7fa9ec5ce65d308601ec5cf5ab5c95eb3d9af9d8124395626cd455da6d7 SHA512 728ec4b1fc1ce79f7856f8a28c1566512a132d657c6997b6cbda6f9adb1f8bea02161330e9ca56450806705841e71c3b1c87402467cd74a0b2b3795ff259a08f
 MISC metadata.xml 749 BLAKE2B 860265ca3ab192b9f0eb386b4f8c32d400ffe0d79d9ae52fd1b03e10b6c1955406219641cab9c38cfa3c45de2a7bc2d37525ddb264599922e3359d764add4318 SHA512 ea33dd37159d916ce727354e5183f77e4435553fad594e6f0494419e41137bc29d9f1d7b1035ab88ac982ca4c56a68065783a9336f29a511f681074bf2d772a5
diff --git a/kde-apps/kwave/kwave-18.04.0.ebuild b/kde-apps/kwave/kwave-18.04.1.ebuild
index 5327a15228ed..5327a15228ed 100644
--- a/kde-apps/kwave/kwave-18.04.0.ebuild
+++ b/kde-apps/kwave/kwave-18.04.1.ebuild
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index 1cc27006c983..2a59e767b655 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
 DIST kwordquiz-17.12.3.tar.xz 4168956 BLAKE2B ae201895e4b04e692af562a4adff052f2d6c6897cd7e441f17a1c4613d0a5094fd34d2ab842f4d0661fca35b1a5512b1906ef54179ce22e135d4a0a196c281d9 SHA512 b07d8673c14752ebf38e4ff18771189a701f52435b4c565e4355f48246eb81660f2d0d6d5beb22ca19774e1ec6c0495cf203dcb0e5634609f7f021751e64f561
-DIST kwordquiz-18.04.0.tar.xz 4169008 BLAKE2B bc875df793da6692c8526e46a97fb93c33b5fbb2d3d7c374ea7f4f517abf5fa75d440ff08f434dcd06ebce3d050867915378c9850d67b80c6656e5c1c657e852 SHA512 0962570379eb45fa2d0aedb100fd0c9abb3c58128b1628519fe139c3e57fa68fa9584de314a16575f09d4f65a9457b88ef308b266dc806be5e5baff8a87a9d36
+DIST kwordquiz-18.04.1.tar.xz 4168780 BLAKE2B ef2e1fad5e43a8a5546b64a1399fdc131099da0ea30b86316036e8fcc9e5acfc1df463910ad996bdcc7506b4f79d989cd20874f09f0b6e8d5b804519549476fd SHA512 40adab7058d085c739f46f093814961a64fdb802479680c56641194ca9d04a37e6940a8228d20e33dac8dcf426babdb788bdb1b8399e6ec3611f93492d0f4994
 EBUILD kwordquiz-17.12.3.ebuild 1062 BLAKE2B af1b796b5bdf1ee2b0768e8fc2dc796923f3c7aaeb103237dd2b960b4d122bfa4f6b89fa2a8ea8d56ccbed138b54703119e21131ce289291a120e1e90a4165be SHA512 29d5c304d3074e6f46fb31b8bdfe161d6ffba70793c133f2658d11e3a2af0e41d2fa121b6f9b1cec1769cf375b7a71785c89ea9509d982b364bee0bccc5d92f1
-EBUILD kwordquiz-18.04.0.ebuild 1064 BLAKE2B f56195944503c694f323cf7071299a9cdd136d6888386f8e8d34d6a1650cc247051f7a4ac71dc1d7b6ea79ae1c4afc106ec8da6ae254b0b338a9fc057deb3353 SHA512 b6ad92dbca261e758eabce63c10f59e5666a5ae1405780d71c00e8055c8d0cf1de120ad10c5cc8216d5570489a7b2cded008950dca8da66bda87fa8257b5bf48
+EBUILD kwordquiz-18.04.1.ebuild 1064 BLAKE2B f56195944503c694f323cf7071299a9cdd136d6888386f8e8d34d6a1650cc247051f7a4ac71dc1d7b6ea79ae1c4afc106ec8da6ae254b0b338a9fc057deb3353 SHA512 b6ad92dbca261e758eabce63c10f59e5666a5ae1405780d71c00e8055c8d0cf1de120ad10c5cc8216d5570489a7b2cded008950dca8da66bda87fa8257b5bf48
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-18.04.0.ebuild b/kde-apps/kwordquiz/kwordquiz-18.04.1.ebuild
index 666208ff0dae..666208ff0dae 100644
--- a/kde-apps/kwordquiz/kwordquiz-18.04.0.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-18.04.1.ebuild
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index b5f4af6a1b09..8a3014e71427 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,5 +1,5 @@
 DIST kate-17.12.3.tar.xz 5629840 BLAKE2B 384b15a1273ec02d0d3342e761f5c1135f000d1b8485445d07ff5384ea49f60c6d4a6aaadd8371d931cbfcab190e4e5ff820021708dbc44899a01340b980e3bd SHA512 3435afb4dc643064c9e98c86e02521cec9d53fb7ad30320e686db6260e3468b3745643447172218b033dcd46e7c9f02efbd00af26ee820b928ac74f5cf62b0a6
-DIST kate-18.04.0.tar.xz 5643140 BLAKE2B 298e15cd6545f35f1cbbb670c33f4d6c3305a250dd004e77bc56e28adc5975d242afbd7cc0b722c09239961e97d7400dcca76c842d721cd5a7e6c9b1c8967344 SHA512 2962b64a123be966017408bf02d3a92d6814ff76c759e8ea6f98e58c2cfa92086c290aea23f800dfa05ecf092c421ad7225161f757c98d409d40adce61aebc93
+DIST kate-18.04.1.tar.xz 5639500 BLAKE2B 2c8eb6b64c5551b69a0d6386e0e92d60e6affa451729ac4e9b41a51a22293532d1846a3bc6260eeb70daa881309683d9790230d9a6aba3690f9eaf38def3758e SHA512 c892c90e2f01b1540bd8eb6bc8e23532dff680bd5d8980f69b18ece3a7cfd8fd695653cd461f9f9676d1990f8eda18a89710ae536696f17442e16bd60432542f
 EBUILD kwrite-17.12.3.ebuild 1187 BLAKE2B d4013638f4e083e2bb09d4fd13b8460576be643f743275a6db02cc662c93c498bcd99c8293ef1aab6a14fca1874f3d066c92544479a1bc0636bd942bdb8292e6 SHA512 46a6a9c2da045780652a90adfd6390c3623c1b5da38f75228bd87fe7ad4ca7a0cafda28d926a8e09f5ab49d4027a4c3cf73025a0c54e0a1e05b875458eea755e
-EBUILD kwrite-18.04.0.ebuild 1189 BLAKE2B d42d84f053107c7d7631f8008515a1022ab162b36c5e55471c9536e6c6b67399c185f6055d6de97f773ecab1481cccec261cfa38c0c2273fdca3ebc616904ce2 SHA512 8dfbabe38a589b0fa4dac0db266d1dd15a276ddf19335352013f5d7f13494cc2f50051d931821a3b180c48c697627382a2014358e9e87c261bdd62b6600c4b7a
+EBUILD kwrite-18.04.1.ebuild 1189 BLAKE2B d42d84f053107c7d7631f8008515a1022ab162b36c5e55471c9536e6c6b67399c185f6055d6de97f773ecab1481cccec261cfa38c0c2273fdca3ebc616904ce2 SHA512 8dfbabe38a589b0fa4dac0db266d1dd15a276ddf19335352013f5d7f13494cc2f50051d931821a3b180c48c697627382a2014358e9e87c261bdd62b6600c4b7a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwrite/kwrite-18.04.0.ebuild b/kde-apps/kwrite/kwrite-18.04.1.ebuild
index 40a36cff18e3..40a36cff18e3 100644
--- a/kde-apps/kwrite/kwrite-18.04.0.ebuild
+++ b/kde-apps/kwrite/kwrite-18.04.1.ebuild
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index c3eb922558dd..d9e353be886d 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,5 @@
 DIST libgravatar-17.12.3.tar.xz 30064 BLAKE2B 0bababb8f69e9d18b336e59e15718f0d59a333c3a77801e2a5a1f39d39cdce498b0ca6a76277131194e1292b2649dbd31dfd5ec035cfa4338a2dc62867629344 SHA512 66491e357c8c1c89261abe1aec07fd3e56c45368404c5e06857c9c8bdc95001176eede18446317971e42731d604467ea0b5c829f7e1fb435bd7ed11b8a15f512
-DIST libgravatar-18.04.0.tar.xz 30408 BLAKE2B 6146962a2c786fbf3a45ea7c9640f45440a0491647b65b185fa287a26ce48b8c200a254f4d831f9e7db583ce8a354ac9273740bfe2e2e54a7eda3640b924e6a3 SHA512 9c269846a49f0adb91f128668ba744d839bc70498ad422f4d5078f3c0a156757e98cab7c1494beb3ce805073c2decaed2606358848a01a338fea63713eca6ae8
+DIST libgravatar-18.04.1.tar.xz 30440 BLAKE2B 175e86999cd8c60084c11b67939f1a74e4321402a1b59b4fddc2bd864934ab07e74440c337d35c92e8fa7a3d013b9cbd77b56bd11893114f7ab44c67da56239a SHA512 4a518c4c8a1f5f73bd4e2e5314fe612a61f993ba484e1d087ad000386f9cbeca0f4099ff3ab5fbdbaf15cbdedac1728f60ae70d90a9987d6ebfb85e89ef1127f
 EBUILD libgravatar-17.12.3.ebuild 723 BLAKE2B 0f5d2a3d1a7011380d42421b390af600d9467276583fb75c8840b83d8841ce32146fe9ffa296245107ec8180b554b9006a6d254f73260134803f139b28b7873c SHA512 bc6df3e5eb4efe3fd4c312ecd077d9e40b291f0c19f280f5074fdb5b46449009cfe95592065f1e95ad2df7a7ee9f3b2a9d867ef7616ec190006fe890e94afc80
-EBUILD libgravatar-18.04.0.ebuild 725 BLAKE2B 0ce98d77067c2fa52d9b36e59961ba0520717cc9f4959b9f05e5498127c78b8984eca411819b04fe22926005d82cdebdabaa1d63ca37a5f2dcec9b0e842cb5fc SHA512 a59206bbb628d9f43f5f058e3d25c7fac8bc21e8328e8c268ac71605e7bae72fb78fb3f609e4c5f1e972d1571dcdb002119428986da5879356199340c12aec54
+EBUILD libgravatar-18.04.1.ebuild 725 BLAKE2B 0ce98d77067c2fa52d9b36e59961ba0520717cc9f4959b9f05e5498127c78b8984eca411819b04fe22926005d82cdebdabaa1d63ca37a5f2dcec9b0e842cb5fc SHA512 a59206bbb628d9f43f5f058e3d25c7fac8bc21e8328e8c268ac71605e7bae72fb78fb3f609e4c5f1e972d1571dcdb002119428986da5879356199340c12aec54
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-18.04.0.ebuild b/kde-apps/libgravatar/libgravatar-18.04.1.ebuild
index 06eba7322aa8..06eba7322aa8 100644
--- a/kde-apps/libgravatar/libgravatar-18.04.0.ebuild
+++ b/kde-apps/libgravatar/libgravatar-18.04.1.ebuild
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index b0cc77884b4f..732c8b6bcee9 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,5 @@
 DIST libkcddb-17.12.3.tar.xz 423976 BLAKE2B a5d4723e01e53c9b168bab44b54e89d16fd5d6689da6bfb677e023ccc4478e30c1e26d682712b4313991820282628a879e4a016397ca5b84f4b53a2158870f5c SHA512 f2131996ed0727a591a3e8a265c9c65f1d1700377ccaf35e9008a2c7aee1222bb3d37d47de9f740011e9fc9c7c13936f5e473f2ccc6990e683ccce5bdd0e95f9
-DIST libkcddb-18.04.0.tar.xz 423964 BLAKE2B 8d0dc043df816a9992589aa5d9272fd79ef1d15400576da774aa2625dad8a65bb5663fd9a92a5c7cb1e96b9c78b2ab0500ece5810a7e115b46ec5cb7668ecde2 SHA512 9ec0e4ad4226ba47601f49d4eb4a076c8b9b02b3acca659a5ca9598e382160cb930fd4282d82222bca20b86375336c3e0cc45c74dabae1326109265046dd0d78
+DIST libkcddb-18.04.1.tar.xz 426972 BLAKE2B fbd33690b7d7ecf3e05fa6f3be489e91a37a4da0f4d09cd5cbeb963d377c070c9d4df87c378083093e41bbba734afa08230a25f1ac82f01997c8a1962428dc2d SHA512 344e846f35cfc5d9d29301eae8b966984c163e500e591546bfb34862f3fa93782277d254a24bcba4e61fb1bf78c9a710ccdd24c5fe05373d5241055fceef0da8
 EBUILD libkcddb-17.12.3.ebuild 1069 BLAKE2B 0d275ed8bbda299bf0cd8b9178ce2062e2e8a85e1d98b0c01ef93285955c3905caaa4d30a6fce1cf0a7fb1730a68db6b4cafce6b85c53c8b7e3b6ad4c2551da6 SHA512 52eae08f381c5726122a9f41b123dccb1aa39584519962f187f1de2572ab169991e1a8eab62faf08c98a02565d0cd6152b2438d68633466f560b52cdd3a7765c
-EBUILD libkcddb-18.04.0.ebuild 1071 BLAKE2B f2837e7e3fbfd7781481841030ea90fef579df78c782b7e210d8c062c8cdf1e20868d3b948402fd242c452c26574deb7389cab51b4c44254604c32294e55adcb SHA512 9a3a30e3a3268c65916497944b788b8355d0984c6a41fbc0e3c8f82ae9e0c3d5919b205b92f67cf10a1e65ffbc94005ddc695c19b1d3cf2a03c432b1e8af7145
+EBUILD libkcddb-18.04.1.ebuild 1071 BLAKE2B f2837e7e3fbfd7781481841030ea90fef579df78c782b7e210d8c062c8cdf1e20868d3b948402fd242c452c26574deb7389cab51b4c44254604c32294e55adcb SHA512 9a3a30e3a3268c65916497944b788b8355d0984c6a41fbc0e3c8f82ae9e0c3d5919b205b92f67cf10a1e65ffbc94005ddc695c19b1d3cf2a03c432b1e8af7145
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-18.04.0.ebuild b/kde-apps/libkcddb/libkcddb-18.04.1.ebuild
index 7c3b36bcccd4..7c3b36bcccd4 100644
--- a/kde-apps/libkcddb/libkcddb-18.04.0.ebuild
+++ b/kde-apps/libkcddb/libkcddb-18.04.1.ebuild
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index e88680ba8e90..6ee95084577c 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
 DIST libkcompactdisc-17.12.3.tar.xz 88684 BLAKE2B 6fc33d00d71d03c6bdc8f35eabfcb21d69c14b81c65b88d1272da509a974958ea8c35df33b5c7834592098245dd46d3af132fc644c6203d9517657b871e54487 SHA512 260bac30666eae88575d5a584c89d78a3f39c9281260f07773cbed150eb7ef7f7b65bb41d904bf346faa311a118a6fea955a3cb127a27ee68c91b37b1d516cc2
-DIST libkcompactdisc-18.04.0.tar.xz 88604 BLAKE2B 33d176e4e28075ce70aa7389e006ce67e9321ae69ba2d2c0b16f02d677783dc2e76f991632aa6dddbe5ff7837081936bfb616295dcc2458f5cab7d69b714cc61 SHA512 d1de9c4510e274de98e67266750150b4fd051f7b361d2b8fdf4f550692cb96768ecf232d6418096ac8a1b1ede6b58a2929036539a8f12f8ed7c4ed0e2d706d38
+DIST libkcompactdisc-18.04.1.tar.xz 88420 BLAKE2B a4b37bb8da1712c90402d50ed9562e10546bcc36110f7395c840bfca3993db74d53b1413f67b398136d1dd36ef20c21a6db67e0cda375b4246a333990f7a5c14 SHA512 ab39bc514e7c2305f28fdbb12104476b15c137cea614450ad3635ad55f18b198e2c9c525c74f3e480ae9a042b06b456e718cee39ee4aef148618b0ec99c72c47
 EBUILD libkcompactdisc-17.12.3.ebuild 574 BLAKE2B ae958c84b73a13ccd9041222779ebccc2a0c3bdc95d6a2f3e9e7240e75a957e9692499202364a0c92d6da8df44c6ac3ea17cccd3de0643df32d249e6fda3642c SHA512 9167faf732377f25cc22b616da9f5fd8b41e6e9960cae6635e14bebef73084a5d74a2cd6964f3c8f48855db1451b225d2ab13e6337e82dc72afdac3e736cdbe4
-EBUILD libkcompactdisc-18.04.0.ebuild 576 BLAKE2B cc9c1fe1b60007e8f07343ff96afbedb8762e7f8ae23b9533936d585d17629b8f723d3b20df597785c911362d0b4522832f9aac3a69d56b5fbbec7d52c567d7e SHA512 73e81d8d450aed9a7631f6882e9d3895e3be03d6725edf006242b0312652777c1059cffd5d24d5c3387ac7080305ad0d1b875d7d01cdf3e40ee2da31af4a6739
+EBUILD libkcompactdisc-18.04.1.ebuild 576 BLAKE2B cc9c1fe1b60007e8f07343ff96afbedb8762e7f8ae23b9533936d585d17629b8f723d3b20df597785c911362d0b4522832f9aac3a69d56b5fbbec7d52c567d7e SHA512 73e81d8d450aed9a7631f6882e9d3895e3be03d6725edf006242b0312652777c1059cffd5d24d5c3387ac7080305ad0d1b875d7d01cdf3e40ee2da31af4a6739
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-18.04.0.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-18.04.1.ebuild
index 3c73db683d51..3c73db683d51 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-18.04.0.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-18.04.1.ebuild
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index ce947742f568..ad2d2191b8ad 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,5 @@
 DIST libkdcraw-17.12.3.tar.xz 41840 BLAKE2B ce2fca321aae3fd5121e883299b2e10aaf79befbc4bbce0488f88200cf2816a9b83cd035e2af1c382751e8eca5d369ea88a63eaf71b1e7987eccb9e69f7198ce SHA512 f8248b22636b07083af84bcf66cddbca91cfe3d3966299f1d6c18681474d01fea395c4f855a628cfe5ec857efd4e4965cdc987463b8ff661f3425e81aa2f2eb9
-DIST libkdcraw-18.04.0.tar.xz 41856 BLAKE2B bab8beb4399a57a6ac18d00c54aee4fa7f86b0e358e0f32b529083c0f0459c64deb683ac9afa3fbadd443e9c212ed272bec7a363b6a8e3cf0ccaf421e60bb341 SHA512 fe56475f8e9e544e85a31f88dc1987548aa27c5f5ed944b40503092d0914e3851e2e4a729ea06b6a651d5fbc8ce9d166afd861e87fee8b1da1bc17161bc4c013
+DIST libkdcraw-18.04.1.tar.xz 42088 BLAKE2B 386b859b7818b45de6dddbd72921847c20d68fd512f9f5245e03dd559ab6c14b9e317136882de5a758e6ba2e7ee5c2977024526d9fa2d5b850dca24d78a5b8e1 SHA512 d2cca854e3a5cfa805d6592b6796a26d84073187abff8846051fb02714b017d6d87b5a911dba2f7e30608ec92ca5d1908d5677fedf7093d1996203c1c51de0e6
 EBUILD libkdcraw-17.12.3.ebuild 336 BLAKE2B 36a6479ea2f7383d1c2d7b09c93d3fec87fc971a870d5d67045e765fd5156488dc066bd394e76acb7c58de09b0ca7844ff3bcaa1f5d6501d8d59568ced2ec2d4 SHA512 41df8a1049b57817760a4cf41808b74de3ab2c08b29d82d7304d405bbc983719cf0bd6ef1cec6fe40e99fe210b0f1d78fa71d48dfb3baa9a80628fd1703d730d
-EBUILD libkdcraw-18.04.0.ebuild 338 BLAKE2B bab16be60be734551f780f9b3b3f43cca133a109eecfc384f5b87212e8526691d5b02772690cd1fc1dc2efc9e82b2ed6ad12eaa70f2233f9d2e16dd19538fdc8 SHA512 2525ed91ff4e820d8bc3a1625421b0267d465e6250ea17b0acfed768ec0f6ea59e7184dfdbf9f559c0828d88905dfe6019f2295be9bf4cf1e19ac62c9c009c0e
+EBUILD libkdcraw-18.04.1.ebuild 338 BLAKE2B bab16be60be734551f780f9b3b3f43cca133a109eecfc384f5b87212e8526691d5b02772690cd1fc1dc2efc9e82b2ed6ad12eaa70f2233f9d2e16dd19538fdc8 SHA512 2525ed91ff4e820d8bc3a1625421b0267d465e6250ea17b0acfed768ec0f6ea59e7184dfdbf9f559c0828d88905dfe6019f2295be9bf4cf1e19ac62c9c009c0e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-18.04.0.ebuild b/kde-apps/libkdcraw/libkdcraw-18.04.1.ebuild
index 88aa2516004a..88aa2516004a 100644
--- a/kde-apps/libkdcraw/libkdcraw-18.04.0.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-18.04.1.ebuild
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index 0d6040a32ad3..a822616cd8ea 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,5 +1,5 @@
 DIST libkdegames-17.12.3.tar.xz 5941232 BLAKE2B 6cb6f92c374f09c4c8f51bc34a163584ba48f44e9efc0408fed539cb9567d98f5c10ed1208a38c3117e64993826e006739a252623237028a9f2e1943d837f5c6 SHA512 159a2d6e84600e3dd92455c143ee0f8084db35e5f13a1d05013e8afbacf2d56cc9f67f1215be38ec420cdf66cb026d9e51b0f0d0daad76e3370374cd4317cd8b
-DIST libkdegames-18.04.0.tar.xz 5946692 BLAKE2B 0b78a5ebc15f624846bba9a135dc2ac072a02fa93d58f293b299e6f917ad1647e409d0c93c8c4f7b1525854b632880d4d9fdfcaae823b1ddb2b349759a780a35 SHA512 3c1773793804f6ef3fe85e0f34b2f3d7d85f0c418c7603863e689a91ff0bdb49e2531dfc7362cb8b561fadefa50f377942cffa4b23b3bf9a8f82d27a044c0033
+DIST libkdegames-18.04.1.tar.xz 5957092 BLAKE2B 1d8e0aad5679c8363ae39886b6613017c6b821380646b6e489f630fe88e5801e4129bdb915a69508ddb3092a90a5d091c37a29b8c9c96a28ce440f050c44e6e6 SHA512 b2999a525de23312f28d146af590fad363ecf828449b892fd1a6c2d2d628d8fba9e998b7596fde8c88a090045a71c5f86f8b4c24528057ef7f5ee4350ea46a09
 EBUILD libkdegames-17.12.3.ebuild 1278 BLAKE2B cc571e37412a87bef3391d21cbbecc7a374f56202910e10d59179e7ebb68f61a91b7cee5d19487d5bd56206e8a21e8072f372244ae62f0df80c5f3352b2a8987 SHA512 e8e8cb5dac8db9f01df93954ac12013ae64cd91c30fdeb240ae164613aa7848f9419323b5385ea544616fbf3cfe49377a6454fff04a26061b1b2f2f8cfba3b7b
-EBUILD libkdegames-18.04.0.ebuild 1280 BLAKE2B 8f427db1240dc4e26ef8bd7a343d5dc7b5433a9f6217a2f62c930aa2bdb865a5030830a8b9bf6aad154d90633a8c48ef0cd666a317c978cb352d3c0a56e55604 SHA512 e4010308d83818419622692eac3fc26884f77643b8457e48ec33f085fbfb1ae48b5494e2d7cee7e37def7419412c90b7ec49f4d4370d9cda8168e56be84e2750
+EBUILD libkdegames-18.04.1.ebuild 1280 BLAKE2B 8f427db1240dc4e26ef8bd7a343d5dc7b5433a9f6217a2f62c930aa2bdb865a5030830a8b9bf6aad154d90633a8c48ef0cd666a317c978cb352d3c0a56e55604 SHA512 e4010308d83818419622692eac3fc26884f77643b8457e48ec33f085fbfb1ae48b5494e2d7cee7e37def7419412c90b7ec49f4d4370d9cda8168e56be84e2750
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-18.04.0.ebuild b/kde-apps/libkdegames/libkdegames-18.04.1.ebuild
index a70604c955d3..a70604c955d3 100644
--- a/kde-apps/libkdegames/libkdegames-18.04.0.ebuild
+++ b/kde-apps/libkdegames/libkdegames-18.04.1.ebuild
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 2a0641da48a9..18d7042b48c1 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,5 @@
 DIST libkdepim-17.12.3.tar.xz 339628 BLAKE2B 318002f913bc16750f89c516a1f85e400caa7e11cd0e166fe5ba476927c49476700bc486ee3e20d38fe910ee109c95eb4cc0e54cbdef4bd80ccb0d3965177dab SHA512 e5e2afa569513d937c4f5f88909f158e7fbb067eed1a5a6ea7d6e91a784f75547e6f63e20a1d0bc9022229a695a010af43da6d7aa34b9f86cac57503aff436c0
-DIST libkdepim-18.04.0.tar.xz 340012 BLAKE2B bd6e6c7ffec7c7450ac921fc1418fe80827f1956662aac1eecab2bf4edd3ef1300b0761f1b0c740692672f60458c4161553101fcfd5efc1223d4a8628c178418 SHA512 185799afc9f1d14295cc8a40888e59cc4f0143cd556686437a30c6a158ce7f50f469a7f54dadaa85bfd950aff556dcda3dd28bf31fc856ae87b394ec376441f6
+DIST libkdepim-18.04.1.tar.xz 341364 BLAKE2B 0553e6fb2c7515064846ceeb2b44f7a7edec256f1d90887112a595de2398299cc34328608459d90208649711a417acbfbcbbd1eceeecacd5e78899c33bdec96e SHA512 a68937fb1e0d561ac42d6f75b165d1d3cfe8f7282146ebbca7b407796c03e82509729729503c29b16bf1ba78951b18afede649d6f7964dc2a085f947da54e7f0
 EBUILD libkdepim-17.12.3.ebuild 1065 BLAKE2B 81cf1c504eec9b5df7d634929733a64b718ac73fd33f9392e85302259581c4b764c593e03362517a1fba2097ed7a110e66469faa34e80011697b6591e9dfe73e SHA512 6407762a57ee1d30d4d853e93914c59c0c6781a49eba791386de97b1114cb1067b27e919d0cc57c506e35aefe3310b272b9148a0061fa10f0133b0c1965ede99
-EBUILD libkdepim-18.04.0.ebuild 1067 BLAKE2B 45a9feb8824992d1dc25deca216965436eebabde4155a4a97ed4136baeb523afabf5aa948c367129f871c6bd89791f3d363c78187184768e5e2b5aa87789d5b5 SHA512 f52b9a8645c67ecb349717833241c866bff426e52b14a618e6dbabcd5abce266d7f1b9478e729e128c8487fa9eb91359eec0691651b55311ace43bd14a98ed96
+EBUILD libkdepim-18.04.1.ebuild 1067 BLAKE2B 45a9feb8824992d1dc25deca216965436eebabde4155a4a97ed4136baeb523afabf5aa948c367129f871c6bd89791f3d363c78187184768e5e2b5aa87789d5b5 SHA512 f52b9a8645c67ecb349717833241c866bff426e52b14a618e6dbabcd5abce266d7f1b9478e729e128c8487fa9eb91359eec0691651b55311ace43bd14a98ed96
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-18.04.0.ebuild b/kde-apps/libkdepim/libkdepim-18.04.1.ebuild
index 416b05fa49e7..416b05fa49e7 100644
--- a/kde-apps/libkdepim/libkdepim-18.04.0.ebuild
+++ b/kde-apps/libkdepim/libkdepim-18.04.1.ebuild
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index a05a5b46bf27..6824f86499de 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
 DIST libkeduvocdocument-17.12.3.tar.xz 205608 BLAKE2B 5f25f6b96ca0c892fd746ecb3acc1c0799f7fbbef0e33611d28c30a56129ef0f0ae0e94db9abde02152f8394779902951be0c008e41b4938bf84f6a45cfa2799 SHA512 658b3a37483405f70e619054f4e99ddf23e590d4ca02f081f7ba217c6366f1db69c4de3041264fd7aa2610c20f927f810c5904a4b70dc7740609e2bb71349c4a
-DIST libkeduvocdocument-18.04.0.tar.xz 209656 BLAKE2B 9ad8920256e6eaddc8d9dfa49f28844fa29070823c30c7fbc52d1f5bceaf9654e66b07b950a06abe0172e1611e2ee92c0198231312fac439fda8f55abf1fcd03 SHA512 e8de046bd0a6467a6951cc30179d46a1249e490f5bbe3b04273837fc77d1aad256525450bd981c7480927fdc36bafd9884ed98aa73f96d56086f159ffb8545f7
+DIST libkeduvocdocument-18.04.1.tar.xz 210484 BLAKE2B eff11abf4f629b2740a367a051df56786087ec8b688e099e04b0d1afad5e5aeffa52bee6c5fffccd49b4caff581b828c48e91e2bcb89dd834ff70cb0401ec739 SHA512 e0b010f4b8d753667e5bc4a93a08023e4788f6aa7ca2f0c2f3cb49ec1208dfc204b46e31c2ad3aca48c36dabd669e072911c8263db61f55cdef74030b023df06
 EBUILD libkeduvocdocument-17.12.3.ebuild 599 BLAKE2B 3b0c2e79516e1084349d8088ddc01bede11ef22d9b5e439b5c86e9cd7ba3b7800d1089aab8c9357f0db802ed8bf2f00b509190c226241867567f317bb085d0dd SHA512 5cf55d956909d21739659cc8f2951d93a665e87451e6a30775ccdaa1358cc0302b2c59c3efcfc3c3a27141b05de42dfea553908b68dd22309e11077edecdf26e
-EBUILD libkeduvocdocument-18.04.0.ebuild 601 BLAKE2B 74d7d9eeee13777e79a09e3f315acb4a9df6c126b7b39f3b1f483e4c61101622cdbc5cd73a5acd7b8161442a1a976913f8602c1eb252559eac09055ebf4b00b0 SHA512 cdf8a940df3c45216d0b61d17a419ba34790f61c43fae374e9271ffb938a7b2560303f214bd1ee62fdd8b0b019f8a90093fc0274cf489c18a6aea203a08dad45
+EBUILD libkeduvocdocument-18.04.1.ebuild 601 BLAKE2B 74d7d9eeee13777e79a09e3f315acb4a9df6c126b7b39f3b1f483e4c61101622cdbc5cd73a5acd7b8161442a1a976913f8602c1eb252559eac09055ebf4b00b0 SHA512 cdf8a940df3c45216d0b61d17a419ba34790f61c43fae374e9271ffb938a7b2560303f214bd1ee62fdd8b0b019f8a90093fc0274cf489c18a6aea203a08dad45
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.0.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.1.ebuild
index caf1c7213dda..caf1c7213dda 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.0.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.1.ebuild
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 624bf9bed817..3698036c52ca 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,5 @@
 DIST libkexiv2-17.12.3.tar.xz 64296 BLAKE2B 048fc2190770694fe76d1f0add3586fe3a8db0bddfb86714d1955753c9243863350912dbab670433f32f46051154b5fa9c0090794e3c46b70128cc42b73b8f9c SHA512 a442ab46a7dbcc7fe39e4907851d272dc8645a2e18c7a04de9723f6456aa04131f90def553ad922f51773574be753f13a0107cc85f39d1b136d1c422d1791fe7
-DIST libkexiv2-18.04.0.tar.xz 64320 BLAKE2B c738226de64ec0c6762a52026a4d98d46ef8bbc2bb657e9da8772a528f2601a8986eaac4a91ebd1200b674ab3b1ef89f02fb89211668968c7443d103436aa680 SHA512 a97320eb046bbc211856648625c2b8b02dfaaea0cdcf27bf5b788221bdb40f0cb31ddb27ea9157b7b74cde80099b96f8465a4bfa9dd7913a7d76aa701eeae05b
+DIST libkexiv2-18.04.1.tar.xz 64524 BLAKE2B f46e11121333fdc3d63308f5dd9554aa33bdd142a777c42ce923d5414b4a6b5a76691b72cfeff3fbd3b9ac2df53b9bdeaa9739100271dd45e44e210cb0536fa0 SHA512 d2cce4cf1e8de531c2dad980c8ae38c38764d8839be077fe5e459cf3c8f476a33a2dc7ed430785b763d0adc90071df6b5d511fa657897da015b583856b3ba5f7
 EBUILD libkexiv2-17.12.3.ebuild 356 BLAKE2B aaca5ff52a0b87eb93324ef09899225558c281b241cf6b11aa08a2d16b57118dc3d94a45a6bb5b0475715e205994c646ad54eccb0aa5fcb8aa779ce803f86a26 SHA512 75fb0fa4f9658956aabe61b4b25a8d2cdcd175c9a42d1d33f1a997c142df35243c49f4a9f1e9e94f10db251da8fcecd8bc11fd85e54dd016f868e9b4e0046c8c
-EBUILD libkexiv2-18.04.0.ebuild 358 BLAKE2B ec256b620c25093496b98d7f3203e7247720a51b3fc6adbabd6670940553a4d810c4fde10b465c9a5c496cb54500178ed6ee5f32a7335bf9cf80cd3fdf6ae653 SHA512 208c67ba5fc4e5ed887725efd846994099f8f914f880865107261b81cc9edfb19f08820e61a2d8a2ad83bf02d4d27390428fd576b3deda3bd2538500f7d013ca
+EBUILD libkexiv2-18.04.1.ebuild 358 BLAKE2B ec256b620c25093496b98d7f3203e7247720a51b3fc6adbabd6670940553a4d810c4fde10b465c9a5c496cb54500178ed6ee5f32a7335bf9cf80cd3fdf6ae653 SHA512 208c67ba5fc4e5ed887725efd846994099f8f914f880865107261b81cc9edfb19f08820e61a2d8a2ad83bf02d4d27390428fd576b3deda3bd2538500f7d013ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-18.04.0.ebuild b/kde-apps/libkexiv2/libkexiv2-18.04.1.ebuild
index 8566db655bed..8566db655bed 100644
--- a/kde-apps/libkexiv2/libkexiv2-18.04.0.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-18.04.1.ebuild
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index af5e7ecc4ab0..dac26d3ac2f5 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,5 @@
 DIST libkgapi-17.12.3.tar.xz 175460 BLAKE2B debb06dd1619024ac29c9529b638f27896494049fe682b3740355a0e375bd0acf27d6e7e431b6fd241fa9285a6a1b1e076b51323aeef7d592e49c624a7e1fa7f SHA512 953ba55c5e645b38bde930a79daaf6129f7271fd2add45609975e51bfcaf516f87ea6f0e3b6811eb655aa0ae0a40d6408a29ed966acf22ee946f7a2b432079ef
-DIST libkgapi-18.04.0.tar.xz 176520 BLAKE2B 77e6787300503825c6b30618c5915bd136d71f34139acb81ed30bcfb5584939b4d9af68b3a8d5b6de7f1a7630739a55c30eb2c34e0d1d3e6d2849d5d69ec818b SHA512 897f0b6067537d6bb6d9a3fc48c65620ceb4bd74680661a69f67fcdee190d079aba5bb4e87fb706f9d61640dd909eda6e4b4609cb34126203310074f9041bccf
+DIST libkgapi-18.04.1.tar.xz 176124 BLAKE2B 614e6d37019abd852d80a45e1028460ff4b36484f870d05e73ffd65812b77d01a48bba54ad534bad7ab90896c05cf0551c626ba067f5680565342d114e361121 SHA512 1cc20b8d9277c685593f66a1d3b68b569cb4d8e23cf86fe6fa18e17234496b432c08fb42928e5a2900f795bc60e4ba5acbb1160928df00db746bd8c056651252
 EBUILD libkgapi-17.12.3.ebuild 755 BLAKE2B 889eb43fff87414830fb430940bbe90357414780485b0c45d2b9ae39caf3dba7d862c06c45074873acfed8f4556561e17a9c7367bb5da72a9f6b53380abf17cd SHA512 0bbc2a10dba06b6a4d19f32121ef32026f90fd5a50638ef24563409103de7f90b62b639d536dcf6499619357265cd2b48afc1bc3af64b9cd6aef0e845db986a1
-EBUILD libkgapi-18.04.0.ebuild 757 BLAKE2B 551e4d7347e476635b2800f3c45f66271ec8a71bf719faec7434f1bc44335d4b6393c5ea0b2379d53ade5f7b03f868985cb1075efe36804d8077ff2faaff3d74 SHA512 5f93d6951e92d348785e2d2145d115c28e686981629806acece86fc3d04e452649cafb41eec14cfab9555265d90c5ebf43b379527a02ee3ee299c7a2ef12e741
+EBUILD libkgapi-18.04.1.ebuild 757 BLAKE2B 551e4d7347e476635b2800f3c45f66271ec8a71bf719faec7434f1bc44335d4b6393c5ea0b2379d53ade5f7b03f868985cb1075efe36804d8077ff2faaff3d74 SHA512 5f93d6951e92d348785e2d2145d115c28e686981629806acece86fc3d04e452649cafb41eec14cfab9555265d90c5ebf43b379527a02ee3ee299c7a2ef12e741
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-18.04.0.ebuild b/kde-apps/libkgapi/libkgapi-18.04.1.ebuild
index 9f3e37a77649..9f3e37a77649 100644
--- a/kde-apps/libkgapi/libkgapi-18.04.0.ebuild
+++ b/kde-apps/libkgapi/libkgapi-18.04.1.ebuild
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index 44ec0d9527e5..cc51646c0285 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1,5 +1,5 @@
 DIST libkgeomap-17.12.3.tar.xz 149616 BLAKE2B 105229bedee238e85d31e382fde4d3b86e44120f6caa4ed346ba2832f01a71cb9c072a7330679934399a492d4978a72e2cc027810d5f897e4f940d50c19581bd SHA512 8d2a504cd7abf4a70b3ef3d956504279b5e4e8c045771faaced9dec140252a37ccd6ec098e93572530196adb8503de597ba45b340f5a9e787706680e734bbe76
-DIST libkgeomap-18.04.0.tar.xz 149608 BLAKE2B 1c90570eaa7254e14dc211aaf0043b0e1910009e29239d4ef4d5756a663cf54ecfa8d37e8ca4100ed13e3229a5e2bf8ccd9fc48d5e701c2586b6c7fec376ab91 SHA512 1e20c3506f10484d3f390c116eaadcda206fe7647b5fe9368cf3976b90523dc39977a2b14754e332a5060832c19554297db9ace18424eb6be8a2d9e89baf4d5a
+DIST libkgeomap-18.04.1.tar.xz 150284 BLAKE2B ce3f25235fe6a7045bd61123994efd47ee2334084532a77783fe17d78761474c14c95e122a9dd1d0f48f3d0dfd90646a020c5f2c5c1cfef979d9f9c00106f3ff SHA512 76f523cfb3a16a6dabc46092ad2bf3b34eb79459a59b060713d3286fa2bae70f8d02ec3a52aa4ac9ea46c8e3e33b801f04ac13467a4e2d9ec8af632f5ed568c0
 EBUILD libkgeomap-17.12.3.ebuild 774 BLAKE2B abed07263428ec8dc362d01d70e992a05d9fe46fcca1649c5f279f84aa78cdc8ab14188e6945179449e42c588766c323129f6854e4f1c7310f7858c62dd72c74 SHA512 98576e08eba5a37853eb64bc01c523f615eacbd2a3fa008592cdec9c94c19e06a6e0763b5d3203f490653678d5496407008d2134eb567e630d2cdaef5820f7bc
-EBUILD libkgeomap-18.04.0.ebuild 776 BLAKE2B 6701ec26ccb7b89b13e30655352621824984faf2e962c2fc8b44137db64c073aa9afc996b743c9cda4214a3eec774064fef547e688c5f6f48996656bcd47b376 SHA512 b2f15bcf21166f30c6f2261d8a4c500923ac47d6a9b33b0504dacc50911c3f6472b4342413735424bf2e66a3897dcbfa0b8c4c97cc2993ede7c841367f498f53
+EBUILD libkgeomap-18.04.1.ebuild 776 BLAKE2B 6701ec26ccb7b89b13e30655352621824984faf2e962c2fc8b44137db64c073aa9afc996b743c9cda4214a3eec774064fef547e688c5f6f48996656bcd47b376 SHA512 b2f15bcf21166f30c6f2261d8a4c500923ac47d6a9b33b0504dacc50911c3f6472b4342413735424bf2e66a3897dcbfa0b8c4c97cc2993ede7c841367f498f53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgeomap/libkgeomap-18.04.0.ebuild b/kde-apps/libkgeomap/libkgeomap-18.04.1.ebuild
index 5bbaf24dbc0d..5bbaf24dbc0d 100644
--- a/kde-apps/libkgeomap/libkgeomap-18.04.0.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-18.04.1.ebuild
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index ec39e488f2cb..6ef8c14e9dad 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,5 @@
 DIST libkipi-17.12.3.tar.xz 103492 BLAKE2B c1833e63fad20cff775d9e047dff4df5ef98df111ddf1742180250248d86413769561f33cb5e32dbf228adc6990684b7376155b502b679a174990c820ae5b9b5 SHA512 de41304046874c95555d25828e4cc89be6391adcad657aa912d0eae62bed1fd52930e420aa24d53ab1fbe47677408416ccd86f3de027839a8cb44cd67a0352a7
-DIST libkipi-18.04.0.tar.xz 103508 BLAKE2B 80b91d70e83342c715f4c44045e648f35bfc0e386afa5bebcaa3b258bd27236f3347b6c5049593ed256de032abc68c28f0959f20d2ce3a5bffea3d919234b540 SHA512 177f4295ccc5c37b0db9cc73bca22adb8c244435663bde054f3960fea90d4e35050c97e9612e2d9f8539b3b3ddb594f3b7596d3d217f80f6d38e3cd26ad183db
+DIST libkipi-18.04.1.tar.xz 103640 BLAKE2B 7cb5f87ea59495517b689eda819603766d78e58d463cbb5d1bc7f30c2bb3be1dfaf5061ca57c0f42907d35c7eece6b766198663ee14be01900195dfe650af07d SHA512 b495ad4db5a29da2cf7d05d35e4abad2ded1b3b7497d601ab074b3604d14eef9c2c5e04ebcae0afcc53bdaa91f8522a4e4e601cfc2b298f49b6dfcf7d594704b
 EBUILD libkipi-17.12.3.ebuild 565 BLAKE2B acee4da04f26efc545d222e1c19f89798033e9490457538e053b9d2d454a705aca5afa45525db0fd9f46bd79a9f5a5acb3c2ab78f47e63904d3e26d94c345886 SHA512 cd81c2e285559058b0cf2f400cca5ce4ed7ee59f95d695ec92d378e5c1c10d69a25dcd3d23ade4f6ee77fb0c31ccfc92bc4ebe1fd401b7cd10fe0cef63995113
-EBUILD libkipi-18.04.0.ebuild 567 BLAKE2B 82932dbb414788179a2e99d71892d55fa392831a5048cea801876c439fab5bfc30c3295d9f04aaa5f26ea5b66cea662d10a7e44a8c84373271aa84d59fad20cf SHA512 f6a8e5b46a04e01c44d6cab1e0317f744a4b3e8306caf7e9c05855cbcf308be9de1fd3d40ffcdf1bc326045789d0281320695a48eb6db9b107b847bd2bebf753
+EBUILD libkipi-18.04.1.ebuild 567 BLAKE2B 82932dbb414788179a2e99d71892d55fa392831a5048cea801876c439fab5bfc30c3295d9f04aaa5f26ea5b66cea662d10a7e44a8c84373271aa84d59fad20cf SHA512 f6a8e5b46a04e01c44d6cab1e0317f744a4b3e8306caf7e9c05855cbcf308be9de1fd3d40ffcdf1bc326045789d0281320695a48eb6db9b107b847bd2bebf753
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkipi/libkipi-18.04.0.ebuild b/kde-apps/libkipi/libkipi-18.04.1.ebuild
index a0615d81f262..a0615d81f262 100644
--- a/kde-apps/libkipi/libkipi-18.04.0.ebuild
+++ b/kde-apps/libkipi/libkipi-18.04.1.ebuild
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index d084d3742d83..186bd88b5b74 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,5 @@
 DIST libkleo-17.12.3.tar.xz 314656 BLAKE2B 18556390e7dd405f274709df054881ea565973b1fa1b743312506716d9e88dad1680722df35bd0e5d4431394249d5b30caff27456eaa028c61160133374226a6 SHA512 0ed3fd2416b3838a295e877b7f4134f4e5e8abf67229b40a70fb1d2310115e1eb51ee990a3f8f80045169ceddbb5bc4df85b9b9109c3e2fcc9a3f8aaa93cbdb1
-DIST libkleo-18.04.0.tar.xz 317900 BLAKE2B 6b77cc9c3240078f8a18756c78589e7eb2fdb45a65eb5cd0fb122c110185e9bcc4098afb2dec9e84dc01c6a507111ca8ed46cd21b8379634cb07c968a3193e92 SHA512 edcbb8b01bdb30b82b7ae09e673166691b29f0ba7efccda9d1855fc92b1091087dd4c3933c2e77819b70ca1ca3289ea6b01391f19b9b12756b28659b18788f49
+DIST libkleo-18.04.1.tar.xz 318356 BLAKE2B 76172fa857b805eb9bb499a1ac47384182eec26a214497af530deec59173dbe17fb8cae55144adf71bcaf7d0796b495cdc038b1ccf56b30359e486ed0a17a886 SHA512 be6979ea01c74974919771634272921a5d213a19dbc4e8befdd9882f1086f74c8c36afed5505d629a51a6712ad7703a37479a2b01eac1aa9effce33862ee6b8d
 EBUILD libkleo-17.12.3.ebuild 736 BLAKE2B 9f3303689ba756680690c9760ba4a506b84dd0e08b868130113a5618fabc45ec2648cf8a3c3081a75f124e76a727dd836b8813de6b0950cc5730252e2b62bf7b SHA512 d1cc5597530ec2f1dc6d986835a67aea42a02cf03e4c60d1c893edd4a68fc253c3a06e9bc155a66d8f2e33862ee4657be279a6560e8a2262364910497b3b2366
-EBUILD libkleo-18.04.0.ebuild 738 BLAKE2B d36242f36d93cf29b4c01df38a358e8c917193f3dc4c97f05cd5d9a1ef6b2df2ac4dbe4eb1f068e58533276f3bd3911c7d20870c73681bac774f1776c92a9fc6 SHA512 86a5a68c07859e2c58222fdf95ea538968ba78afea0a1660d0d3991b440a4bcdfa4789d7476fa6107f411d454a3f1212192f145e01921f3b0ffbf937964abc96
+EBUILD libkleo-18.04.1.ebuild 738 BLAKE2B d36242f36d93cf29b4c01df38a358e8c917193f3dc4c97f05cd5d9a1ef6b2df2ac4dbe4eb1f068e58533276f3bd3911c7d20870c73681bac774f1776c92a9fc6 SHA512 86a5a68c07859e2c58222fdf95ea538968ba78afea0a1660d0d3991b440a4bcdfa4789d7476fa6107f411d454a3f1212192f145e01921f3b0ffbf937964abc96
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkleo/libkleo-18.04.0.ebuild b/kde-apps/libkleo/libkleo-18.04.1.ebuild
index c7fd42409ee4..c7fd42409ee4 100644
--- a/kde-apps/libkleo/libkleo-18.04.0.ebuild
+++ b/kde-apps/libkleo/libkleo-18.04.1.ebuild
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index df2925ffc573..fb422b381541 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST libkmahjongg-17.12.3.tar.xz 1684924 BLAKE2B e6be87c90fd56848d7328564478f39451e9f90819ebf5e3df1555e7da2bbfb4417d6c08586b3e91ee4d76d585bff468d1609c9de2a6b0fa1bfe4a9cb6b65bda1 SHA512 ce98494e7f6169176f1ba6bd612adbe69ff725d20881f9ddea358bf31a52a15913653dc774c00ae7f805d6d4e0c563d77ebbc724d57425583d49bb093c94c83f
-DIST libkmahjongg-18.04.0.tar.xz 1685688 BLAKE2B 43e8e7fdcd96e70da12c523d7c33987454950b5af5fd736f187fdd81d33f52416aff9daf4665ec515dd04410741e1e8538eda8e214fc97899a74b6f89340c040 SHA512 7c0f3312722145f5b7e8e7a1ccc6aa6a83e34d95a9192728d38abfb5db00f5328d71603f5fcc568281642ee32b23ccba10b37e788c7ab5bcc29a8a44f8bed219
+DIST libkmahjongg-18.04.1.tar.xz 1683632 BLAKE2B ba2a2b0d20c34a8a2035d3d631539f2f38c16afa8cca538b5bf5f55c147989d95b2e41e8efce8bd60068a58f7422d1debe5cdfc60754e19a22fc64f9d79233bb SHA512 4926ef9b958fa3543dbf050534a0ed21fcfd25f16c9b7b15fa04b132fb0f7a4ee2ad2aec752b82ea6220a05cb545cfdb25512b11f1afeba31a77eefd8162220f
 EBUILD libkmahjongg-17.12.3.ebuild 546 BLAKE2B e57ea6057346bd3e9da580787aa6687cc0a81c075412c2b10d5fb4e6eb06bb5e8158430e71325f0ded62c2bdc14088d6eb4d015e198b6a71e46edf5c9faa10e8 SHA512 d3ff2d9cba4ab97be8ef283af7b2e2c140d86a9a36091806d6723779b7200027e16fa5f9f7dd4a452f8484e800105af77c3cf1c5820d9bf570eb077b2253c9d1
-EBUILD libkmahjongg-18.04.0.ebuild 548 BLAKE2B 41d9fbafa13eac18be62234c1d05d2ade61a9acdbc27008f45d261edcc76a9d975d96b5d553dd778bd1befa69faf5affe0d2aeb9bc197915fd2b26f1dcef7767 SHA512 b4d012f712fb6ca3b46ea181c5191dda4c0dd6914a67e305d69d07146e8e121ff993d822f740ff44951dbfc0a5eb267a6849bf35227fc54aea9f9c7a9077b97a
+EBUILD libkmahjongg-18.04.1.ebuild 548 BLAKE2B 41d9fbafa13eac18be62234c1d05d2ade61a9acdbc27008f45d261edcc76a9d975d96b5d553dd778bd1befa69faf5affe0d2aeb9bc197915fd2b26f1dcef7767 SHA512 b4d012f712fb6ca3b46ea181c5191dda4c0dd6914a67e305d69d07146e8e121ff993d822f740ff44951dbfc0a5eb267a6849bf35227fc54aea9f9c7a9077b97a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-18.04.0.ebuild b/kde-apps/libkmahjongg/libkmahjongg-18.04.1.ebuild
index d8054495d76b..d8054495d76b 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-18.04.0.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-18.04.1.ebuild
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index aa713a6ab8b3..c9fd1071351e 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,5 @@
 DIST libkomparediff2-17.12.3.tar.xz 173804 BLAKE2B 51c3b5020ad614e947c69e6134954bfcb31a989970e8a5bb38781ba15c6c25b9c2eb05cb5026b7e22bb8481bf1a7a4c95498331aa4626ee6a86f154b13fb225e SHA512 d0a36eebf6bd64f69a49ff2908cb37672bd1ca8778e515e6638d199a626175026cbbca4ebbc7bd8739c683195e203162139833c24b1be4adcb019730d4ddc1ae
-DIST libkomparediff2-18.04.0.tar.xz 176676 BLAKE2B a9d5b180f3e9240578cf86c499e429589145d3ca631450151f3963798ed7bb57d8535326cce41e8fbdc4fc69adbb4b6716a48c44c7565b695ad413963ad090c7 SHA512 69e5d8461b638bb62b3c07eecec6e9620f41a54aad0d4b93aaac12deb4a78564884d9d87e649755885117e97c1f35320a3f46412133c47e902ee15475bb0be28
+DIST libkomparediff2-18.04.1.tar.xz 176804 BLAKE2B 9290f1b64f0a844010b0a46a3174643388220b9c78918d12d5c71b911dca835632b8ef65f6f685e6807fa79c719329d95a6801334f8cf81ee3ff5329875c31ca SHA512 c96c2e07b775f2e692d8b0099e0a41e3378b1f2fdee532bdda75e56ec2823bff6c56bfb227f9baf2656e86e3b1c653570eb61ee29661f9232ec2a5ac32650813
 EBUILD libkomparediff2-17.12.3.ebuild 530 BLAKE2B d8b0ea58712bf6f90fcf89a5cd3a6674c7cfe1639c7abfcf00159fdabdd868679baf6438d03fa6d24811dee5222c11bd195996744a1776e702f71ce2f417902c SHA512 eb1e7e4ffa3bb48746d6032f6b4d08756021609cee91f1fab8aeb81ac3a9135a7bfeea3980ee8bf930813af2e7b8ecb6b9734894b92e9bd000b22627acb43601
-EBUILD libkomparediff2-18.04.0.ebuild 532 BLAKE2B f258ad870b88155127698612a950ffb630846ab4734b29fc274ade0f1c83afff84b91037c0b70c012560f39434a09d2797a01a7d8e370fb93b20dca21e581435 SHA512 5033558286497a0f1036d3a1a28c5e363a949097c408a78353646bbdec694db715ac378c0b2165de3fed0a93d6675645838d8200bb91755f21784324c29ba5c3
+EBUILD libkomparediff2-18.04.1.ebuild 532 BLAKE2B f258ad870b88155127698612a950ffb630846ab4734b29fc274ade0f1c83afff84b91037c0b70c012560f39434a09d2797a01a7d8e370fb93b20dca21e581435 SHA512 5033558286497a0f1036d3a1a28c5e363a949097c408a78353646bbdec694db715ac378c0b2165de3fed0a93d6675645838d8200bb91755f21784324c29ba5c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-18.04.0.ebuild b/kde-apps/libkomparediff2/libkomparediff2-18.04.1.ebuild
index 78b78d3cb9ce..78b78d3cb9ce 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-18.04.0.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-18.04.1.ebuild
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 881c5cba4fb8..a8d86f97a9bb 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
 DIST libksane-17.12.3.tar.xz 136860 BLAKE2B 35b0a42949e007bdff85f9d6a68bbb52679e7d0307565f526354c21c0e027973ad5953aecb0dad31efc46927eef7b76dfb330083a9a3899a443d19c45868b1c0 SHA512 37c2e0dffb5cfa46254097668988da5691117b5fb4e93154e585025b031374577843d0c34d88515fc6068f80dd54b3865fb8e202b0b2e7c7a16729737dd79dd6
-DIST libksane-18.04.0.tar.xz 137260 BLAKE2B 017afd0330e3cd76b4565e3027e29220c3228d9b320a020ae88992556a8ee497a015ac2bcedf31deaf437caf8cac1c6aa691be5f2f55926930a4c71b82f67bac SHA512 e73ddfccbc28f7afefb058f65dc4313372cdcecf0e149d7b6c5d603b468e8955712f85114401648bdcee1c88ec26fe16dc2b9b3ccd01abbebb9fe5e0593309c0
+DIST libksane-18.04.1.tar.xz 137396 BLAKE2B bebe97c190d50e4f648447e96b9de23e7bf9d755effdeba442441686b20c6d035c9ab223ad0f89b4dd599093c7875695ac9965061576e9a68bd1420aa3308b6f SHA512 5a6a18e6b892f0c5151573b7040771c43ecd7d512c33b8102857876ce37e1cbf87381a2803816bc0ba0de14424a0dded2ffcc8460df939f543df446954a87b79
 EBUILD libksane-17.12.3.ebuild 573 BLAKE2B f1fd3da85259cb1b0e8d9dbeccb1af04aee1d6adb46bd8fc1be7c147b24a4707dd5b5766de6a0818fbeb4d0360d9466473074a854a342443607765ae3233dfb2 SHA512 28dffc81aa825234a80e0be688b8ad8ef18f708981682d4585a219267204ad847ab9d0949f66ffaec2cc9c18c155fb061a86e069a94d75b4bdc2a4ead8591ea5
-EBUILD libksane-18.04.0.ebuild 712 BLAKE2B 37d9440884a7c76bdd73cd78adf0acd1cde2e1e108c932b80fc85d5e11e15eb48c706f7a16570433fd0406dafe97175c7e0b34435e86b5616030ce109a7b218c SHA512 9836b0abeb36f46bf6e0deb8b0b24d1c8b8a60b642ec53cc7d303e7d70b5eabc1fd29d5034622c8800744b4a83d5d17595d1303fb9bc960a0de1e215f757a44e
+EBUILD libksane-18.04.1.ebuild 712 BLAKE2B 37d9440884a7c76bdd73cd78adf0acd1cde2e1e108c932b80fc85d5e11e15eb48c706f7a16570433fd0406dafe97175c7e0b34435e86b5616030ce109a7b218c SHA512 9836b0abeb36f46bf6e0deb8b0b24d1c8b8a60b642ec53cc7d303e7d70b5eabc1fd29d5034622c8800744b4a83d5d17595d1303fb9bc960a0de1e215f757a44e
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/kde-apps/libksane/libksane-18.04.0.ebuild b/kde-apps/libksane/libksane-18.04.1.ebuild
index 4e7403dbbfc9..4e7403dbbfc9 100644
--- a/kde-apps/libksane/libksane-18.04.0.ebuild
+++ b/kde-apps/libksane/libksane-18.04.1.ebuild
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index a956b08bd429..441baf052c10 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,5 @@
 DIST libksieve-17.12.3.tar.xz 547852 BLAKE2B 28951b1af9ffec39ae86f718dc4dc860337a57f87a92716dc4db7ea1baac08d972210e655cdee1122fab7c0c30aa3ead36e2b4b52a47fb5d8a5cd4ea9fb9785a SHA512 d22dcb9294ff460511f64385988795d9ef16c3fd1766c9fa4e8696c5cde6250c5b499e135e605d97438aec91cbf831a9bed006aa008599d6d0eb1a30bfa5973c
-DIST libksieve-18.04.0.tar.xz 549664 BLAKE2B 5eb4b840ad6833c04d307c8bf1e51bd61c9acd026573f4de98c9487a5be9b5be731d7362680828828c3fb29c80e2ebde89ec734bf7852fa02b66b04a50a90eed SHA512 26c88483b8dc9a6d645aa6afd7c719e3c64150a31cfd3dbdb45e1c3a97b6b0553acf53617c5f27f91b7fdc9112c0f3df05abef93d12eebecc47043a411709759
+DIST libksieve-18.04.1.tar.xz 550244 BLAKE2B a2e747103cfc8b101c4e6adf7f2bd6b09e77430418a1bdd2e1d4b40c1948afc987ef6ac2bff6bd2c9ebc5541de84f48f93374e0a73d6b95a3537f5bd7964281c SHA512 9f5954942d0042abd0bdcad65e1f294a2eab79025f1be64087d87ae610d6b0f6f724f008ddf76948250c0b1fb67afbcf7dcaa2ec20f1ffe3c704c6a295222ac8
 EBUILD libksieve-17.12.3.ebuild 1464 BLAKE2B 812989087ef5e61c75a37c632fb6a11439d3b444b8fb3403f12310cd46c872b3ba5f6295b340be65717fbe55e91bdcdcd9e63904b057b956935cffbfd63776eb SHA512 27610bb20a24088bf895302ae1e08280ff9ce2681170283247a2420f150ab019f51ad9c742d4391c300533d2bb764e3db6490d2374cf939ed1536a1b109bd049
-EBUILD libksieve-18.04.0.ebuild 1466 BLAKE2B 298be1cdb6d281c4e9c4f835b1e6bcaca255ba52975f908dd49bd6cb898b4912ad485f46577538a1aa8b91af377c3a648ae8da54f5c2cbde937cd3700620a09e SHA512 ecaa71d696c464badfd030cfc31caaad7fcc65b0bdb6381b40157daac905d106a7ceca13a76b90e5357b13c7fa246f3a1ba45cf73ef160409bdf219eaa23b203
+EBUILD libksieve-18.04.1.ebuild 1466 BLAKE2B 298be1cdb6d281c4e9c4f835b1e6bcaca255ba52975f908dd49bd6cb898b4912ad485f46577538a1aa8b91af377c3a648ae8da54f5c2cbde937cd3700620a09e SHA512 ecaa71d696c464badfd030cfc31caaad7fcc65b0bdb6381b40157daac905d106a7ceca13a76b90e5357b13c7fa246f3a1ba45cf73ef160409bdf219eaa23b203
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-18.04.0.ebuild b/kde-apps/libksieve/libksieve-18.04.1.ebuild
index aed045a2025a..aed045a2025a 100644
--- a/kde-apps/libksieve/libksieve-18.04.0.ebuild
+++ b/kde-apps/libksieve/libksieve-18.04.1.ebuild
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 5d40bc380cb7..409f632f9441 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
 DIST ktnef-17.12.3.tar.xz 299892 BLAKE2B 1dee6c9babf502d91540e7c0322dcd6c4d8ac6002887b677a8e2f549f9bc90a77c448f3f3cf2eca1beaaf38613f65dce70dd61765dbb2015569936957c30be06 SHA512 77e86827a0bfbe614cbe170b503c88b298f155a58ca381e914779a7ea2f82cc1fbd655735cc6586b07d8e0f73e3b38c7ff5b94cc4513fdb6de74a82940c468c4
-DIST ktnef-18.04.0.tar.xz 300124 BLAKE2B 73d49ae833f67bc0a2835657d3a2c9bc6750243b46cab700124ce3c5d57a1176286c6ae4cca4ee84a5a1bfa955c16fc114cd75255c64d9eecb3e343a88c07a24 SHA512 4d4c75de53082f68905c31077fb97f7ce9a2a4b48e3a0e0f7313027d70dae791933c666702028f397d90af60701a394a6b6698aa9e3ddbc43d8fd1fe74eb7426
+DIST ktnef-18.04.1.tar.xz 300376 BLAKE2B 0b4559403d855d74fd5b38ed7e1972736947a92fc27e2483abbc8f2a486f38fc84375ee77c3272d52e41c7dc7b1194af5b79cd85106790c882478ee980290365 SHA512 3ac215a3820d5a973d8c4c6ed1b8f3faa919fa2bd2fff424ca795f74a0b2f03fd3de7f28ed1da4382b0f572c99d1115cf2016cbbe44f361fd5164aa6b2bbb411
 EBUILD libktnef-17.12.3.ebuild 451 BLAKE2B b0818698561127b95312c67c06dbf836f350874c1433518ede4a2f26eff96a781e1886fa14291c9e936cb95d8060563f0a30d675a7fd7fcc5db4c971a2e4abd9 SHA512 89d2e17a77c1be864b7dc9f5ae11578046754fd0550ac42668918f2838bcf29a98d7e7d9148cbc458048572b114b517d1cbe9d1adc06da168f7f4dcaaba63ebe
-EBUILD libktnef-18.04.0.ebuild 453 BLAKE2B 17349c18c88369bb03bae390beaa38601028d127362bbbdc4954a4271d3787cfd42f3d9e1a3c56d26cbe9099294428ab36ea140079200b1ec83895ab71fa6e22 SHA512 3ec1b90fb9d308800ceac53827ab9c5376ea0853b6bec07d0955f41515748562ea7383df8c320ae128e28f91e77bd2933fb5309c8863a2b384eae686acfcb86d
+EBUILD libktnef-18.04.1.ebuild 453 BLAKE2B 17349c18c88369bb03bae390beaa38601028d127362bbbdc4954a4271d3787cfd42f3d9e1a3c56d26cbe9099294428ab36ea140079200b1ec83895ab71fa6e22 SHA512 3ec1b90fb9d308800ceac53827ab9c5376ea0853b6bec07d0955f41515748562ea7383df8c320ae128e28f91e77bd2933fb5309c8863a2b384eae686acfcb86d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-18.04.0.ebuild b/kde-apps/libktnef/libktnef-18.04.1.ebuild
index bd9497e32c2e..bd9497e32c2e 100644
--- a/kde-apps/libktnef/libktnef-18.04.0.ebuild
+++ b/kde-apps/libktnef/libktnef-18.04.1.ebuild
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index 6e8f1e120b34..4c1a6640709a 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,5 +1,5 @@
 DIST lokalize-17.12.3.tar.xz 2219220 BLAKE2B 1f3d0617e7a504f643a52cecf1edbd50c62d4fb789914308fef9579649f0c272710ea0ee3682bceb6280d264481c228a52809bfb2623e0957ec4b1fea8256352 SHA512 02249c1aa91309bd7269eac593282d4b52ded71c7fdf251f01d63a56d7d0201b0def95b701cb5ff149468fc22edbe4022d1633d09adbbfdc8a8038460f3eed71
-DIST lokalize-18.04.0.tar.xz 2855348 BLAKE2B 07533eb3f06cb78d66260fc6b938cbc5e04b27c0be009de50c0c3daa69491602476ca1ce6a55b51b0dcfec9dc9d36a4a4b577c708a080b637c64dcdd46670332 SHA512 13d19544cb0b8a2be4d85df463f9a95b7f6ddf3d68c05d01484377c1d4b0b43a340fe09f99d42f7f41010200ae2a5d9bd130697e5b16a842c27079b88825dfc2
+DIST lokalize-18.04.1.tar.xz 2861644 BLAKE2B da0dab30a16a55f04a9a17178d623fcf3413d1d8538129af9fca2a8a10c3f8a3c16b25a49289e4ce598817d9ee7144ca34f5776c99e97a86d03ac417ed158a0e SHA512 df8cd6dfc67313bed4b9f776e738ad52f114dbc3fcb3cc926db98675176d0f10e4d8ba052bdf563fe09c4104d30aeead4d83ef73adbdf50ce252cb3de1c7fea0
 EBUILD lokalize-17.12.3.ebuild 1551 BLAKE2B 01b4ac0e17aaa796ef8db9fa0dd1907eef6f3d95bbb893b47d6f1ac5458bbcc568c9b635c70f02e6f628b5c1f14e0405608da680fdcf00ff0217dab0ed294b97 SHA512 1eb3598f2a061cbe443a386d611083f24fde12fbafa4e18c08823eb5f21d02b5210a2688b821658a0c414768b546becd461c4bb091f3b4b703a887e2bfd12607
-EBUILD lokalize-18.04.0.ebuild 1553 BLAKE2B bed03e4cfaac8c73b72d1e32b0a5eaa85dff568173e3f062c55947b8678b5b884866e5689ef88162cd118f6f968dac1093d0718bf4d97f886e392244625bfc97 SHA512 f76d5d1d99a6ef89747ba72601bdb9694cec495f5409801d61c5d0d7029c188a9c0a8982d49550fcf16e2c8c01f63a938bb7335435e36c7d6da180f71b5f7ee0
+EBUILD lokalize-18.04.1.ebuild 1553 BLAKE2B bed03e4cfaac8c73b72d1e32b0a5eaa85dff568173e3f062c55947b8678b5b884866e5689ef88162cd118f6f968dac1093d0718bf4d97f886e392244625bfc97 SHA512 f76d5d1d99a6ef89747ba72601bdb9694cec495f5409801d61c5d0d7029c188a9c0a8982d49550fcf16e2c8c01f63a938bb7335435e36c7d6da180f71b5f7ee0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-18.04.0.ebuild b/kde-apps/lokalize/lokalize-18.04.1.ebuild
index 3bd5fd7b1459..3bd5fd7b1459 100644
--- a/kde-apps/lokalize/lokalize-18.04.0.ebuild
+++ b/kde-apps/lokalize/lokalize-18.04.1.ebuild
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index eb7e4c864462..0136fbf215f7 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +1,5 @@
 DIST lskat-17.12.3.tar.xz 1216536 BLAKE2B 74fa8783569827a65a4554cb77a14fd61fb966c766b170f441d3c6655036ba0c582ecdbb06bd23a889ea759ccc34cdd80d6050fa8874d0e4cd8d22342c7f113d SHA512 519f68ab80771cd0704eb7c0afb3ef0c8b0f8e11d7cefed7e30a966dd0445adce9f6fe3a539be126640f70fd827f3f59a876d780a887e1086132ef6fdb8948b8
-DIST lskat-18.04.0.tar.xz 1216240 BLAKE2B 47c3fea707ac10f9068e130718ef943ae04d23d88939ef97c265ee27615bb1f9118e5b3aa74f82415e31d3ca53a2892b01598ad3bbf05807578efff4b3d36feb SHA512 0bdbae37f1f9bc231683a59eb30cf637859c249d9db750735e088d1dfed7576026cdcf34b05a695c3da9a2c5e53212e62cdff8614f395525e60b9bc02697267e
+DIST lskat-18.04.1.tar.xz 1217908 BLAKE2B 88dad06b023d101aa9b9d7322b3d2b0e5f94669dd86f6de71bddf6358b6af2f14e2178e3191f3dfeef46d5b5e59426ec9ed5b456455d9b9acc8c03105c1c910a SHA512 522b1e09b19618e238ac19552094be463e148b543b2500e799d5047bb649d30ef898056c9d1bf10108b490fc723a2d269227ee1747a4de5c9b8cd8107f51932a
 EBUILD lskat-17.12.3.ebuild 729 BLAKE2B e827015aceb86093a7a185aadc8532565d70a2d2bf3a1215e5604d2e1b2e29a13127866b96d28a9aeda7b0ace684b1d4cd1a934b6e40d863ff67a0712a01014e SHA512 0169e697827de480129f379829dbf56917c52ee09c8d09aa1a85eee10920a50ff3ab9fcae502acfefbaa9c897dea66171e6a328a913e71d69a13c8b4fe050f2c
-EBUILD lskat-18.04.0.ebuild 731 BLAKE2B 139bdfd056ac84ecc4a9dc8ea79782c99fed057d4ea09d076bdb5b158dd66bef54067475ff1deaa9a8f780be92964c7f67055c45672ee45acf79a08ca7d72b3e SHA512 478a0dfc87d26092cd71e3dfa43da39bd1cccbeba41de83687dbf95f8a3f3f36856ca5ca8455b50cb04c0045c2016b7e1245ab983bd82f17849095425b1154d5
+EBUILD lskat-18.04.1.ebuild 731 BLAKE2B 139bdfd056ac84ecc4a9dc8ea79782c99fed057d4ea09d076bdb5b158dd66bef54067475ff1deaa9a8f780be92964c7f67055c45672ee45acf79a08ca7d72b3e SHA512 478a0dfc87d26092cd71e3dfa43da39bd1cccbeba41de83687dbf95f8a3f3f36856ca5ca8455b50cb04c0045c2016b7e1245ab983bd82f17849095425b1154d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-18.04.0.ebuild b/kde-apps/lskat/lskat-18.04.1.ebuild
index ca1d75ae4777..ca1d75ae4777 100644
--- a/kde-apps/lskat/lskat-18.04.0.ebuild
+++ b/kde-apps/lskat/lskat-18.04.1.ebuild
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 9685a872b435..0c479cbc504f 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
 DIST mailcommon-17.12.3.tar.xz 683392 BLAKE2B bb4796e8ce8fee59e3b4849c2c7c386ada08f77e2c2c15b9425f29c32efc3c65bc4bf9f667fd4e465e7c5f218ea5830ac8a0416a956606c5c12f6918ee8e3b8e SHA512 49c6ad5844cf5f4f884b7cdbbb855973bf8d0e5b9630700e926b75024b6aab98f5f7e05dec6dace3648181f2c57e07344245b2d49c3f293e378310f4b647450b
-DIST mailcommon-18.04.0.tar.xz 691308 BLAKE2B 37d08ad2e9186817727cc76cadabe10e7a8af19e3d9ab295b295dfc76d74929a1f611d88c027de1c803ad4dbd628bd3925324701d9bd154944980521a3f070f5 SHA512 07ef385484ed649f62c33707012175f9c1449caa558713c776854a19c7415db3a88d6374b3bb07dadbc65e480f042c1b39aaf6481af815ea2c9c110d09beb4e7
+DIST mailcommon-18.04.1.tar.xz 691992 BLAKE2B 1237499c8e064c885149080e68c2f706163af098dec4940814aeb9ad1590a42a8d3f46982e6453d64b2f604051beb3805ed6ac5646315db0e6d7072fb71d1819 SHA512 07552e0bbdb5fe8ea95af0ad1f846999d910b34e777ad44f0449728190d508d348c5c9a1a9342f0a9c3a7a948467f2b389cb4e113855a23ddbb50c804db77296
 EBUILD mailcommon-17.12.3.ebuild 1439 BLAKE2B 6afe7626b6cf19240d45ffc4057e3be1eb77b2b15cdba71255b01de6a9c36dcf0f805efde511afa09c38ba1b6562c52f263b12883be15a3fb932608984cd03ab SHA512 9f535e7696aaaf7395ddad6927bfe3e6ebddeceeb6ddbbe37511427a722179850d251646959958e6682055b62f9760d1f803e3bfeeb67a2da0c200b970907667
-EBUILD mailcommon-18.04.0.ebuild 1441 BLAKE2B 49ab94d207419115653979f9992bbb77c37996f6270285c66d1d297b6f01ecf56d4b0d85579b50cf9bccd3010a598fd7452361bf980b8d2ec79732c44ed9d8b2 SHA512 7f8aadc824fcc06f54e90a4cf16e99d732827bc8a3dc00afdc3b828b65f2a31fa9b67882bd9a643c9651b96402a4ad55b73bc2525c94998c1034d962d1c210aa
+EBUILD mailcommon-18.04.1.ebuild 1441 BLAKE2B 49ab94d207419115653979f9992bbb77c37996f6270285c66d1d297b6f01ecf56d4b0d85579b50cf9bccd3010a598fd7452361bf980b8d2ec79732c44ed9d8b2 SHA512 7f8aadc824fcc06f54e90a4cf16e99d732827bc8a3dc00afdc3b828b65f2a31fa9b67882bd9a643c9651b96402a4ad55b73bc2525c94998c1034d962d1c210aa
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-18.04.0.ebuild b/kde-apps/mailcommon/mailcommon-18.04.1.ebuild
index 22fe87d28fff..22fe87d28fff 100644
--- a/kde-apps/mailcommon/mailcommon-18.04.0.ebuild
+++ b/kde-apps/mailcommon/mailcommon-18.04.1.ebuild
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 0166d839565a..d8a5b9f57cef 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
 DIST mailimporter-17.12.3.tar.xz 541040 BLAKE2B 42152e6205c7cd0320c6475f731af1cb1877ebbaf7b1b77fd3c84d2474ef7fd9b815e3640fbf962d283627b84cd5096a200e030ff8f22ad4052a8df27fe977ac SHA512 a3485867ef68499660c6b9b078a75892df0fb880a050699543fedfd32992deda641d1477c3f30036d59cdaf926a83ff868cec700a394e595216d0094870f8ded
-DIST mailimporter-18.04.0.tar.xz 540796 BLAKE2B 02cf5f5d360816644531f8a10635668b68b23bda807a47c2b090a9877be91fd973df3e0285f5f21845c399c691973b33dcf74b006ac4f0e9b179597e4ac754ee SHA512 8dcd8a06b8559074c8b0e8bf6e4f988dff56897dbab620001a54bac15d731621d213d5b08516cf7b199f7ce3ff616451fb128a31b791dc6c356ee0f51580a733
+DIST mailimporter-18.04.1.tar.xz 541300 BLAKE2B 68dd8db9fcf9050052c734c57d67b46812948d011c0e20d100295b48adc04d4c53e735a866b43e61f3021d37b1e31cc43105ca4a916a90ce17de2f1b8ca09c4d SHA512 28618979eee4fe71125be15cb7b89ed886c3269f7740e1ed29964a20f317f69bad11e78b3336fdc0552182c3e00426f756d7cf5d5cef7273782810693857ebb3
 EBUILD mailimporter-17.12.3.ebuild 652 BLAKE2B aaeaf5851aff5c9785c614f4229218af0597bae46c8ff3071037df37037e9d494981209f7b2ce9a8ebc95260e40097860ffba31f915f0d5edfe82a25a31e57ea SHA512 6f7383f6b8195bd05773c49ebcaf97d6dafcb3241694dc5416b294e5e6659b03b437ed39688c8015ad7766fa85e97a1b4201d6229644c89c17d572be46c62861
-EBUILD mailimporter-18.04.0.ebuild 654 BLAKE2B 9ef5a0b869e5b13e9ea6e51df8fc22effc796235ada13277a9ed4b81d184646b73be1ccdcefe705ee34f78df15ea6c90220dd201c20cbd7608fe80049230f877 SHA512 7b4da4ee77779f525a895ff3752afb86e15b6eb84a79b7b62dd0c0f9ffd72b71a9877a952329b6a4de359630a2011bb5b821fda30a03396cd574ed28749982aa
+EBUILD mailimporter-18.04.1.ebuild 654 BLAKE2B 9ef5a0b869e5b13e9ea6e51df8fc22effc796235ada13277a9ed4b81d184646b73be1ccdcefe705ee34f78df15ea6c90220dd201c20cbd7608fe80049230f877 SHA512 7b4da4ee77779f525a895ff3752afb86e15b6eb84a79b7b62dd0c0f9ffd72b71a9877a952329b6a4de359630a2011bb5b821fda30a03396cd574ed28749982aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-18.04.0.ebuild b/kde-apps/mailimporter/mailimporter-18.04.1.ebuild
index 948285cee867..948285cee867 100644
--- a/kde-apps/mailimporter/mailimporter-18.04.0.ebuild
+++ b/kde-apps/mailimporter/mailimporter-18.04.1.ebuild
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 5622e78c780e..e102b66962fc 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
 DIST marble-17.12.3.tar.xz 52353704 BLAKE2B 529d889631fc5c2409d72bc7b1626673957db3db1b8e40478668596a3993dea67fd9f6d341e62ad426d1cc8e4295726471247bb9c2dc7fdf9439c4304f6bcff8 SHA512 a370f6bbce35ad4d4eb5a6d372939691322c81b7108fe64468ac3a2d491d0eb71e6c3135106e33d59115008a527aba60d2bd3508df721b5728286f526f199064
-DIST marble-18.04.0.tar.xz 52380012 BLAKE2B d4160cd6f29a35c30a1e54bda3d61f2db14a48a43fec36a8a8a53673c96259ccbc72ae3d416a3374745e94ada8fef41d731444f7fd75b9a1d07b127996f1513c SHA512 171c2301273446fbf4bed2283e83ecb6855ae5f25ca5cd2c94021a499af29b4530dfa7d07e5280b1970cef6139d2c622593cabccb2e283f2b2ca6b38e9264ca5
+DIST marble-18.04.1.tar.xz 52439528 BLAKE2B 645caa2faeab9f2d4f1cc4b64a76dabc2c62d8a6266a1f6b4aec92878b96cd4da9a922ee014775f07ed82e28103265405b54c85c5a05df7a52f475838c7b2bb0 SHA512 e5839042c80b6cd854a5c350ba87f3fc3193eda52c36caf5effe013b702f524facddba29a236883e4f12c889c01d28c270fd9d9ce424bfd7076dcbbf58e53332
 EBUILD marble-17.12.3.ebuild 2246 BLAKE2B 3419d417193227f60d58e636982adef8c5cf42dc0ca0f136a3f349dc4b5f1211709f32eedd042faca10d333e905e879b6bfcaa562f2b97626711aced0007ecf3 SHA512 51b20869705dfcfc4a304da541c3a79eb7e3ae354f103080aded77d0929ca4e8541e3441c85f904be32409438411c4c532ef85ec6088bc3d49672851709a9644
-EBUILD marble-18.04.0.ebuild 2248 BLAKE2B e622a677351777436a7f289a140df55b73d506e66d336d7c8f8234e0a19cb7ff9416cf92e593fa2cf86d7b2514fe1a4249dc436ee7a985ce607729914c796f23 SHA512 e3721957e6ad93db7a0b3730ddec083f78dd83968fe881d314c1ea802c519f4b4faf5a4ef5704cf54f15da53daf182010dad4577705369463091e215d7346c60
+EBUILD marble-18.04.1.ebuild 2248 BLAKE2B e622a677351777436a7f289a140df55b73d506e66d336d7c8f8234e0a19cb7ff9416cf92e593fa2cf86d7b2514fe1a4249dc436ee7a985ce607729914c796f23 SHA512 e3721957e6ad93db7a0b3730ddec083f78dd83968fe881d314c1ea802c519f4b4faf5a4ef5704cf54f15da53daf182010dad4577705369463091e215d7346c60
 MISC metadata.xml 555 BLAKE2B ed7e086f8e61359a372578496b4fe57dc271bd0b55dac188774cdc91131771a2ae6b07846fb80c59205350cb0e806e67cb9cd66fc77b29cef6d81dce2f4bc286 SHA512 d686018c9a8e8ee6cfb4504506994d4fbdb75c615b866356f7280b5f6d6a49ad71539cacab5868ada9f67f2ab22a3cc89f78121034424ace4be98307fff2faef
diff --git a/kde-apps/marble/marble-18.04.0.ebuild b/kde-apps/marble/marble-18.04.1.ebuild
index 428bed2765e2..428bed2765e2 100644
--- a/kde-apps/marble/marble-18.04.0.ebuild
+++ b/kde-apps/marble/marble-18.04.1.ebuild
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index e0cdc1b89f21..3dc5353b1f50 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
 DIST mbox-importer-17.12.3.tar.xz 32868 BLAKE2B 12d8d215e019a65e4f81239cda524cde0ea16dea78ccdde7fc5c7cef12234b2771ad140e29ba9d96b277188dc43f2faebb98f7ebffe9aa12b92ef5d69f777d0a SHA512 018aaa5f533dd70c1e11b164e9ea948dd04b31d6747cd879ee082fe0544b32a5d5223e9708d489c96b1b95f662d549a207c336555a6e16c28cd57345d8d50bcb
-DIST mbox-importer-18.04.0.tar.xz 33264 BLAKE2B 9f29ecd9615b9261e2fb4b317678f646160738cf85cf9de1e3f4b18783ee8857e2cb41126da3bc1663970e6686c9964652f3be9bdfcaabc289f7c1727011602a SHA512 64ea206c86fb5df1fa6567d2e0cf1fd383e93a254c3c91b84b9ecf4a51c34183de5549e80a62e44a488938e3808bb5994847cc78e6a6969fb3963992ae942660
+DIST mbox-importer-18.04.1.tar.xz 33608 BLAKE2B 9e58a7b77051bd4bd552c793e3f79568be8af7bcca313c6456ed1bb08ef4307411b16a1bb5c72ccb02bb8451e79adf5e51335e81e6581e94573e9f6bf232a433 SHA512 29bd096e2b50c849f0b94754ce283aae5b80abd17179afc6c1c013e669eddaee5e4fbf2bae9304cf0ccec1dd2551e367242847fd14e5b79c265ba5064742f3e9
 EBUILD mbox-importer-17.12.3.ebuild 825 BLAKE2B 11afb1b2de82dd61e9d11e97ce26ae6bb992e7258a35e54a81af71a0007a377f31e0c26ca4bba99cbba271788b817f911fa4b49806d189527343aaa0e545c592 SHA512 bcef7a6cf789a20310b5de726944689465a4bcc1263b0f65f4c3f8463834ac1e9fee9024745ed1b0a364b05a2edf42c517f687681f6158bcc3a1ad36cc71a8ff
-EBUILD mbox-importer-18.04.0.ebuild 827 BLAKE2B 9a2ece799fd5f1526a24c0501844b31e3933000040e426f1ef466e5f3b4a89384e2ff75ae749a1dae030d9c388ed5c2911f8179474791112e56a8a51aae55314 SHA512 c18b40ec4b237a9acf9f6d84f8bd65fe1fb65a23f3996a45af1399b7378352fcf4bb4cc387fa8b5e4e1e055e73eb0edbc69bc566ea0f6bbc2a9524113207a8c3
+EBUILD mbox-importer-18.04.1.ebuild 827 BLAKE2B 9a2ece799fd5f1526a24c0501844b31e3933000040e426f1ef466e5f3b4a89384e2ff75ae749a1dae030d9c388ed5c2911f8179474791112e56a8a51aae55314 SHA512 c18b40ec4b237a9acf9f6d84f8bd65fe1fb65a23f3996a45af1399b7378352fcf4bb4cc387fa8b5e4e1e055e73eb0edbc69bc566ea0f6bbc2a9524113207a8c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-18.04.0.ebuild b/kde-apps/mbox-importer/mbox-importer-18.04.1.ebuild
index 7e0ab68ff2a9..7e0ab68ff2a9 100644
--- a/kde-apps/mbox-importer/mbox-importer-18.04.0.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-18.04.1.ebuild
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index c7cbab81ff87..a93eb0e7b8d9 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,5 @@
 DIST messagelib-17.12.3.tar.xz 10462804 BLAKE2B 4fb020e5f351a14fa73cd8a648440bb2da8b9658fafd36fa58b7499726bce480e5d452c64a3ca5cc2e8b99596088b858601dc97311bd3ab6b8fceaf0ac2738f3 SHA512 db83fe6de67a4fb2a805d8aaec8de6455509868e1bf664bcd5a3f6d25ec100dce71ca517d4de11c9bacaf194c2dcab78b83c15ef0d0eb82a789ad1af5a352412
-DIST messagelib-18.04.0.tar.xz 10481152 BLAKE2B 37112b53ac62bddb9b20bd63defcf8d203327936393b52c01cffcf15161c6d642dbf9265cc024ac70095d1408b9f00c136af4c48b2920eb3747bf2bee3dea49a SHA512 d49fdab39e7a574b5b6cbf4977f7727bcfb10ac9225efe10a96157e20115c21d295000a3d45783d96a56a73c3d9cc36b024b191d568ff3c5a7e6a056ab8bfafd
+DIST messagelib-18.04.1.tar.xz 10469836 BLAKE2B d1ca1a54292bf897677a2c5f82ff98ccaa0c3a1c05d8ba14c698723edc341a32aea94e625267083879681e9a17e9cdff98358387da81dc8143b1ee6a3508a5d0 SHA512 ffe4b9f90f0fc2efae945fc86b302a4e390bff7583c10149f2cb20f71f8b4d7ff32da8974065edad54814ccdb323f91127f15e558130b7a2b721dec254a2b205
 EBUILD messagelib-17.12.3.ebuild 1937 BLAKE2B 2237b3b9c9742e7db917847cb813d8a84ee64de76870e5a3c5cb2400b2faf67fc63e5c08ab68d436b02a4e0500bd847c32e915eb01c1c17914a32907505ea6d4 SHA512 29b95b086b5e8b2a4edb98b10ca1b7b7d88afa8f557496c7a88557631b6fa47c05085e7e7a234a6fc8df2319eb8aba4e9aaaaa405530925564311f54038ddb77
-EBUILD messagelib-18.04.0.ebuild 1939 BLAKE2B 5a13ce58b75c27ca9a4f3410bdb2e6535db06202e33feec882dcf0d6c827f916bfcf900a92b15b4bf406bae13376de0ae77ac3711a085b10c6796ca826c4c878 SHA512 692d1b92a062b6a67512c415fd7341070c1aa44335bb3e637ec3e73f4ea5836e891428ba5f80e5cc9ea2e1601ee12eda73f243eb5d798d6d458882c677c570cf
+EBUILD messagelib-18.04.1.ebuild 1939 BLAKE2B 5a13ce58b75c27ca9a4f3410bdb2e6535db06202e33feec882dcf0d6c827f916bfcf900a92b15b4bf406bae13376de0ae77ac3711a085b10c6796ca826c4c878 SHA512 692d1b92a062b6a67512c415fd7341070c1aa44335bb3e637ec3e73f4ea5836e891428ba5f80e5cc9ea2e1601ee12eda73f243eb5d798d6d458882c677c570cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-18.04.0.ebuild b/kde-apps/messagelib/messagelib-18.04.1.ebuild
index 2c9ae95e4387..2c9ae95e4387 100644
--- a/kde-apps/messagelib/messagelib-18.04.0.ebuild
+++ b/kde-apps/messagelib/messagelib-18.04.1.ebuild
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index f2ea4d97865d..236a1b1896d7 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,5 @@
 DIST minuet-17.12.3.tar.xz 27860148 BLAKE2B 20d897fbebe844fd77da3c1cffd94c021999263b434507a2bc73ce5c2a7e3d0823c2f724a6d51450fbfbc450a72a66cc4823d6c350090372280b51bc5f3458c9 SHA512 ddba91a1d8165412099bd60cc06e57db70b3aa6997bb93c9e3c46ea933df728836cd59f24a2b7ff1e1adc71e802a0c237ea90a72012bbee79c6601f73e650dbd
-DIST minuet-18.04.0.tar.xz 27859352 BLAKE2B 33062189663680105c8ad76c54e2c265cf2979663926425f225bf2ce1756218e2e86bfea954fd963112bb342a4d6a85afcb07f2ae26d31fb7752ddd3ae89f139 SHA512 95eb9712ec61cda975cd9c815423dff21cf5d0e9b1f3c1c1ee5bc1926d78c033b6b631256052cc72facf70ade3d32d8d1a9044e4a0038a90b8dd2ffd91f82e86
+DIST minuet-18.04.1.tar.xz 27850616 BLAKE2B 69ebd5d91ce423bcb34c260b9430f6e330db1123a2c14813f3b232584c8fc5fdf5093f3c775d18341fdda8e0910108ed20bcc424b13300c8ea4a5939f6612c43 SHA512 03d5586d4c48168a64376c593d4d154c536bbe4215f912009a881e76bf472892036ff940fdc19b558074067c7e75ab0571eead8f6d957004e06cc252515dea4b
 EBUILD minuet-17.12.3.ebuild 586 BLAKE2B e62f58a2382c54cf41dbf6f476c22f6e51ad0d93c42fce1718bcccfd91d0a6825b988d2b906d6865d8750b748c1e0005d58a7e60a8debbf809f3db8cf8e1544b SHA512 45d18600f13c35676b18976ebed1cc6d6f447730ac50e80b9b0d4de05b56f31eef1433c8b947999d8d7da724afd4b78bc9481a32d7f254ed65f3863d1bbee730
-EBUILD minuet-18.04.0.ebuild 588 BLAKE2B e9be0a1f2b0971d041ec3cb99dbf250ecd862421adef49d028443d1a94b8861f137683a791b0cae25d194bd9c61414efe428821a5a63e34a15cb4c402173c7af SHA512 9315c52f7b0bba2f2764cffeca373edf4ab5d709b4f5e6238a910f5019f809c430535452cffed512ee0a70bf605773a91f9abc08ee20a74c5bedf0e87fdc63bb
+EBUILD minuet-18.04.1.ebuild 588 BLAKE2B e9be0a1f2b0971d041ec3cb99dbf250ecd862421adef49d028443d1a94b8861f137683a791b0cae25d194bd9c61414efe428821a5a63e34a15cb4c402173c7af SHA512 9315c52f7b0bba2f2764cffeca373edf4ab5d709b4f5e6238a910f5019f809c430535452cffed512ee0a70bf605773a91f9abc08ee20a74c5bedf0e87fdc63bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-18.04.0.ebuild b/kde-apps/minuet/minuet-18.04.1.ebuild
index c0bd89a53dfc..c0bd89a53dfc 100644
--- a/kde-apps/minuet/minuet-18.04.0.ebuild
+++ b/kde-apps/minuet/minuet-18.04.1.ebuild
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 8dabb372c37a..261c2beab477 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,6 +1,6 @@
 AUX okular-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
 DIST okular-17.12.3.tar.xz 5737804 BLAKE2B 959f83cbf7713333319400abefe70390b75bd1fdf5d907c362e4e36d65fba3115d6c4091ae04c2058e557a6df1a8587cb5adbfd345cc4702439db2d837d4ed2d SHA512 803e69a918a385798905eeda15afa817ff145406947abc793c62c26879ed9b98ca601adedeb5133972be50e679cc31cc2ad8ccc97c084c64a3cad791a778d361
-DIST okular-18.04.0.tar.xz 5777760 BLAKE2B 421d16d2e28fc996b96f6572abe0b251d8b935f62a4f1d2337d85fe63aa71551ef27aa81dff6e4cfeb5b6cda1e386b4e7661a2f5ef668fa3367d543a819fb4a9 SHA512 01ae6f4f4370e16fe67b04837e2ff4000d12d0934ae4c442d137cc99ade2dfca376b4b630aecb85a8efd727801f13fbef432ec37a08dec86739c994e202c79a9
+DIST okular-18.04.1.tar.xz 5784656 BLAKE2B 9a3570bec7ca7cd20d8474d9d1b2c00c95681dd1ca677f70313cb71a4294cae5d3e2db970112859a5dbba79df610ba8d47e0e677096c36a0fc0d65f6b5f5f172 SHA512 279b00539a2ea65e9d93eb6b73b3bd68e3468758c35120f4e733708d6b9a36eb5653af1d23cbb4d4ccf36a1bc143fa9e6d385d813c48292103056039addf3e26
 EBUILD okular-17.12.3.ebuild 2898 BLAKE2B 20461830de043ba6ebae2e954b183d8bafc534e70198d184246bff9154313147b283259d23321569ee6276ad13ddb0d7b064eaab0b5f636c8570b72d5fd9c001 SHA512 85d87372e18d51bbec5b08c4e7fe4dce0eb120a721f47b69c7f53252e4884193a16b4711133af0316417e4c9c1e546a505cd6cd4d1ff7dc7b21a0c4db31a8e9f
-EBUILD okular-18.04.0.ebuild 2930 BLAKE2B 8407385022004fed7420d19c0d4bfa5eebb810c52a3dc49364afab64a5e50d294f3fd217b33faddc922c53bd9c7266398172f4b480e32171bd10658d0b61fa4d SHA512 09380bae4cd247fcb9d95e1c6edf0c9acb8e0c96af227eb4bc97f391c5eb18ccf851a7c38c636ee8f368da51e587c7d249e1e5647b2cf5e1144bb6899aba8e44
+EBUILD okular-18.04.1.ebuild 2930 BLAKE2B 8407385022004fed7420d19c0d4bfa5eebb810c52a3dc49364afab64a5e50d294f3fd217b33faddc922c53bd9c7266398172f4b480e32171bd10658d0b61fa4d SHA512 09380bae4cd247fcb9d95e1c6edf0c9acb8e0c96af227eb4bc97f391c5eb18ccf851a7c38c636ee8f368da51e587c7d249e1e5647b2cf5e1144bb6899aba8e44
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
diff --git a/kde-apps/okular/okular-18.04.0.ebuild b/kde-apps/okular/okular-18.04.1.ebuild
index 94de9fbb3559..94de9fbb3559 100644
--- a/kde-apps/okular/okular-18.04.0.ebuild
+++ b/kde-apps/okular/okular-18.04.1.ebuild
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index cff2fcbf4fd3..35e1e1ac4a43 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,5 @@
 DIST palapeli-17.12.3.tar.xz 2061492 BLAKE2B 677f29453a22a4f48b842f4c8d368251344cf9cd2cfcfee0b3e2fd6aed315a2879e6a6c86003debf2ffbcf083a9b1164171fafc14691df953f909185c74a8edd SHA512 7c43d9854fa8d27290b97d8fbb56594ca45593d80ac029652ed355c0bd59eac3c73d0b226a91801a7dd62c76c41a53783dbfbc62238dc26cd6bf3aad3aadec58
-DIST palapeli-18.04.0.tar.xz 2061472 BLAKE2B 5e26c33ac0a246e59d870156b6da5a696fd731b694b92e03a7f6f8ce4cbd2224811bc342d2a5183b9686c0d88a6f5fcbabfff074ab8024791e25ca331ee8069f SHA512 34cbdb5718376f0d13be64e2cce577377353e0abe8dacd7e4654c9bc34bf7363e4611e43386722f196418b640df2c2cb90347e57fef04090ad3b9f3096e8203f
+DIST palapeli-18.04.1.tar.xz 2061720 BLAKE2B e0e8d724a79e38afdbeee7db4f059040a14a7a429af278ef37d33580ef0a2735a2d894461885fa38ba4498d9f48db76b44f1f422fe79f23c4691a9f5bd4d475f SHA512 9facd3f93bdcdb5ee33e9f18a24a059a780311ce7297dbbb207b4689d7c88f925a0b32b5a6c0a7dbd9dddf7cfd1dd5bbd5aec0459249abb8fe65b5cabea126c3
 EBUILD palapeli-17.12.3.ebuild 935 BLAKE2B d6b5a0c2e8e1174f8ad344c1160ef01efc80dbfdd801a2f41521b870b64e4615640c86aefccb24372e620bf6d61dab3ab0ed6a03b6746d0f7794bebcbfd9e079 SHA512 c019e484efbcba665f5a0848132555e341f9447964f2c2d35d963c146b082aa829c98cc87367d00356239a65032a82b48f7bed9a22ba7cac442061cadeca32e6
-EBUILD palapeli-18.04.0.ebuild 937 BLAKE2B 57aef5a7c39f7945679db1f5bca34bff7d08ee04adee1e14197de68ee3fe7ca07989c6e1267018404b418ae0ea6a4b29bc321c0aa14a17727c606ac6d0c5486f SHA512 ce341d56efa545e4ea7f4cf8e71fa17d77e39ab14cadc8e6941d20a2e8c800bfb7b0072847036eddb2b495d34be81738573ee4c428db2bcbc365f8bd919cc4c5
+EBUILD palapeli-18.04.1.ebuild 937 BLAKE2B 57aef5a7c39f7945679db1f5bca34bff7d08ee04adee1e14197de68ee3fe7ca07989c6e1267018404b418ae0ea6a4b29bc321c0aa14a17727c606ac6d0c5486f SHA512 ce341d56efa545e4ea7f4cf8e71fa17d77e39ab14cadc8e6941d20a2e8c800bfb7b0072847036eddb2b495d34be81738573ee4c428db2bcbc365f8bd919cc4c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/palapeli-18.04.0.ebuild b/kde-apps/palapeli/palapeli-18.04.1.ebuild
index 40ee410a23a5..40ee410a23a5 100644
--- a/kde-apps/palapeli/palapeli-18.04.0.ebuild
+++ b/kde-apps/palapeli/palapeli-18.04.1.ebuild
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 3c4950932b4e..7ad1bc0f989a 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
 DIST parley-17.12.3.tar.xz 8826604 BLAKE2B b24d1f7fde26b78c4d7abcdc18994a09adc58a29edd6123c8961d2dc148aa1adb82b0791e98dd4f4f588acf2400ce64b7a911334909b75deca07cfb0dde5dd84 SHA512 301e87605e754aaed520fa1bf96a7cf23b0c0a6523ae59817a6b14a8f69d3689a8646437e580a3257f42b197e6c7f899593cd242e9cd44ea1cd135327e83885f
-DIST parley-18.04.0.tar.xz 8828880 BLAKE2B 0c6d5327ee90c38665c3a6ba624301b3e34bfed752153bc4ece443c46a3f9d56bdc0eba8211fddccc555eb2fcc59d87f8d66b2150432fd821416f1913bd320e3 SHA512 29db546947d7773ed50c3810a64343c1d4db0b89fc92f5cae361bb173b072cb880a87207c0b39ec0527f3f3c13e09f39ef847a18820daa63e57074135e6e7468
+DIST parley-18.04.1.tar.xz 8829876 BLAKE2B 3f5fc818f0a24c8b2c6d762887ee09e4bb076b67f0110975a0e81fed040703c6b494e21e8b1dc80914791a3ceabe89cffefd798c6903485b407c4971742b4f3d SHA512 6c8ae2bc47c75690dd410cffe9be56f2bb4b012563b1bfa6c14333473f29b2d56dc3f9c61ae667a9bc2c456c66353eb4c58271b1332638e46921fe1e1ae6f4b6
 EBUILD parley-17.12.3.ebuild 1255 BLAKE2B 2e0d0fedb3759793846d8f2c4e7a25c8a9bca996591a1baf1b38eeca9ab23de3565f6310c85ed404e4b08bf32d22a05e98462cc5af6546a8fb70902f54927520 SHA512 6a1dd8f607503b55fa87cb6b148559f631008a741453703264232268a83f632f5fec0baff9b71c2002defefe5f92594fcaa883867f884f00558ccb9fac6ff952
-EBUILD parley-18.04.0.ebuild 1257 BLAKE2B 094b00436dac68f3c5899f9f70f97433970eddf2d48ff34b90621f3777e77c60ff9b6d1785827dd9075e21bd50c7946bb15a6019d0d931cc519f75d0ae41f8de SHA512 68bf20bcc3ae12d15ab4b3297fc3760af9da33b09de58993db688bda01365301fe958063cb37a1935d3a89efa2fef82082b9f9450f9267e6a0c2377839ca4df3
+EBUILD parley-18.04.1.ebuild 1257 BLAKE2B 094b00436dac68f3c5899f9f70f97433970eddf2d48ff34b90621f3777e77c60ff9b6d1785827dd9075e21bd50c7946bb15a6019d0d931cc519f75d0ae41f8de SHA512 68bf20bcc3ae12d15ab4b3297fc3760af9da33b09de58993db688bda01365301fe958063cb37a1935d3a89efa2fef82082b9f9450f9267e6a0c2377839ca4df3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-18.04.0.ebuild b/kde-apps/parley/parley-18.04.1.ebuild
index d059e01c325e..d059e01c325e 100644
--- a/kde-apps/parley/parley-18.04.0.ebuild
+++ b/kde-apps/parley/parley-18.04.1.ebuild
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index ae6bc745d36d..1fb53092e796 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,5 @@
 DIST picmi-17.12.3.tar.xz 1147600 BLAKE2B 9a09704d57b93e6e8ffbd5843570f9c6ab407c31a60313f9c4119aab97237b348b17ad1d8cc1437a664f05411816e91e8870694e8aeb09e9275e3327e0092f5d SHA512 06fff4d49e4e2bea3aab3c0ac9d06552acbe1b4e006ed79d5a1f10c31f4f7255bf132fe6149451536498959eb90fc7dad3c20396f783efe5c16fecb2b4828647
-DIST picmi-18.04.0.tar.xz 1148192 BLAKE2B 4261580e642a587382895372b4085f6114fab149ca66d0d1252a9913c1b35cf3cae4b3ec4ed9c052447d5d7015729d2028955dd6f9e86fc524ea709c23ab8b90 SHA512 522605f350ea6539ecceb5d1b2198c19392e5a12077f093ddb386890714bbefbb9d6cfc534fb6016cb04af065d62bd2a44a2292390b4b51fba11328d81c9423b
+DIST picmi-18.04.1.tar.xz 1146724 BLAKE2B e123227323c08406835fe099f2951bf774b5484e50ec54486ca1d9c69da742e9c40f014e0e268aa04a3dba4124cec2bab715f234b8ca251538e4c20f7381dbc6 SHA512 e4f47a4f7ba91b899981b15e67b2b450afded880c28f578c9c19e662fe1a74ac768d5307680e0fc59dcb91384cc2cf6c7addbf76ccf5e3c68c478c5c267d07b6
 EBUILD picmi-17.12.3.ebuild 845 BLAKE2B 724f2fc96d2c3a5ea5aee9e9f745e2190c7b30d3622f8810ced762021488873373cb33a37675d0c50d22f1c1a2ca6fe9c483773fbf704dfa40a49f667dcf9826 SHA512 3734ac1dad577ca724d2a7136512cf4c5e99be5f998ff2be871169f3d80196b88c6af53a1ca7e9b5efc8983e418211bc604af7eae4b2b24d0087ce29198f5aaa
-EBUILD picmi-18.04.0.ebuild 847 BLAKE2B dd6afeaa9bb3bce256d0cc34cef6ab1f47db8d08e1c79596373de2145614ec107b8fe477abed8966cbd836a25145fd77dbf0dda5e1a4ca4b39616d5f8019594f SHA512 07c00e401719efdc9e9be168aace9dc97521465cbc19b07268a776637f09ee403a58837221fb0bbe1631b02bd7d52a518a3d8110b7a3af09621bfc44094c43bb
+EBUILD picmi-18.04.1.ebuild 847 BLAKE2B dd6afeaa9bb3bce256d0cc34cef6ab1f47db8d08e1c79596373de2145614ec107b8fe477abed8966cbd836a25145fd77dbf0dda5e1a4ca4b39616d5f8019594f SHA512 07c00e401719efdc9e9be168aace9dc97521465cbc19b07268a776637f09ee403a58837221fb0bbe1631b02bd7d52a518a3d8110b7a3af09621bfc44094c43bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-18.04.0.ebuild b/kde-apps/picmi/picmi-18.04.1.ebuild
index c25ff58b234c..c25ff58b234c 100644
--- a/kde-apps/picmi/picmi-18.04.0.ebuild
+++ b/kde-apps/picmi/picmi-18.04.1.ebuild
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index e41738fd8d27..9edf6880b3cf 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
 DIST pim-data-exporter-17.12.3.tar.xz 267124 BLAKE2B 6c515327b444c9a7ddecdaa4e13f8d2c7f674a6acd1b2d4a5e314f330bb9e505112bad52674639f4a1f2f1ed29f5c5903b5eeba62578b49354a7feea0005fc21 SHA512 e0dd0fd6356b668f662afedb64d3fb9ed68da9b869635b7773bcae23262245e4b3246e0eec9b4e5bd45c28c506a0e54cea5819556bc1681378417830de458a0f
-DIST pim-data-exporter-18.04.0.tar.xz 269208 BLAKE2B 118dd043eac223d192b0fd622346abb104218ee8173a3ed0826515d22de6aa22351c261dbc126f302f68b930b04a50019ac189b3c1d9959b4ac253050a332811 SHA512 c60dc276e154b7003db30dbe0d3ad8a475c3f09a99909d707a024a734ff4435ae893a9ed84867dd56942602b0e3c7dd58d42a1bb2b3d45a6f2c90076284e292b
+DIST pim-data-exporter-18.04.1.tar.xz 270208 BLAKE2B 575ce187da803ad2a47826fa0efb87abecd0888103639104eb49fff0937be62fb88b2d05264d9bbbb9d977cc163eb5d27140b3d2d94fd7a37e7f3852153e4744 SHA512 daf4beb904a2ac3061367b93bbd9888c7a1ae03951ef41b72e42648a139d2f61400b5c2c45c135004167383a217b5c88d03b38cf9cd978cc26ddd78c0651e6cb
 EBUILD pim-data-exporter-17.12.3.ebuild 1233 BLAKE2B 3d01b778d211e289765ed9cdc2943d4c05725fac2585ace174b413b699daf23e2898fccc0a99f8901ebb57a68398e9f9919d5c313205c0e56845eb79ea0bea05 SHA512 da978bfb6782f9ba3b95e453ad1b001da34ae6758bcc0cf1bfbdab98539a7b644f0b24191059c25041148dd85ae2ea8681452240248c1f550ec2f5e885fc3b7f
-EBUILD pim-data-exporter-18.04.0.ebuild 1214 BLAKE2B ee29f508cf6d59c9df144775e0c690c11363e5e5cbd8f86c69bbdc524da3ff948ae7cf658871f355c0a0950c484bb058a79c00eceec9fd7684e6a4a243176216 SHA512 27af2c79e3b61d5cd352ff791bd6fb5b7f2d7a8451a8de11bbd4ec9fc6664fab6796c8e8fff5fb2fa27dcd930206bc35d438d5a62d855a414e12ce62872684e7
+EBUILD pim-data-exporter-18.04.1.ebuild 1214 BLAKE2B ee29f508cf6d59c9df144775e0c690c11363e5e5cbd8f86c69bbdc524da3ff948ae7cf658871f355c0a0950c484bb058a79c00eceec9fd7684e6a4a243176216 SHA512 27af2c79e3b61d5cd352ff791bd6fb5b7f2d7a8451a8de11bbd4ec9fc6664fab6796c8e8fff5fb2fa27dcd930206bc35d438d5a62d855a414e12ce62872684e7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-18.04.0.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-18.04.1.ebuild
index d6967027d499..d6967027d499 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-18.04.0.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-18.04.1.ebuild
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index b709d7128140..f47b5b33ae19 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
 DIST pim-sieve-editor-17.12.3.tar.xz 444364 BLAKE2B 621dff6212eb50b328ea5a559cff3322fb7a7e22d7ad33937c0a84e3bd4af5b519e1c1abb4a5586e84b042e4f0d4c39416aa0e8404ebc786f400747c85533e3b SHA512 812508b69ed0d4f0d2312cc74a3f800a06246e0984fcde386fdbb9e9a4ba949dfdb8c41a88f5a6d01d4f4c0c019a791a1c72edc50f446dcd9bd68a18c6623bd9
-DIST pim-sieve-editor-18.04.0.tar.xz 445536 BLAKE2B 7fed134fc7381a43e121e21da66a054460ec1600839ffca19f6d1c7fb2ee6fb92333dddcef9d9819c15bc8a3685c8df65d68e07209c2233954bbd0ae2a07bdf8 SHA512 1feac4310a254ddee7e0bfd47bd6ff7c8c106d803cb30e9b06d0a8cfc5f509e183761416c736ab30de039e6771d83c3d155c7e346574e135be65ceea2a7c766c
+DIST pim-sieve-editor-18.04.1.tar.xz 447240 BLAKE2B 06e7441a82349c329e1f0c7b5a5073964918c9a0eb25876c97bf0127eb0d064419cac3fef08bbc86ef63c2c09a62262da59aa5687c4036915a51de8353478500 SHA512 ea7b8df60afc6540d33d2f74677d11a250557c0d7fdefc4f66a969c64b6ded02112f203df2e23bf70eae897911158974452606dc34ad93adff6d792cf14b2201
 EBUILD pim-sieve-editor-17.12.3.ebuild 1147 BLAKE2B 1d382e5e13a982287274b27772e0250fff48428528e706571632cfa50503ce889b8ba4d26472c4168fdbc8c790228de9c2d7cdf87e9ac84601a94eb9b775d268 SHA512 5e496bc3fc0e16dc80eebcba13bfc3a4b0f69d0a166965bbbffe1eca523eb14619d50d61ee95320a11cf4e15af41187793f691924d00c700c71199c6b9bc7269
-EBUILD pim-sieve-editor-18.04.0.ebuild 1149 BLAKE2B dd7bccd086023a6ae4577ce85173e664cdc9d70c380268355f772e00d45b106d6977f280414e90bb6b13900463469f48e35d00fab154eda674d6f4d99b0a6309 SHA512 2cc007e8ef84d2dddad22bba7ad9316b04e4d90b707d3d55f4d4cf74909bf66d0282c474a03975b28fe299f71b564053a6e4358670ea89ffd37a7b16f167141a
+EBUILD pim-sieve-editor-18.04.1.ebuild 1149 BLAKE2B dd7bccd086023a6ae4577ce85173e664cdc9d70c380268355f772e00d45b106d6977f280414e90bb6b13900463469f48e35d00fab154eda674d6f4d99b0a6309 SHA512 2cc007e8ef84d2dddad22bba7ad9316b04e4d90b707d3d55f4d4cf74909bf66d0282c474a03975b28fe299f71b564053a6e4358670ea89ffd37a7b16f167141a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.0.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.1.ebuild
index 844361049fc3..844361049fc3 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.0.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.1.ebuild
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 83f8aca4e8f5..f00ba1a23e47 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,5 @@
 DIST pimcommon-17.12.3.tar.xz 287564 BLAKE2B 862d6bea6398edffca88f78901f8c59ab8721b210cd9d4e7e73f16474c7c58357977981d65a808b2d02501927257e96990b79071056e86aad08d97d23491569d SHA512 79aa5f3b7d61de547a07ef659e1a7d0b2c456010cb7ad929218853d5f1057a97e5a0e2d1197cb50a1f5bb201b3702efa0e3e1c154d530c49ebe51578d2690df1
-DIST pimcommon-18.04.0.tar.xz 294388 BLAKE2B da856103d50a2502d138a16d017b49fc98307949c2408ea8b6e2c80adb311dc9a137291a312ae53086ba984b2c07d491540744c86696f82e7179d92ee6861693 SHA512 cd9cd90cd057acdc675780e1ebb0ebe310b122f7d9e8cd32d48ba7e53d070d9ee2a3758f6159f82f10786f2b01962e92631d1d549578bb5630780271dbd3caf9
+DIST pimcommon-18.04.1.tar.xz 295476 BLAKE2B 035688a22c3a093f081b942c945c9966e2c157fcb1203c10f5bbef4eb812ce28ba4f7a3228dfb0545d3e2a2d6c1a9fd1b6da0f3cfc25c0a71893ee9c9d394649 SHA512 26ec50fbdf7520f190ef7900b0d9181f8cdf1b5d0f35bbaa63ece9534e67aaebbd171b52d974d3d0f8c54ef8d28e15d343b6fc6b361269fce458e01c57a76278
 EBUILD pimcommon-17.12.3.ebuild 1459 BLAKE2B 85c6ef7e1ac73a542307bc6178c9ccc71e53e4ad0da21ae809f1a55c3a372af0a1cb2a5d51c7a32631ccf53aadb2244306742526968b2c723953e56f66081cf9 SHA512 42388f17e049e53efdb3209e43c522073559eb7be6f289cd273a6d1c518cbefbe8241b30e31cc53b2aea2f0da79293e081f4ccf79845144dfc9124e38d516a4d
-EBUILD pimcommon-18.04.0.ebuild 1461 BLAKE2B 1e9e2decb5d661e13a23511c10f3038fb4422cdf972f5b0367ddbb75ee2ab6e444f0380a8d1c1d5e40e4cab1b1a22a938d03abd2e2a94486a34cea90e3efbbbe SHA512 c220857379e90d1c470057b13b503679ca7f4c488765382990f72836b572a57ab0633a4c0498a1a6d0e221dc88428b14ddb0cb3fea387a3456945cfd49ed9ca1
+EBUILD pimcommon-18.04.1.ebuild 1461 BLAKE2B 1e9e2decb5d661e13a23511c10f3038fb4422cdf972f5b0367ddbb75ee2ab6e444f0380a8d1c1d5e40e4cab1b1a22a938d03abd2e2a94486a34cea90e3efbbbe SHA512 c220857379e90d1c470057b13b503679ca7f4c488765382990f72836b572a57ab0633a4c0498a1a6d0e221dc88428b14ddb0cb3fea387a3456945cfd49ed9ca1
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/pimcommon-18.04.0.ebuild b/kde-apps/pimcommon/pimcommon-18.04.1.ebuild
index 6295115f9d17..6295115f9d17 100644
--- a/kde-apps/pimcommon/pimcommon-18.04.0.ebuild
+++ b/kde-apps/pimcommon/pimcommon-18.04.1.ebuild
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index 51c1499099b7..878cbd859a0f 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-telepathy-meta-17.12.3.ebuild 936 BLAKE2B 8ba54ecd638b9340f9d950f4a2288d975c3cfbebb2fb9bdd1038e36f70f7156346085aa5c8835eca823fa772856ecdfa748e8fa1277df16befde03790c3a3f96 SHA512 7f6648e8285f603c0d3ace3b178262fb3d76a47dfb4dd65e68aa2d31326f785183b4fead521bd410c75ad65161ed94cbb0c0e09583eda6bf27f8075f225fc47d
-EBUILD plasma-telepathy-meta-18.04.0.ebuild 938 BLAKE2B 8db0a9c7f43f15bd87173c274bda17aaf9a8d608e761c786e023e580c3a0e2abbf9366744d6777b3a64fc5152b721b2af31356e7b906a28638c9cdc7755e6b59 SHA512 dc03d147befe8be681fdf9839bcca74e14c7aef11d6e6b371dfea235e57c9ade24245f1205f0119fc4210888a8bd74c487b275104803edba1243886a82db2124
+EBUILD plasma-telepathy-meta-18.04.1.ebuild 938 BLAKE2B 8db0a9c7f43f15bd87173c274bda17aaf9a8d608e761c786e023e580c3a0e2abbf9366744d6777b3a64fc5152b721b2af31356e7b906a28638c9cdc7755e6b59 SHA512 dc03d147befe8be681fdf9839bcca74e14c7aef11d6e6b371dfea235e57c9ade24245f1205f0119fc4210888a8bd74c487b275104803edba1243886a82db2124
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.0.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.1.ebuild
index c133533744d5..c133533744d5 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.0.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.1.ebuild
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index b5d1130e6396..4e7d8aba5909 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
 DIST poxml-17.12.3.tar.xz 43004 BLAKE2B d6a29c953c091cb7df6a181285ed1a9376db87be2617b00efe9de56ae6bc06d11522a0fac69a7a4d1e2b1a085227c0e17935bb1ff0abca6119bb115b72e2a952 SHA512 c9b45bf37c200b206ab4e114964d6dfce941f974f56d2703ce9ce5ea5314be0224cbf3fa1855d0e423b27b7ca1664a9a372f9322305c76b26bb340e9876a0e34
-DIST poxml-18.04.0.tar.xz 43028 BLAKE2B 5b6be8bc5a77e340c0a54697f0ce04c52447b469897839d7d0bf761ef0c2354353add06895702eea0b4b6dc4f0cbae189de1e4cb49e6a0c5e3735a913773d94f SHA512 670b874b0ee2b62b431c141d91da06619b735a9c2085dbb97485693372c4f8bbf9a9c4b3a68beb67670182630f4925d42fe7bdb0cb6ac4046dbd0d571623c43d
+DIST poxml-18.04.1.tar.xz 43172 BLAKE2B 98c139cc37d6027560ed19851c858bb8607949f81ef3cf06b2116e9bc28e4c4e3ea1a17dd78be5a09f8100008d3844aac611dbf5d75e9a53f55c3506e80a1a0a SHA512 ffca06f2594c02d1c7e08d46582f14a58867107316473e2d6b2b0b4a6b95e53a00cf1b9389ac83026bfd10b32776476202f86b9cc09faf6ca889293a8aabf292
 EBUILD poxml-17.12.3.ebuild 340 BLAKE2B 3a45ed2f3c9c6d5e8ae2fa23280ccf1e95e347eb220486ece8e9460db877e225f2f31a5906585f732cf4fca44a716f5b46526dd879db9c45cc22725d73987f8f SHA512 4efa4312b7453dfd5a86cfaf8b2ff1866f237be9cac5a28049d09b2a2b473c9061021f82918d9327c4d083a5513cd4e6a1029f92a87badab392d9df8d23cb55d
-EBUILD poxml-18.04.0.ebuild 342 BLAKE2B da47dd0d971b37d1a80e6791ecf18d17aa4b051914edf17404219f16a3f944f1f139d44c97b0375cb6ba57b1ca059b3934df902105e4744f45b8a017dfea6a83 SHA512 8271762279435f773cc4b7565d1afaa4f4a731cbdb4fee1e4e46cf0bb990e7ba6b7ed78a7f5e6ca8cdd28e4c83ada388fc76f60c2cc9a04d9217b22ed2860946
+EBUILD poxml-18.04.1.ebuild 342 BLAKE2B da47dd0d971b37d1a80e6791ecf18d17aa4b051914edf17404219f16a3f944f1f139d44c97b0375cb6ba57b1ca059b3934df902105e4744f45b8a017dfea6a83 SHA512 8271762279435f773cc4b7565d1afaa4f4a731cbdb4fee1e4e46cf0bb990e7ba6b7ed78a7f5e6ca8cdd28e4c83ada388fc76f60c2cc9a04d9217b22ed2860946
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-18.04.0.ebuild b/kde-apps/poxml/poxml-18.04.1.ebuild
index 3c605a013f0f..3c605a013f0f 100644
--- a/kde-apps/poxml/poxml-18.04.0.ebuild
+++ b/kde-apps/poxml/poxml-18.04.1.ebuild
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 2f6a56b18c64..186a841bb011 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,5 @@
 DIST print-manager-17.12.3.tar.xz 237128 BLAKE2B cc1a85c6ed2f160329c5428de7c6de562de7f5c3876fdd504e619801e8ededd792c8b69c9193a787d1600948f7fae3a62a7290e1e50ea5bf39475d9db9c9c66c SHA512 80e40c913da002beb3e473e0e6fa6f02b0e3b699bdc49c390435d9139f46b1fb3ffef54c042b5dc2a1db3b83da2f4f53377710b31281b0154f9654f605b95830
-DIST print-manager-18.04.0.tar.xz 238056 BLAKE2B 3d278db0084c380b164682e3a87f11308be7054dc07c05178027568b911e0dfa72334fcb7a54d2a4510d94467b08551d3ef9410a3d8dcdc92958096c6a7b3c1d SHA512 cceef4517d9bacf5a1b5bfb50f2233a824f0aaade258510e89ce712486e5c667fa79b78bf3cab9090276ec59ea7c0cb25b20d8d94f52c82aff5290f9ae55a65c
+DIST print-manager-18.04.1.tar.xz 238656 BLAKE2B 8f863a570e67931e16d1e3ceed3eeb8f4ed9e937254a31400359372b9c9688c928e98174959fa5fc81460946d827d9a51da397492a4eda552a3d9de0b6d096a2 SHA512 87a50adeb14b5ea64a28ff6e8c5f2434f2d35d51f26c29434b40755d626c75561da487d283e63c389a616b1c37870f429bc29e247ad7ece2d7116fe39bdd12b7
 EBUILD print-manager-17.12.3.ebuild 1439 BLAKE2B 81ab868d0134e4530cb5b9a998946c501eba943c17b2193aff153abd2197ff7974b0b1669b1ddf8464b2660bc4e0646ac0ca7692ce2b8bdfcce4a68c0ddae955 SHA512 6b9979f6d7aa30329cc0e272b7c7ad15c17bfeea61ff516ae4cbeb442f7aa3bfd42144ebff0e0219d45f67c72c37a9b552b4d10584b4be0da3ac49cc3e555e8c
-EBUILD print-manager-18.04.0.ebuild 1441 BLAKE2B ae4ce614d01293367cd277e0018874f25901aa90e82904701c3a4b90cc73ef96bf72d9b9804840c35a665f16ba5b5204cab1c82df2fbb45c23fde8a039907e97 SHA512 a47f846b9276a5b9116e2e76e595aba7688292440e7934f05f435c62009b6c6afa16d1212aa54f431db20e9c83f30579fda50fc801fb50af6df51a32edddc820
+EBUILD print-manager-18.04.1.ebuild 1441 BLAKE2B ae4ce614d01293367cd277e0018874f25901aa90e82904701c3a4b90cc73ef96bf72d9b9804840c35a665f16ba5b5204cab1c82df2fbb45c23fde8a039907e97 SHA512 a47f846b9276a5b9116e2e76e595aba7688292440e7934f05f435c62009b6c6afa16d1212aa54f431db20e9c83f30579fda50fc801fb50af6df51a32edddc820
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-18.04.0.ebuild b/kde-apps/print-manager/print-manager-18.04.1.ebuild
index e59f9d37adbc..e59f9d37adbc 100644
--- a/kde-apps/print-manager/print-manager-18.04.0.ebuild
+++ b/kde-apps/print-manager/print-manager-18.04.1.ebuild
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index fddaa5ff8a6c..6b097f25c3cd 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
 DIST rocs-17.12.3.tar.xz 1529908 BLAKE2B 2913e6b609b349c6b4fe2e08c41ba63c90f0a144676ec9dd64203f01ca0240b934e0de48e2e068dfa2c860be5bfdf4fcf883b27b1c11b7dccc6d832dbff520ad SHA512 5b90ed37b62ba5752843d0d9be46e5139fc7017dc5f620ad5bd07de10a6cb6acf601609edf5856048914fa11866045b2e1fcd859881dc6e9bcaf5239ccb2a6e2
-DIST rocs-18.04.0.tar.xz 1535400 BLAKE2B 921a4d9f7951c2f359feea3e5b6c6b580a4d570cb5c780d3f26d081e2688079b473b50e9b9a7dc31414b2c64b3bc1a557e1fda78eaaf8da35fda304f8a21fba8 SHA512 30ca7a0a3eae29472ca021c330bc9426cebf678a3d018f29b57d563e88379d640b4933b54c8c08724adc595e75f82a4c8de97c2a0f4772cdcb3195dd87be88c8
+DIST rocs-18.04.1.tar.xz 1535884 BLAKE2B 96eb12ef7831f3ab2cb91f2574f94f479b08472809d931d3d0ae4d8a9241b534f5470767130a53f58d7a8b678602c94e02f0f8a286f6c49454e4bb0015fabe46 SHA512 df96e1d1b21e065b38e2f054e51521b9113752491576a030bb65ec63b037dcaa81c9f9c1f0f79fa304c8755892dcdde3498424b743ece42991d6f7aadddb459f
 EBUILD rocs-17.12.3.ebuild 1159 BLAKE2B 26a466581221934abb3f2a63d4a953b1acce35d695b9a0b39cc4f4ac64a78f7b5b7506a9523aaa82c50777051309a24d94ce0f42a7163b5ff50100867ba8024c SHA512 f3d82947fe9726d008005ba100f062e9497e1d5cf714637a44945ba233d991b2c9e45ad9085cfd99ab7fcfaeb2c1c610b6ab770da542a35c8489f96f7f578f2f
-EBUILD rocs-18.04.0.ebuild 1161 BLAKE2B 30882ac451dd49a4fc551be55d678e659417d00bb10663b5a3607eb7dff79b270648dc53e61cab589505e6f6759b289ffc38bc779720de2877e386439aeb4ee5 SHA512 c98f2c0dba40578a6c1927dd3f5f6648c584e6798b834670314f7e668aef0c561d5ac5d082c186801f0caaef3630383618265f2e55dce777cefecc72ca1c91fc
+EBUILD rocs-18.04.1.ebuild 1161 BLAKE2B 30882ac451dd49a4fc551be55d678e659417d00bb10663b5a3607eb7dff79b270648dc53e61cab589505e6f6759b289ffc38bc779720de2877e386439aeb4ee5 SHA512 c98f2c0dba40578a6c1927dd3f5f6648c584e6798b834670314f7e668aef0c561d5ac5d082c186801f0caaef3630383618265f2e55dce777cefecc72ca1c91fc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-18.04.0.ebuild b/kde-apps/rocs/rocs-18.04.1.ebuild
index e20797a7baff..e20797a7baff 100644
--- a/kde-apps/rocs/rocs-18.04.0.ebuild
+++ b/kde-apps/rocs/rocs-18.04.1.ebuild
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index b6183da26933..aac4c52b22ff 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
 DIST signon-kwallet-extension-17.12.3.tar.xz 10580 BLAKE2B f5b674d99146663411ece436715330a990d15d19befaeb481e97669a9fc84c6e726deabb247c084e9761c713d98ad250ea2fa3cfc4996ab640d1aca3e9e27ea8 SHA512 181f990db14bcb7c2247a85dae98026289bfacf3f6052047c7d8590c3e756f06f072569c295d687bd3fb81a45796e6e2436665dd1bf233c0ec6e84bcd03c7588
-DIST signon-kwallet-extension-18.04.0.tar.xz 10580 BLAKE2B 3e327665058237d3118c7f2b8cdae82cf5009622b40632f65d9ed00a07c8765779e7601b295a0eaa9b54593f3f384e349e1fe47c0010225946eeff6c2a506ccc SHA512 d6c8a62aed70e4818db2cb55ad3caf01e5f9abd27f773383092b8748c7aac96ad9c7df2ae3728f6cee0d671a6504214b7c661c6bffb7419c3ba3d9f9ea40bb55
+DIST signon-kwallet-extension-18.04.1.tar.xz 10692 BLAKE2B d975d6fb95d88d19bd44330b15e5dd97fe7f0a1883b149446d150612cfb3ff5bb56f4015fd7c751dd842f408680aa621a51952272b744a6f8f083fb1818af272 SHA512 cdad756d33d2dd07d346fdaf011b0ca2173fbf9e10b7e44ec5641a4fba42adc0bd7f82bb069e5bde17337531752310ba6ac9d4419eaba2df4d4c7f03326af2ab
 EBUILD signon-kwallet-extension-17.12.3.ebuild 325 BLAKE2B eb4c69958966690f2a85381a81bd7934ab3cbf95711aa7cd7a3c6ae0eb71cec195087ffa317c1a67e9119d4d23886024474f886ab682363ad5b358c3d0aab948 SHA512 ee754c65c63ccde2b638292aea56815f5877c4adf88a1ae99c2a70f45cc332045bb6237e37faece50e0618c6f141af1fef66c9d3d4ae2deb1577455bb728bda0
-EBUILD signon-kwallet-extension-18.04.0.ebuild 327 BLAKE2B 0a3f7e51e8e27cabcefeb6237fa06c72f2f57be9fa3c64d689589a2cd6526ef09997765b6cedd21e41d7f607f3e80b2f361fa6f4018595212f6a148708f724b9 SHA512 b61412c9e2dbf34b877161d5b6f49509fc9610ba7206a248bb5bb1dd66c3799aea371321fa528258490ca0ec93d34192ae4112fd37bd8ccd0895cbb7ef9e48bd
+EBUILD signon-kwallet-extension-18.04.1.ebuild 327 BLAKE2B 0a3f7e51e8e27cabcefeb6237fa06c72f2f57be9fa3c64d689589a2cd6526ef09997765b6cedd21e41d7f607f3e80b2f361fa6f4018595212f6a148708f724b9 SHA512 b61412c9e2dbf34b877161d5b6f49509fc9610ba7206a248bb5bb1dd66c3799aea371321fa528258490ca0ec93d34192ae4112fd37bd8ccd0895cbb7ef9e48bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.0.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.1.ebuild
index ce5d29586a9f..ce5d29586a9f 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.0.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.1.ebuild
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 1bde7b37c842..802a9a993a0a 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,5 @@
 DIST spectacle-17.12.3.tar.xz 765132 BLAKE2B 824e2f260e6da5daf51463dd9f99d4a4dc405e9b3c9c1149cf8dc6dc4296ac7ae75d2dba7ca341c767b86ef0d6fac44a50cc644e9a8dcee469de7bd5f792e514 SHA512 286a4c4fb0a6d97eb31bed38865f2717b52c215074bee5dc4b5730ba607d6d25ce641d1b611e974178d33d6bff400e88cc0730c6249d21a4308d0092fcff3ef9
-DIST spectacle-18.04.0.tar.xz 1070296 BLAKE2B 2b73f76ef6a0d099bb71d4414940570cccf6380b9c3ffd413d492e9317a2d5cc29d6c6bba049347d0fd44ee23feed66294ac0541a16d02c39139276b2d2a52e3 SHA512 931e11340d59542b6093263fd0183f93692a9cf9524f241ddfd98c1d88a913481593a946e07b3a7bed11a3324cd9ab2e4180a6407181c2023e29e5f735c0c608
+DIST spectacle-18.04.1.tar.xz 1070616 BLAKE2B 3d835d0224eccf388bdf542d9003217a07f6adbdff955426261df8ffe1afa9366af2f3aa20312da9832a7ce5904c4f7a6ea68b9f58dc33da666e903f50e0945d SHA512 a85003842715f4e46a50da81f17403bd7d5e6ef4fa38d149bbfe30baaf9eee16251bc885821db7f14adb46453406bd3f07a64cadcaa11ab2cf919977a8881b08
 EBUILD spectacle-17.12.3.ebuild 1332 BLAKE2B 86737aa93d36446293c1f7d0526dc78cef05e1b345b913c7357d7b87568122c33a286c8aaa4745e6bbf0ddf173d82a557edd2594a13f388598d70c6d2ce0bd3e SHA512 ecee281e04b20758ed47c6f2033b9ed46d7f146b0581ffa113f185ad9d700cd03f76241478a4339c14dc9ec1c53c28e245a04dea913aee941b65110f09999965
-EBUILD spectacle-18.04.0.ebuild 1334 BLAKE2B 9ad5fb46992bb3e3fe8076aad8b68ced44610dbf45e7356d469bc82e02dcebbef5aeb57d1a646b15f814035390c603dfc4be6b33f17be31b1d12bc73674e8233 SHA512 22a664c150b210f0b2be8fa87838743b4d2e5b242db79572aef08f15c106e4bc114cad8f334eb452ce570af84bef952465a531d1f50996851534af86363a562b
+EBUILD spectacle-18.04.1.ebuild 1334 BLAKE2B 9ad5fb46992bb3e3fe8076aad8b68ced44610dbf45e7356d469bc82e02dcebbef5aeb57d1a646b15f814035390c603dfc4be6b33f17be31b1d12bc73674e8233 SHA512 22a664c150b210f0b2be8fa87838743b4d2e5b242db79572aef08f15c106e4bc114cad8f334eb452ce570af84bef952465a531d1f50996851534af86363a562b
 MISC metadata.xml 441 BLAKE2B 82a565ee86151104ad5c24329d7649230f817d78c9fc6a393ec028d4d92cb6e8c968deba9f3f344125da283a14eaf671a6105f548eee1051290530a2d33d9143 SHA512 674c31c3c5639f6ba218f5cc9342ec5a00b944212563db07dfd223c4897a3d1f315dc7a0735be7b30d75d3706e6355f3547cd17c9ab20e7387974ff1adfe5716
diff --git a/kde-apps/spectacle/spectacle-18.04.0.ebuild b/kde-apps/spectacle/spectacle-18.04.1.ebuild
index cf8b419f4a56..cf8b419f4a56 100644
--- a/kde-apps/spectacle/spectacle-18.04.0.ebuild
+++ b/kde-apps/spectacle/spectacle-18.04.1.ebuild
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index f030dfc907a9..93a069604655 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
 DIST step-17.12.3.tar.xz 862236 BLAKE2B b931d732c54467fefbf217326776b4ca664c93f384c11a8bed32c9084b5b31debf463645d5b1f697a62a6dc1f08a2e481246be25518cf1c526d58d0f29614a43 SHA512 40de257c593483bf1ddc84c76b8bab608d8e0ac49b0bd5acbb94a3f1bc6dba0cbe18f30d9e4d4ccdcf5e764a21209229b57abb8c3149dc9fca86fe00a732c4f3
-DIST step-18.04.0.tar.xz 862360 BLAKE2B ec64db5b55c19ab39266ccf084caf3a83afb3e739ed23afe51c79bcd0eb36541bf7b5a6649c54e6021b612ae1b48ef1dcb06022540e9c6e721dfdabbcc7a8da6 SHA512 c29b55a76627379d424eb5498e8cb8b98893e214440077c6df9b5d46d5dd3259ab6e9a37658fb811a42206f5a8aa4e5253a5227bb7fa64ac68fe7701d5eaade8
+DIST step-18.04.1.tar.xz 862508 BLAKE2B abf2aa2f6f56fa35d4750c96304a85c36d4ccc22c382fb2bb222ffac4d011823884b59c7214fc4f1d856509e442deef6105e6b22ed8dcddf3c866aee543e2791 SHA512 cc790b66ba845bcc97820c3a81d9a5899a3977c99108dd286d09f06b0b8e6f91e2f92440bd8404af584f026e8e3c32ff14b7b7b8acada604ea39fa4261a3c5f3
 EBUILD step-17.12.3.ebuild 1578 BLAKE2B 154226cbb51fc9a345ab059ce1af8c7a7d3cf3dc868f7f3992ee644041ed2010bf16579703c2f83bd1cc7b5fe28de727cd76a19f829796b8ef35da2ced0b5d53 SHA512 7d9dea75d6d531c4c649f059f3fd268b8107b9f57c4cf4ed6de11bb245a312e9892566ec07f1d99e41eb2bc3796f96312da4e2c82e35417cb9cb0b1719ba6e5e
-EBUILD step-18.04.0.ebuild 1489 BLAKE2B b3856e1ce092d3485e1cec6932a64809c17f989fa94673639561fe065c963a6c07a06fd14a2b75b7bc707c37d548dd8c58b1bd817f448531911dc91df0e089cd SHA512 4e42856ed4796035fc4fd318c42310eef2d3fb496ef4a69f3fdc4ef2043a281c4decfedac7095f5cae56a0f7ae9d2ad684d125850359c61228df2efa5e45957d
+EBUILD step-18.04.1.ebuild 1489 BLAKE2B b3856e1ce092d3485e1cec6932a64809c17f989fa94673639561fe065c963a6c07a06fd14a2b75b7bc707c37d548dd8c58b1bd817f448531911dc91df0e089cd SHA512 4e42856ed4796035fc4fd318c42310eef2d3fb496ef4a69f3fdc4ef2043a281c4decfedac7095f5cae56a0f7ae9d2ad684d125850359c61228df2efa5e45957d
 MISC metadata.xml 348 BLAKE2B e238f960586796416f3a60ab5c9fab8df0d88b79c76530be5243c3b2f4dedc98c87c343aae8e950a40a9876d75622fb6da96b6c697a3ff55fb6bede25fe160a5 SHA512 58a3225b3993d3bd5db5d5cc5b0660fd42034e593e8fb4d657f8e6ed86e4db57df66b99a6edafc6aebf356542edcb7516cd6fe70cda6b7c8ce9a002455531b70
diff --git a/kde-apps/step/step-18.04.0.ebuild b/kde-apps/step/step-18.04.1.ebuild
index c14241e8ebe8..c14241e8ebe8 100644
--- a/kde-apps/step/step-18.04.0.ebuild
+++ b/kde-apps/step/step-18.04.1.ebuild
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index 35cc26bd1de4..f66d88ecb49f 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
 DIST svgpart-17.12.3.tar.xz 20836 BLAKE2B 1c17ed56a304398cde1be7e6c9fd1faab134666c306dd871fef9bd7a8f5d777e4c909159edb7f5ed56b6b709589640fa119bb7daa4df5a88297d557215b2aa2d SHA512 fe49860728452ec4d7dc42ef5532b162f5baa1d50b83254f27f148a3fea41efb179f90162c4dc83aeaa5639cbfcca251f696ba44d63d898357d535080f4fd329
-DIST svgpart-18.04.0.tar.xz 20832 BLAKE2B 27150d11a9cdd83a14be2a21daef96b0a6c8047635f52b5401ded7d386fe449c93105e28366b7b807ba8e2729bf1f0f6b628322a59ea3e51b402ce28ad0a4d0f SHA512 736e9c985238c72bc9938faaa98dbc425fe654a4f396472d62d52cc4dee2c9ebb8fd529270ec91078373b807ebdf321a2b058fae2179e6936d9b50a15fb18f55
+DIST svgpart-18.04.1.tar.xz 20948 BLAKE2B ecb1c18b2ace7935ece992014722f61f213e01156f42d0d2f717321f55f3dff3e3f097ae8ba62e9e2f57a583f602d784d4da7f5c132b3bd8b7027f9f8749f1e8 SHA512 875605618ea2048fb825ec57d7d52a16ee56b7718f86089006fbe95bb4bad4a6c3b19edb781687c42d0c463b652ef38b6484c85702562c56e2def72b55525f07
 EBUILD svgpart-17.12.3.ebuild 499 BLAKE2B 7ce47fe611520b7e2ce3ab7c3c1d19655b7a255199baa736166dc838e6e007c3501ef95fe6ad20eb73bf7e60ac40529e912586131d038bcd08d1361d35e7e6df SHA512 4ecc4acbd8dad4220fada4b4e3229902df053aa3d858857255174faaaae19d203ad11b1c33e9c105c04a828127086130908fb2eaf93a7d7b126261500b037ee3
-EBUILD svgpart-18.04.0.ebuild 501 BLAKE2B 23f8b66931dc752d8d102a23d5f27ab3901a0f6be8fb80607999e5956bc80616429fb494a003633b161c4e5bafd1929e41cd86442e8561349bed5a785842ae98 SHA512 ab3a934803b623bb17348ae70822fe73d96e04669e94a43d353e1890131d1104125d4ff7d19d20e9b58a79a99973a51e9165c95dd79e9eaed5bb1f15472d5c05
+EBUILD svgpart-18.04.1.ebuild 501 BLAKE2B 23f8b66931dc752d8d102a23d5f27ab3901a0f6be8fb80607999e5956bc80616429fb494a003633b161c4e5bafd1929e41cd86442e8561349bed5a785842ae98 SHA512 ab3a934803b623bb17348ae70822fe73d96e04669e94a43d353e1890131d1104125d4ff7d19d20e9b58a79a99973a51e9165c95dd79e9eaed5bb1f15472d5c05
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-18.04.0.ebuild b/kde-apps/svgpart/svgpart-18.04.1.ebuild
index a2929a955b58..a2929a955b58 100644
--- a/kde-apps/svgpart/svgpart-18.04.0.ebuild
+++ b/kde-apps/svgpart/svgpart-18.04.1.ebuild
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 652df8b798fa..dd90eb910057 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
 DIST sweeper-17.12.3.tar.xz 382244 BLAKE2B 9dae94d488241f330b04ade4b07061fd3407020ab6b246339906bdbe9599a316ba90232b2ba684e1f9b502b60347d3b3c8d47b61add4b3b62c1e200c76519eb4 SHA512 0f62ec23f3ab3d6e50787ceceef611cfc02af1c6f7a85e87f59b08f337b064ea34a5a6339f88ef909cb970ac9850eb660a03344cda4772564d4766fa6b727a95
-DIST sweeper-18.04.0.tar.xz 368508 BLAKE2B f87e70f5802c6f9db37b1ee96eab93906e76e6f0d5c2102f80e9031c39f1940e9d570485ccf5931662e7a9e635dd5f0f5495b3c288eccf1c9b0c6d1f5723ba88 SHA512 8a7b978bf50fd64592d59f3488b39c73612d3b12fa6d7ef02122f5d596ff5fe3a275a4d0526bd0e7d61ddf93b1538a212ea49494eba979ad2284db002e25d43e
+DIST sweeper-18.04.1.tar.xz 369036 BLAKE2B 7f3f829e80d73c5f2f6031a97395eb9cc16e58ede25e5e7420dc1fd907c9f3db332f7127d23ad634dcc60bd23985b8b4158bd79a19787bde1d667af4bd7491bf SHA512 368ef0eb1d9613857b8c4771e04e91ff450a6f4b4b58c2a6c38fbc27d93150985db2230b6cc94f68b1a8fa0a499169a137855b90aa187d64a4b9796f89afd1cb
 EBUILD sweeper-17.12.3.ebuild 880 BLAKE2B 328f32c415952ac91d846bd4dcd71dc18e5afe2345a9b9bcacefefa5a139e69b86bf0829e012fdeb3f1ea19aa3578fa3a0125c617980cb0b16d544f19748c46c SHA512 fa7096464c23a7f51aa6d2341ded2076836b43566aaab5dabb4d7561dc6001ce9c6bf43c09a8641b1b131820c52bb70dcf3c3cbf84293cc1beef09f78acab107
-EBUILD sweeper-18.04.0.ebuild 882 BLAKE2B 19021a1432adcd1efcea32b0967f4ae8189734c615f54bfa602f42ccdc2ed5f0e089d89169d158f1f6cbe5ba7189233806d1afe4291a6b1a3f1444562c9daf4f SHA512 fbb82a22e966acd01aae418831169aa48c5bcbb7b160b0e8edbec8d91900f056ca8e89a40742f6465b03392fb90a8d231240782645699257960aa3e409325ded
+EBUILD sweeper-18.04.1.ebuild 882 BLAKE2B 19021a1432adcd1efcea32b0967f4ae8189734c615f54bfa602f42ccdc2ed5f0e089d89169d158f1f6cbe5ba7189233806d1afe4291a6b1a3f1444562c9daf4f SHA512 fbb82a22e966acd01aae418831169aa48c5bcbb7b160b0e8edbec8d91900f056ca8e89a40742f6465b03392fb90a8d231240782645699257960aa3e409325ded
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-18.04.0.ebuild b/kde-apps/sweeper/sweeper-18.04.1.ebuild
index 41e32c5dd330..41e32c5dd330 100644
--- a/kde-apps/sweeper/sweeper-18.04.0.ebuild
+++ b/kde-apps/sweeper/sweeper-18.04.1.ebuild
diff --git a/kde-apps/syndication/Manifest b/kde-apps/syndication/Manifest
index ab854c2b7611..4604ca578c31 100644
--- a/kde-apps/syndication/Manifest
+++ b/kde-apps/syndication/Manifest
@@ -1,5 +1,5 @@
 DIST syndication-17.12.3.tar.xz 159804 BLAKE2B bf89604b4976a28016720d74ab5c36de7bbaca08cc15c1db2d03ccad339049fae5fd06eced4e8c60ee278ad4fcaac3ceca3ee8f217839936cc79ea995f4de31f SHA512 a1f2c472194355b570e4128ab4e4be70d6baa3d1c91e35706b7ec242caa950ec3686ab20772aec6fc2ecc7b0d6b390195e6bca5ec8a130951886589df73c1f9c
-DIST syndication-18.04.0.tar.xz 159864 BLAKE2B e86d7c58c84b92bbbf8e517f01df9b2d3bd97f986bd9231e0eaa349f76eb8d92942a13ab0de467208b482bb1ade6f878b6cbd2f8344a8fa2128331f8c03de7a4 SHA512 75dd0c14f22e1fb2cfbb3d11fb242471c8e1dc89f3a79568363ac70eba7ac68ec2c7ec6f9e0d49108621c43fb2d63912ecf2709210e274a65b183b8f147e3ab7
+DIST syndication-18.04.1.tar.xz 160128 BLAKE2B 12a5f60b9a6e5d0c09e0088d39a021bccb9dc61f48802bb16c5900b21853a45292f095841c51324499834f3348a8a3da68c1cf450bc7c12d61caee0f5d1eff9c SHA512 8069c200575e7872c116b25cc76acfd236825357af0c73d57a1ffdd1c840a359c0fc58a4cf83a5506bc2e8bbc87a76ecdc96fa6123d409c9079ce61472fc3c38
 EBUILD syndication-17.12.3.ebuild 392 BLAKE2B fe48411fd2d0a2ce7b77635085b328069282da9be4e109a6564af6b469d6f7d37641251784f2ceebc6e5f9314ba78aa1f96da97f6b9ae306ce1ed0d52af248df SHA512 68be4e60c5cdd987e45f798912091a6a06bd27307f9b1bb7ecf8701d4468a7d50b6d14f92a0f2084f67cc646a058f4dad20056200b4c473343a3ce25ad750c0a
-EBUILD syndication-18.04.0.ebuild 394 BLAKE2B ced8fdbdf1e87b6dc082522243b990771d532221ce7b79f17a2aa0781f107d0a7b36e6a582a8a19372219a83f3cec01bcc7a759558bf7bbe5c0b32ba273890eb SHA512 bf4cdaa30b49c0f364692c541a011dce1feebc900f8d2a45113338e0832a63d5ed42afca6f59c5e699d71fbb969728b164868ba60bc1927cb8acc615ee253388
+EBUILD syndication-18.04.1.ebuild 394 BLAKE2B ced8fdbdf1e87b6dc082522243b990771d532221ce7b79f17a2aa0781f107d0a7b36e6a582a8a19372219a83f3cec01bcc7a759558bf7bbe5c0b32ba273890eb SHA512 bf4cdaa30b49c0f364692c541a011dce1feebc900f8d2a45113338e0832a63d5ed42afca6f59c5e699d71fbb969728b164868ba60bc1927cb8acc615ee253388
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/syndication/syndication-18.04.0.ebuild b/kde-apps/syndication/syndication-18.04.1.ebuild
index 3ee4afc41ebb..3ee4afc41ebb 100644
--- a/kde-apps/syndication/syndication-18.04.0.ebuild
+++ b/kde-apps/syndication/syndication-18.04.1.ebuild
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index 441dbfb1f585..97717d5ddd84 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-thumbnailers-17.12.3.tar.xz 41628 BLAKE2B 41a95cf201d03d7ef0a4b35c9603c61113f3fbf2a5319724b88a14de979c310e2d50f2ac0fa68d60cdb7bf4d396d21d59bb60622b18ad548cd5389b68e8c0e46 SHA512 67bfea3314008d2024d07afe02b4a9b2d7d952460e831c152b6eb79b9214e73c4a90312b27f6fb02666edf2e40baa59c5c924f5750bb56d731ab09c9b2cddd6c
-DIST kdegraphics-thumbnailers-18.04.0.tar.xz 41336 BLAKE2B 7e3093e88cb8f47fd971baa97157786595cbe50a993fe305bf6f17ae2fcfaad9753cb4c1f042ddb979725e2dc22499d06485647e2b54a6e907c33be9e1e75c3f SHA512 5d5bf5d5cd5deef773275fc279005c6b343efaa89df7318881c17ee62a567e9559e139fa3a64afef13839b253b430ada4149a5255e2d30c28356e704d8cf2234
+DIST kdegraphics-thumbnailers-18.04.1.tar.xz 41300 BLAKE2B 0ecc9c5272bddb56b1dfb43c4da4761a404de9a5db9f650e32242593b7df50634fcc16a40f8bb032507d8657ff64b57ee5b158a7ecd67e85a27ff3236d4ed1d0 SHA512 2a2d05a97f5ba9f534cbcc2a325895f9dd9aecfd48b8da225ac3ee7285ba09d7ac9e1634fe6f6d82654a5c47e82cc159d6f65ce2ecada46ac6b43ad25cc2c66e
 EBUILD thumbnailers-17.12.3.ebuild 610 BLAKE2B fb61ab186c414471900aeed69873d5c7737d9cdfeb9a82460ca73cea2be4031c0d40f757de7625afc7bb457172b9518433330d28e1b1cd3a8bb1c5225324ac6a SHA512 c45fa2fb6982139f595e19f99421ddd334f97c2f55196e71a7e6c135cd3b94b7b1b6893bf2cf6e159960fb51f40edac12ef3e94326982c2ff9dc8bec7855a403
-EBUILD thumbnailers-18.04.0.ebuild 612 BLAKE2B cb2d75bcd8a1a07288e7c3d4776dba4883079527d0f38e8f147fea9eafefdf657b3fcef66124d46bc58405655839d2127d67d0fb6f84955508158769cd13197d SHA512 4d1dceb5d12f96997ee5df7a2c55f408e230ff232cb5cb05a5eecda7efcabd296fbf83a02c6b3783346dba31844816b350cbb17d612af150ed1172020c4d740c
+EBUILD thumbnailers-18.04.1.ebuild 612 BLAKE2B cb2d75bcd8a1a07288e7c3d4776dba4883079527d0f38e8f147fea9eafefdf657b3fcef66124d46bc58405655839d2127d67d0fb6f84955508158769cd13197d SHA512 4d1dceb5d12f96997ee5df7a2c55f408e230ff232cb5cb05a5eecda7efcabd296fbf83a02c6b3783346dba31844816b350cbb17d612af150ed1172020c4d740c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-18.04.0.ebuild b/kde-apps/thumbnailers/thumbnailers-18.04.1.ebuild
index ff1362dbc75b..ff1362dbc75b 100644
--- a/kde-apps/thumbnailers/thumbnailers-18.04.0.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-18.04.1.ebuild
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 64e4cd682794..33f9d05ea5b8 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,5 @@
 DIST umbrello-17.12.3.tar.xz 2960868 BLAKE2B 1218ff36c08404312c182dddfd21179dd579e07c11b819f08333568bcd1639f56be3d85e268e2815dbdcd7576e8a33638148aa417a1a4830a85585b301912a1c SHA512 e878e4add5301ee60a11522b678c781c54582fb36d4a59451bdc4a1220559cfe4128451271198f93f0333204c3a42cbff73b75e9d6c83ecf4b75e98c4a5b12fd
-DIST umbrello-18.04.0.tar.xz 3023060 BLAKE2B 6f57cae4c4225fddf7cddfc9aba39856674c7c7531b1eb9fec2140607c33905b8219c2d7ad40a8dc3b9e95c12a4e5298ebeff090e0db49b844d82ca47bbcc1bb SHA512 f67aebfd0c666e2b4a0ad4e44e8e4599bcead4fd8fe5468670e58051c72eab99e6add88880e0bfa605f91932ea7872f4e822ab1cd385e441b69bf77ff9b6b5d9
+DIST umbrello-18.04.1.tar.xz 3019540 BLAKE2B 2bce12665ee53aed4161717c2dfd33fd9afe8c52abe9f5727469dd09e3ec6e8b3e79e1b69a9fc03ccebb051ccd97cbff8c80ab9dcaa1a4bb0966553ff56b91ce SHA512 2049d6f3b088fdd48b8f452ce521a992142b4d08c66028e0294c26e2ec21472bcec009921d3ddc4ea06fb934da59e212a5ac7e86c37347efd8d3971ab9c5e747
 EBUILD umbrello-17.12.3.ebuild 1372 BLAKE2B 4cf613b6910521a8477356953063c645532760498ce8b54719f3c29e1720ee3eb0ccd7ff1076b2f69ab588ffdf2ca940941438fa948567f4196a125d50b3ce8a SHA512 65168a40a49253b23bb22c1afdc8e5221924073d5dd1bdfafd9575d1c4bb511e8b9605ed09197e1688ffa3b7da7d605355af9a2ce74f0600ac119700835e6fca
-EBUILD umbrello-18.04.0.ebuild 1374 BLAKE2B 1141ee3a928cd4bb47b90c7352cd7b0b9a9ecd4e90ee0765d37b0c66844cd4c2572076de1aa6a5c5b043885f236525466996341ad0ea84431442be851226ff7c SHA512 c6cde8863f1bed8e4bd142095799e9b4c4aa3392a1baa7dbc25707158e429218f270d20a3866c6c31ff5e50e352800b00bdeebcfba5c2eaea3f5507796dd298e
+EBUILD umbrello-18.04.1.ebuild 1374 BLAKE2B 1141ee3a928cd4bb47b90c7352cd7b0b9a9ecd4e90ee0765d37b0c66844cd4c2572076de1aa6a5c5b043885f236525466996341ad0ea84431442be851226ff7c SHA512 c6cde8863f1bed8e4bd142095799e9b4c4aa3392a1baa7dbc25707158e429218f270d20a3866c6c31ff5e50e352800b00bdeebcfba5c2eaea3f5507796dd298e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/umbrello/umbrello-18.04.0.ebuild b/kde-apps/umbrello/umbrello-18.04.1.ebuild
index 7b9d3d5c2d81..7b9d3d5c2d81 100644
--- a/kde-apps/umbrello/umbrello-18.04.0.ebuild
+++ b/kde-apps/umbrello/umbrello-18.04.1.ebuild
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index 83cb935d175c..686dcf9c5825 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,5 @@
 DIST zeroconf-ioslave-17.12.3.tar.xz 38576 BLAKE2B 69b06025f51c5d9c9104e60e35cfc0399dd6b0f40097174a402476630656a2a8f2ea72a14d029a92b9eebd7d4e954c1d3c96cc921c8b23002b5ff16ad7b49228 SHA512 1d41a2da78a0e161f8d31a65e6783a8ffe4820837d8e509b241916f78a046f286bbd129c116b88f98f270c61b8bb1bee358004f01d44112dfe25c391fb96c152
-DIST zeroconf-ioslave-18.04.0.tar.xz 38680 BLAKE2B 50cb62d4a0adb12b34d275be981792a5cddae25301b350183b7dfb20c5d2f7b62c5815cac29e6578e4aafcfb61fe90bfd18c7c677ab2575c3e4e735559eabce8 SHA512 d652dc5e29c38cbb2f59a5a097c373daa0b2e1247d0c83e5d927e88b694b5ff0f7b13e94f3672e402485b0223324d1443b3b0b5ef2ea88674372a3d228a4f15e
+DIST zeroconf-ioslave-18.04.1.tar.xz 38908 BLAKE2B d524f70af01b3ea94df4601a1790612ff83dad11d826ec59a5bf02d78c68ed45e3dc0a784b59e0a52d369af1f1755a90ff3247a733606bde475a9b2a3756fbb3 SHA512 d94e5b234c6ba65fefc42f38304df73b11912136089b11f8fe4407851259b00ab1e54e0a77ed7d2c3db4bf585f3f3265c182882673188773f8490d6d726c7b0c
 EBUILD zeroconf-ioslave-17.12.3.ebuild 480 BLAKE2B 86b9ede6f3a8ea99d360448d161804c2670b1f56a2cc45c779d42066638b4d37a18d3576c6b7977deee7de52742a3fb0c2b57906cbd606108b58571ce22f1ab1 SHA512 c3373cc48130617e01e151179a6d61d973f647b158663b2e514fb1e03cf181c9f5daa661eca4cf3d7ae4017030e2a4ebef5c5eeefe4049c588937ee45ded30bd
-EBUILD zeroconf-ioslave-18.04.0.ebuild 482 BLAKE2B 982c5e9af2f7868325b995b89bbccd8126357095be79b1fcf8164e22139ba36dd4c865e9f1faccf53138db60049162185c954060ccc5006f1d307d7bdf2da67c SHA512 af3773c381108def72974d02c96fa175a5fb5c132a812d333a277ab2b1b6510b119a06b0ad87e7fc82c24cfea3200ff246dc65577c0c74ebd3bb58f803a7f97b
+EBUILD zeroconf-ioslave-18.04.1.ebuild 482 BLAKE2B 982c5e9af2f7868325b995b89bbccd8126357095be79b1fcf8164e22139ba36dd4c865e9f1faccf53138db60049162185c954060ccc5006f1d307d7bdf2da67c SHA512 af3773c381108def72974d02c96fa175a5fb5c132a812d333a277ab2b1b6510b119a06b0ad87e7fc82c24cfea3200ff246dc65577c0c74ebd3bb58f803a7f97b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.0.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.1.ebuild
index 9b485d5e9478..9b485d5e9478 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.0.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.1.ebuild
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index d63aceb89242..94962493b038 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 4e41731da8fb..253c7179a5ab 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,5 +1,5 @@
 DIST extra-cmake-modules-5.43.0.tar.xz 314064 BLAKE2B b1866e66c2d12d450aada3f5dca86bf1638906cb3f4a2aa36dea43d3d0b2edde5cba85caa6ca7e0f6bd007733db16f88c2108103b588d637f1001f711037561b SHA512 fcdd96ad0db73f75708fdc97bbc74e28ef271a5dc27d8730f57efaf9e451ed5aaa51d20831c3cf20c82d377d50d51ba4abbfd09cdfbf02998396f907f6fa9cc5
 DIST extra-cmake-modules-5.45.0.tar.xz 315512 BLAKE2B 00686fe841d5385890dd52550cfbe3fbad1b9b1a5284515eec55ee82ffc533a542e36ed8936fd0095df0a11cd164e3b3efacd2dcb456703bb9dc112b551fd02f SHA512 d33e22ab08e16c3d8de3f7fc26fbc36a6940fb2d4387cf2b0ce4443fbc34e6dbbdfe2019bc31fc3b0005c582ef487ce97c02f3e7e2361f43676092ef846e9b68
-EBUILD extra-cmake-modules-5.43.0.ebuild 1262 BLAKE2B 1be765cb725c03c7dc9fd3f3904eb091189c6a079321a1c9a15785968782f72582aa7d629ce622f249a8e2e1b9ee2ebe873fb03153ebec01381bfbad15376d45 SHA512 a02411944c68c5fe52fd0743331c35d4cd42dc24c72aa28b41459b1900e4f0dc0b5239cd2eba15ec148901e823f0525e5c7482a1e8dc38bd42924a8848f3f5b1
+EBUILD extra-cmake-modules-5.43.0.ebuild 1263 BLAKE2B 5a5e1c77b947f829e42bc1d483ab087d5254131a91697a6bfa7ea021583cad5263436510506a37d7f4124f9da5b741bc0225c05ea6dfade87b1758fa14cbda02 SHA512 d9ce83116a0aef1cb7bf7091f47fd51a5dee5a1ddae7f233e7c82effa05de2f9aa90f54906a173bd4940b01f75415e6bc9caf1990fd17c0153571c9866701805
 EBUILD extra-cmake-modules-5.45.0.ebuild 1279 BLAKE2B ebde1e71c55192ad5cf4647cf14059dcd04d0463d0215b4f4f72ff9afbed908b9a385cfc1a229d6ee721743f06f2c02235b15d9f4067f8a872a8223ac49cce59 SHA512 bc872ce6523cb5d5391113eab1526ed6dbf7755ea0f93ce0701e114ac43d378f5153f1114d18494a24d644b00dcd19d2b5f0f63f1c7267a3b371f2f9e7d4bc93
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild
index dc003c96c9fb..4e7d895d7fe9 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 7184b337b331..a0a3a588ddd2 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index f5c08e1fec71..96947872d238 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,6 +1,3 @@
-AUX kio-gdrive-1.2.1-doctools.patch 317 BLAKE2B 8b121a6642b1905cb46a2f36b5f7a4f4df2390b460a09ef18842ae16b0824b7540d13f5398e282d0cd500ebdaf712296b0ba22f7e03fde1f0f0af7c5a50694e4 SHA512 467e52dc07cf1726f1bd1231210cee145edd79de560814e9cc9514c1f4c13e369f062de0f8ba4eb961aec0878a96ce37e1555c5c968e70cf8bcbb014b13d1431
-DIST kio-gdrive-1.2.1.tar.xz 33820 BLAKE2B 5f1e4ec09b07b135b49bf887c560ee873eb32e918024899bd4790208e6d1e52957480acc9d5cdfa0d0a003c864cd554bf11b2466d123e4bf804306ea4508ff69 SHA512 021612192adc4173d936ee5f16d959db6c2d74aadae0d6dcb25aa1b8f1cd06f650e870d62eb72c9efbd9b581b06a949fcd78f494ec63eaac9ad67b16a0f0ab79
 DIST kio-gdrive-1.2.3.tar.xz 44176 BLAKE2B b1cd14f4c3cf8f14b875543370816c105d5b494a3f0119e2ec1b49610bcde3d67757a7006cb6f5c1f529f9e10500edaf724736d2c3caf62a9be7782fdc50f383 SHA512 cd5ec02fa0f0a73a0016957276c07c9435137781da922c6aaa49c8f62c43dce9a5107cdd80acbf40d49ab88bf96a2a6ed43138678c8cd9accd472b6eb428203f
-EBUILD kio-gdrive-1.2.1-r1.ebuild 1100 BLAKE2B f5a3d4f3b9de8bb89c19fe1e917c48c4b69340528faeb8102ed00b42ec5408342f8d2e0cc2668b3d55f5e140b9f8ba82e97315fa238caeb621117428d9a2fc27 SHA512 458806ab6fe62943f7d62ed470f0cc007db9b6ba5665c778fc74a0025551188c7074185ca1784874f62f7cca8a36215e9aa5904b8475ca1e39ecde5a3fce4c08
 EBUILD kio-gdrive-1.2.3.ebuild 1053 BLAKE2B 0606cc225562a217065135f0b63100d8977b3492cabda25d97f005c81bd15c5dbd8803bc8ec2fc0d25d16785219696e5e7b6fb8d2f5acf922acbc048703203cd SHA512 3ff6b362993124e07f76e6bf417e0fa4efe637483872442fd605af6fd386b3c3fe49dc9ba77f111e148d579e6eae1c7b08c94f8cf2c6f255fb48d47f77a1ff50
 MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21
diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.1-doctools.patch b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.1-doctools.patch
deleted file mode 100644
index 7ddcf1428b52..000000000000
--- a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.1-doctools.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2017-09-30 17:29:04.000000000 +0200
-+++ b/CMakeLists.txt	2017-10-19 20:51:03.198871146 +0200
-@@ -80,5 +80,6 @@
- find_package(KF5I18n CONFIG REQUIRED)
- ki18n_install(po)
- 
--find_package(KF5DocTools CONFIG REQUIRED)
--kdoctools_install(po)
-+if(KF5DocTools_FOUND)
-+    kdoctools_install(po)
-+endif()
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.1-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.1-r1.ebuild
deleted file mode 100644
index 3d124c2cd46c..000000000000
--- a/kde-misc/kio-gdrive/kio-gdrive-1.2.1-r1.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
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-inherit kde5
-
-DESCRIPTION="KIO Slave for Google Drive service"
-HOMEPAGE="https://phabricator.kde.org/project/profile/72/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-IUSE="+kaccounts"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_kdeapps_dep libkgapi)
-	$(add_qt_dep qtwidgets)
-	kaccounts? ( $(add_kdeapps_dep kaccounts-integration) )
-	!kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	dev-util/intltool
-"
-RDEPEND="${COMMON_DEPEND}
-	kaccounts? ( $(add_kdeapps_dep kaccounts-providers) )
-"
-
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}/${P}-doctools.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kaccounts KAccounts)
-	)
-	kde5_src_configure
-}
diff --git a/kde-misc/kshutdown/Manifest b/kde-misc/kshutdown/Manifest
index caca84f0a6ef..4e85f596ad8b 100644
--- a/kde-misc/kshutdown/Manifest
+++ b/kde-misc/kshutdown/Manifest
@@ -1,5 +1,3 @@
-DIST kshutdown-source-4.0.zip 459493 BLAKE2B 88718dacc682fc44461880767cc874e822e69d25359a5f8f66cec9bd99de7c4bb81173905ca12670788b191593128b325c03935d26757f260fe8d47b9bab768a SHA512 720ca297760bf0442fca10f64e966b16db32a0bdb5a6b456408a7245fba071b9bdb465bee312878b5cf82df0aa1e27566b06fc6fe5026edc3a84d2d8295ea6ee
 DIST kshutdown-source-4.2.zip 463140 BLAKE2B b398a004e91ebfa7651eed7bfffeccfc1cb332868ff3bbcea50ccd40088084ff1079d73ee2c922c8e882c0d39e1c6bc2741d0b416b5a2742eb5c6686b03f29a5 SHA512 00d4a5c1c8efdac0d86009bc0218a673435ca315f3b4fa949af414bf525ff65088f26edb0ed0d9fd2209ea81d58619efcffa5091d49bd2b841ddd4749b05a21f
-EBUILD kshutdown-4.0.ebuild 1084 BLAKE2B 001707efd5292864eb5fc3331e322c22bcd14bbc2b0716540ba1f07abdc967e870241ed8e3d575e41adfb4d9d49faffda7584d06061af59cf54cf34586143046 SHA512 1921310d713d85122ae7553ca4f1c119dbe68e9913a4f297c7c83a1bafed00d26cba8e4208b0d06fc6908e768b660ef20e9f8b02b70d9560063a05150c338c25
 EBUILD kshutdown-4.2.ebuild 1111 BLAKE2B 464b8451249ee35b987d175c5fca37b446084c789f1af1d6338d1988af70660f2660427838a35881f876b22cd893d5565f79da386828a2ca2771509be2b97c31 SHA512 b4e900b61414ead4f471c0a682bef779dd8fd061f296de3ed57180db777dd01bc772780eff45c34af74205ed02788c4cb91c276e6a4069a8ca337d746e50c328
 MISC metadata.xml 328 BLAKE2B 7fca7d8d10232412fe198ba6c48e27ff6e1f45574255cd0b386f05264822a8bfe84a77f12b5104682d2188f51c230baf6cc6180b50249634cb5bc7bcc0cfa946 SHA512 b26f71d9d8119e82c3f395850e2309f97edc6c7fbb201387ff0bd03c7241b3262218dd5baea6a438b649ee3c13d4061531b0234471c3d8b4b8349e658d5bd775
diff --git a/kde-misc/kshutdown/kshutdown-4.0.ebuild b/kde-misc/kshutdown/kshutdown-4.0.ebuild
deleted file mode 100644
index 45ba4b1a52df..000000000000
--- a/kde-misc/kshutdown/kshutdown-4.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-KDE_AUTODEPS="false"
-MY_P=${PN}-source-${PV/_}
-inherit kde5
-
-DESCRIPTION="Shutdown manager for desktop environments like KDE Plasma"
-HOMEPAGE="https://kshutdown.sourceforge.io"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="+kde"
-
-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
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	sys-devel/gettext
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKS_KF5=$(usex kde)
-		-DKS_PURE_QT=$(usex !kde)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index 4c780b0c26ff..f4f2916f581a 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,5 +1,3 @@
-DIST wacomtablet-2.9.82.tar.xz 708508 BLAKE2B f9f10354f5db42e9acc43b05d00c168bd6f5200ea7d7f7fb4c7f0f3042ab2327d78145f6388e1c607528e14c6e6bd6a33929f952943dba330e02d761634ca37c SHA512 ba1b8d15ed4ce52c14ca0ac494cfb9200b9c891c6ac19ee5a306496e1c04f6abc8b83290bc31199a634ed8b4b4469dc185a967be183f1ed6b53956bc19038904
 DIST wacomtablet-3.0.0.tar.xz 707852 BLAKE2B 76dd473a1dbb2b47395b5321df2dd307065d8dc7399748f70f69ea6b3d2dffe8a981ab8e24ee77d72579e00e86769b9d68822d551855432a2c0dc471cf81be6c SHA512 c953ea010fe672706506d15c594d1437e1f42c59abcdd0b5bed32b4cdccafbb612584057a641c66029261088a4b968976a7bcdd03952daa9f05a955ee83c721d
 EBUILD wacomtablet-3.0.0.ebuild 1126 BLAKE2B dffcf56c6e5f62a450f6f32dc38e0ca3cd558ff8c22575586886a981d1146dbe665018f7701a1b8e5007f10568a87a0eba0dbdab805e4ca1c9311a848b69d726 SHA512 f09680aa06fa34213c69075a6b34a9312bf3e2582110d14159f5c7b840d7d4518e46d690f2fd0f5458928d781d96822d25739d4cf826c30858e30d449d3cf8a5
-EBUILD wacomtablet-3.0.0_beta2.ebuild 1272 BLAKE2B a3d29c51a1f836e75dfeff33feb5339f9857f70136ad617892400020f0042d943305ccc0de27d558b19dc51eeed4a6b3eabeb66b6bc868b6c2f4d8b67635bc35 SHA512 d9e0d99e34885203d92691d7e536712bc62b70824d1d6e2d2482c4437bb3aaac097d3eaf56d08575ed04c5ecbef2db10644ec27c2ec89eba5fa0bcbd384f66cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/wacomtablet/wacomtablet-3.0.0_beta2.ebuild b/kde-misc/wacomtablet/wacomtablet-3.0.0_beta2.ebuild
deleted file mode 100644
index 5a1691219aee..000000000000
--- a/kde-misc/wacomtablet/wacomtablet-3.0.0_beta2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="2.9.82" # avoid downgrade after upstream lowered version for beta2
-MY_P=${PN}-${MY_PV}
-KDE_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KControl module for Wacom tablets"
-HOMEPAGE="https://www.linux-apps.com/content/show.php?action=content&content=114856"
-SRC_URI="mirror://kde/unstable/${PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=x11-drivers/xf86-input-wacom-0.20.0
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXi
-	x11-libs/libXrandr
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	x11-proto/xproto
-"
-RDEPEND="${CDEPEND}
-	!kde-misc/wacomtablet:4
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/kde-misc/yakuake/Manifest b/kde-misc/yakuake/Manifest
index 2f495c516726..dfc6186e3ec7 100644
--- a/kde-misc/yakuake/Manifest
+++ b/kde-misc/yakuake/Manifest
@@ -1,8 +1,3 @@
-AUX yakuake-3.0.4-qdbus-crash.patch 1425 BLAKE2B 841120c4c714858157d0982582291d31a1c47ca9425ca6d29c2223b5d2f72dc4f8d0790bbc88d16e8a4511361502b190826bdeb1f35b824c0a5a4984ad773fd8 SHA512 04b1ecf9c01cb5917fd74d4983f60d81dd815da7e0c4f9da14715d796e5bb365ad1d4fbc1be43c7ddf1e84463bf51d1198693a8a95ca93ae26fe5fb248fe0119
-AUX yakuake-3.0.4-qicon.patch 1405 BLAKE2B 5d423fab1f7e9f3ad50017f58047d5d642e312f89502290be00341034a85975adcc38a4769b01c01820e26379248f16e1d1a5ec59e0162b43d9559302d385181 SHA512 fd2c68341a77cfedf4d34a854efc7c513c16741cf2e3cf4300c1b1ee4e45560d9e5f318303493d4112141255bd3288437db2b251a722db0ec410c2241f842b44
-AUX yakuake-3.0.4-qt-5.9-wayland.patch 3408 BLAKE2B 9c813f0ebb7b8044a62e4db14c478e235f19f20330edd1b696e0557a66b0254a9c1105018110f6142635394bb2de140538d76aca921f35cfa21d25d3416e528c SHA512 1c0486b186e3443dc20c828cd241b2b07093d3314263a6cda16b97ae4aea883281124988f0c989d2116ecc3fa832587b54fa5027555d12157fe40bdd5201ce42
-DIST yakuake-3.0.4.tar.xz 367788 BLAKE2B 6c151ac1fa70d7cf3cfd00854d8f5ab553345a9d12186514d405428e8e7ad32d8405b1c562b420c46a713347d1e00e037b92e20801c51cd90a81e299e94c51d1 SHA512 e50fe742349e02116bb9d7edd61178fcbc215ace39d50b48fb8ec3095c948a7ff91add7be5d8778c817f9d5b4663d4cefe3e0ef197c7ec6e0b88b3158ff39659
 DIST yakuake-3.0.5.tar.xz 347412 BLAKE2B 964b5abdbc377b2ff3c1c37ebf4cb2537dde00d8c4178bc7db1785701dee82c600cd775a38896d8ad8976cbe14427df094c4db0c425355b0330d2e8b4fbe23cd SHA512 17640590bb87b7c27e1e336cb82141b986103af95cfae2da129b69537d89a78eb0e21a6f5fb9ab26ed9e572f9edad055264f642afee6012e1a5a5c55d9dc2d22
-EBUILD yakuake-3.0.4-r2.ebuild 1337 BLAKE2B 654711bb31bd14c19813e9d6fc71257a17d7b34c3a92dbe21aee30a348df84170c46f134eb1bab3f640540569f51c1cd95211175c395b60a9aa6576ee49c741b SHA512 821506da700802f928cf940ad19cd69894464da2d8a920199cf619aefe4d5ce90fe3865c805f7662787bb522d9e31a22b7475e5f34ed96696319f1718880255a
 EBUILD yakuake-3.0.5.ebuild 1214 BLAKE2B 795fdc5b109297743f947b585ba3cf5e10e1d8401933ca706ef99b68690071c3ce15594b929725cd52b0219bce3216efff979b2d3059015850be043ae1afef82 SHA512 f0e56b25047da712af7094963d03a16d4ed4355c5f56c4e70cbb6dc0932ed056048bb7e047ad290cbbcdea08deff39d362c2658d83b569756236e291af0011b3
 MISC metadata.xml 527 BLAKE2B 6550b2f9744eaa38689006f338b02f0f5bc2a7a19942552176aba47d03832e7d39b5049515f768d819bd0f2f5bd26d4a8f572ee8d731b69940f286c3b31102d8 SHA512 9076d81d5e1f7b60667653334a649be515ce8c5b8224422bad089a5541b2438922d515abc11c66918a7bc0d00f4fc6f15f4a3cd20dd697b714195977d1c7baac
diff --git a/kde-misc/yakuake/files/yakuake-3.0.4-qdbus-crash.patch b/kde-misc/yakuake/files/yakuake-3.0.4-qdbus-crash.patch
deleted file mode 100644
index da3b042d7012..000000000000
--- a/kde-misc/yakuake/files/yakuake-3.0.4-qdbus-crash.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 09abe657c65ba482ce9253e54467d33276f88bc9 Mon Sep 17 00:00:00 2001
-From: Vangelis Tasoulas <cyberang3l@gmail.com>
-Date: Sat, 16 Sep 2017 16:42:44 +0500
-Subject: Fixes a yakuake "index out of range" crash produced by QDBus exposed
- function TabBar::sessionAtTab(int)
-
-Summary:
-The function `TabBar::sessionAtTab(int index)` is exposed through QDBus and if a user/script passes a negative number, yakuake crashes with `index out of range`.
-
-This patch fixes that behaviour with a sanity check. If the user passes a negative number, return -1.
-
-Test Plan:
-Run the command `qdbus org.kde.yakuake /yakuake/tabs org.kde.yakuake.sessionAtTab -1`
-Yakuake will crash.
-
-Apply the patch and re-run the above `qdbus` command. It shouldn't be crashing now.
-
-Reviewers: #kde_applications, hein, alexeymin
-
-Reviewed By: #kde_applications, hein, alexeymin
-
-Subscribers: alexeymin
-
-Differential Revision: https://phabricator.kde.org/D7812
----
- app/tabbar.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/app/tabbar.cpp b/app/tabbar.cpp
-index b76cdee..1bc6fdd 100644
---- a/app/tabbar.cpp
-+++ b/app/tabbar.cpp
-@@ -914,7 +914,7 @@ void TabBar::setTabTitleInteractive(int sessionId, const QString& newTitle)
- 
- int TabBar::sessionAtTab(int index)
- {
--    if (index > m_tabs.count() - 1)
-+    if (index < 0 || index > m_tabs.count() - 1)
-         return -1;
-     else
-         return m_tabs.at(index);
--- 
-cgit v0.11.2
-
diff --git a/kde-misc/yakuake/files/yakuake-3.0.4-qicon.patch b/kde-misc/yakuake/files/yakuake-3.0.4-qicon.patch
deleted file mode 100644
index 608a09cf39da..000000000000
--- a/kde-misc/yakuake/files/yakuake-3.0.4-qicon.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 28138a891ff71236b3b8efcd1bc5fe7a2fe09b0d Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Wed, 2 Aug 2017 16:31:09 +0200
-Subject: [Appearance Settings] QIcon -> QIcon::fromTheme
-
-Most likely a porting error from KIcon
-
-Reviewed-By: Eike Hein
----
- app/config/appearancesettings.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/app/config/appearancesettings.cpp b/app/config/appearancesettings.cpp
-index c21ac33..b7d5c6f 100644
---- a/app/config/appearancesettings.cpp
-+++ b/app/config/appearancesettings.cpp
-@@ -63,9 +63,9 @@ AppearanceSettings::AppearanceSettings(QWidget* parent) : QWidget(parent)
-     connect(installButton, SIGNAL(clicked()), this, SLOT(installSkin()));
-     connect(removeButton, SIGNAL(clicked()), this, SLOT(removeSelectedSkin()));
- 
--    installButton->setIcon(QIcon(QStringLiteral("folder")));
--    removeButton->setIcon(QIcon(QStringLiteral("edit-delete")));
--    ghnsButton->setIcon(QIcon(QStringLiteral("get-hot-new-stuff")));
-+    installButton->setIcon(QIcon::fromTheme(QStringLiteral("folder")));
-+    removeButton->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")));
-+    ghnsButton->setIcon(QIcon::fromTheme(QStringLiteral("get-hot-new-stuff")));
- 
-     m_knsConfigFileName = QLatin1String("yakuake.knsrc");
-     m_knsDownloadManager = new KNSCore::DownloadManager(m_knsConfigFileName);
--- 
-cgit v0.11.2
-
diff --git a/kde-misc/yakuake/files/yakuake-3.0.4-qt-5.9-wayland.patch b/kde-misc/yakuake/files/yakuake-3.0.4-qt-5.9-wayland.patch
deleted file mode 100644
index b24781dcc9ff..000000000000
--- a/kde-misc/yakuake/files/yakuake-3.0.4-qt-5.9-wayland.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 7534df21025b10fd236dd5a8f92d0dff7889e0ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= <mgraesslin@kde.org>
-Date: Wed, 6 Sep 2017 18:42:01 +0200
-Subject: Make Yakuake work on Wayland with Qt 5.9
-
-Summary:
-Yakuake is also affected by the common problem that the integration
-breaks once a window gets hidden, which is a very common feature of
-Yakuake.
-
-This change tracks the PlasmaShellSurface, destroys it on hide and
-recreates on show. Thus it's alwyas positioned as expected.
-
-Test Plan:
-This commit was created using a yakuake which is positioned
-correctly, although I pressed F12 a few times.
-
-Differential Revision: https://phabricator.kde.org/D7709
----
- app/mainwindow.cpp | 33 ++++++++++++++++++++++++++-------
- app/mainwindow.h   |  3 +++
- 2 files changed, 29 insertions(+), 7 deletions(-)
-
-diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
-index a7b0d89..6fa9160 100644
---- a/app/mainwindow.cpp
-+++ b/app/mainwindow.cpp
-@@ -95,6 +95,7 @@ MainWindow::MainWindow(QWidget* parent)
-     m_isWayland = QGuiApplication::platformName().startsWith(QLatin1String("wayland"));
- #if HAVE_KWAYLAND
-     m_plasmaShell = Q_NULLPTR;
-+    m_plasmaShellSurface = Q_NULLPTR;
-     initWayland();
- #endif
- 
-@@ -176,6 +177,21 @@ void MainWindow::initWayland()
-     registry->setup();
-     connection->roundtrip();
- }
-+
-+void MainWindow::initWaylandSurface()
-+{
-+    if (m_plasmaShellSurface) {
-+        return;
-+    }
-+    if (!m_plasmaShell) {
-+        return;
-+    }
-+    if (auto surface = KWayland::Client::Surface::fromWindow(windowHandle())) {
-+        m_plasmaShellSurface = m_plasmaShell->createSurface(surface, this);
-+        m_plasmaShellSurface->setPosition(pos());
-+    }
-+}
-+
- #endif
- 
- bool MainWindow::queryClose()
-@@ -861,13 +877,7 @@ void MainWindow::setWindowGeometry(int newWidth, int newHeight, int newPosition)
-     setGeometry(workArea.x() + workArea.width() * newPosition * (100 - newWidth) / 10000,
-                 workArea.y(), targetWidth, maxHeight);
- #if HAVE_KWAYLAND
--    if (m_plasmaShell) {
--        if (auto surface = KWayland::Client::Surface::fromWindow(windowHandle())) {
--            if (auto plasmaSurface = m_plasmaShell->createSurface(surface, this)) {
--                plasmaSurface->setPosition(pos());
--            }
--        }
--    }
-+    initWaylandSurface();
- #endif
- 
-     maxHeight -= m_titleBar->height();
-@@ -1303,6 +1313,10 @@ void MainWindow::sharedAfterOpenWindow()
- 
-     applyWindowProperties();
- 
-+#if HAVE_KWAYLAND
-+    initWaylandSurface();
-+#endif
-+
-     emit windowOpened();
- }
- 
-@@ -1316,6 +1330,11 @@ void MainWindow::sharedAfterHideWindow()
- {
-     if (Settings::pollMouse()) toggleMousePoll(true);
- 
-+#if HAVE_KWAYLAND
-+    delete m_plasmaShellSurface;
-+    m_plasmaShellSurface = Q_NULLPTR;
-+#endif
-+
-     emit windowClosed();
- }
- 
-diff --git a/app/mainwindow.h b/app/mainwindow.h
-index 8a46c89..bb6404e 100644
---- a/app/mainwindow.h
-+++ b/app/mainwindow.h
-@@ -44,6 +44,7 @@ class KActionCollection;
- namespace KWayland {
-     namespace Client {
-         class PlasmaShell;
-+        class PlasmaShellSurface;
-     }
- }
- #endif
-@@ -203,7 +204,9 @@ class MainWindow : public QMainWindow
- 
- #if HAVE_KWAYLAND
-         void initWayland();
-+        void initWaylandSurface();
-         KWayland::Client::PlasmaShell *m_plasmaShell;
-+        KWayland::Client::PlasmaShellSurface *m_plasmaShellSurface;
- #endif
- };
- 
--- 
-cgit v0.11.2
-
diff --git a/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild b/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild
deleted file mode 100644
index cd59332d3ebe..000000000000
--- a/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://yakuake.kde.org/"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep konsole)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!kde-misc/yakuake:4
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qicon.patch"
-	"${FILESDIR}/${P}-qt-5.9-wayland.patch"
-	"${FILESDIR}/${P}-qdbus-crash.patch"
-)
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index f4b7ca42e4ae..52d19811c811 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 145bbc4b07cb..27a3c34536ce 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-desktop-5.11.5.tar.xz 8534060 BLAKE2B 3d3405c5ed1b85cad172c6c5f92c4da9a9204e901a3f3f3e4a581f20726881baeb086df71cc9d7df36715f809856f9fd01487497543efa7d3a28be206381b29c SHA512 328b6a75def1343c87cc783dd9cf6fcbd17a000f5ef7d28f2d558225a38de6d879767335036c97743d1f6ea029c9b932671dec8436d0bdba5a0f27b1afdd82a7
 DIST plasma-desktop-5.12.5.tar.xz 8558436 BLAKE2B ecd8a0ce7532dadde5f435e4c620333572b30e50a5003493495784bb31f7e9a4c1b0b1a023290b0443fa90ee7e663fefb9854016bb8eb5a03f82f879d6522fc6 SHA512 d19f8d640304bc1ffa0839e8ba453ddea76710f26fe580789c64e1b97d2a67c151ec62b2d0503fc35ad31cb8da4ef1125f3154e366b7f2bb4b8fb9bb2e0a6abb
 EBUILD plasma-desktop-5.11.5.ebuild 4372 BLAKE2B a5353650f3eec32961ba02cbdb16afd389767a69c9b50cf0971e3a05bbc74d09dc606fa9c7946d15b69396c8a3b809e1ffda365f6d32c7019a772719ba4817fb SHA512 8c578b6c7602ed9b4e3fe16687cf04960a29e6821d5773b6760fe676ff5587b30c2b619faebce69141cd4454a15bbadc02308ee2bc56906730d831927189099a
-EBUILD plasma-desktop-5.12.5.ebuild 4331 BLAKE2B 3408266b840dd79a7eaeae9717ee7212e45ee6cbed7ca8c7ed8c9f375078e2711e8a0313af99522f1d606ae8a8b429dc6f5e332e650119485b6366d630148418 SHA512 c151d70e784175edd121ad4011ab90063998e752e53a62f1abeca31c834746e70257f5a968872fe0f52f2b84dcd1496563854973fa4bbc5839fb7e873479ed8d
+EBUILD plasma-desktop-5.12.5.ebuild 4373 BLAKE2B 582459258d212c96eed6d294f2c1ead0cdbc3c717e86cc9b6cb7f6ce076fee251ba8011f47727e7c0ab14af9b5fd68784b54a0064e1332824bdbbe56853d644b SHA512 e5f973247ecdc8cb42288610b8c389a4cb58ff6f214f415fd85fd596c8bd399e2f4ef451e3d5912e872548f8ac182d05ca1bc7f6270f6386f86dd342f1d6061b
 MISC metadata.xml 936 BLAKE2B 36f03184c29147611b8db767332ac26008ede1379844401486b1a9c0b82118c88a63d03c4260601069adc4b3e73d9e7087fd947c99b4e834dfc3aeea5347eb0a SHA512 cbdfc40a4ec80d01d0fd11e695259e4525347f4294a4ff786be7b863b4c679daea38187e1a8eac0239396ccea84ef83c5a7cc18dce387829edc69096e29041f8
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.12.5.ebuild
index f0fe29cc991b..649b3d4be611 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.12.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.12.5.ebuild
@@ -140,8 +140,10 @@ src_configure() {
 }
 
 src_test() {
+	# parallel tests hang, bug #646890
 	# needs D-Bus, bug #634166
 	local myctestargs=(
+		-j1
 		-E "(test_kio_fonts)"
 	)
 
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 15dd1199e99f..dabacf2d6aff 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -6,5 +6,5 @@ AUX 50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla 308 BLAKE
 DIST powerdevil-5.11.5.tar.xz 392664 BLAKE2B c348dd3258a9724f0f4b79dd20e7bc4b96d6e1a062322c07b6f86c20c36319b723b9ab1fcb622b7e55001ab79db24e91b1c8f7baa5b84706bb3fab79835ba445 SHA512 8d3658b5cfe53fbe43880f6ca2346edcfb715975798b20d2059267b4daa47511fe9fb17a5b9882c21b75f80a57763a434373607a79594684fb044aae39cd0fb3
 DIST powerdevil-5.12.5.tar.xz 382664 BLAKE2B f94788e91455dcf17340f1b3041f15db218481360e5d0979d0a785acedd74378ea195610a9b01457f06259176db998e328c2d05cb67d706d456b671bf6a110e4 SHA512 e40342c5565276671c9752b071c84b1c5d648c8c8c56dd127bc57d690be28518cd5782809ffe0253bbb1241034c14652ea29880c1ba0266e1df300e771a4d117
 EBUILD powerdevil-5.11.5.ebuild 2252 BLAKE2B d4f9db9d39cbed2225803934c83bb9449187002ed76aff2770990a5f583c8ec7cb184a0db0c4f68e9b17637dfb9dfdfc4f83614705825e9e7341a38cb9a47c1a SHA512 d3405de703cf20d706014e9207157f029a10412cf8763db86840923b68966e3e8ff20ec5618dbbc4d022b5d8eb70eb4dedb9ae785811871d84054ac6014d1672
-EBUILD powerdevil-5.12.5.ebuild 1788 BLAKE2B 340f9d5dc53957dbe0a3097b28393ecd7ed9af90c73c037d896afa94c3d59ce58011ac9c7070d97f89505ebe4a2c153256c84aac5eb70de5b998c3871b8dd0f7 SHA512 ae488943f2012b8c5b4a87181492665fc62cfdd3f6fbf183f84cbdd00dd5074fe9ba5a8156d51ecc8ee6d5581b22b22987b26860b6e7bca19ae6ec03afb52801
-MISC metadata.xml 642 BLAKE2B 51a6b9a3c4cd0040241ac6be1b9669d7b7b77bda831ddec18380fb4f2b1af4072d0ede8281d3b05da41a6744db95b588dde3efccd4b339e289aee053645231c1 SHA512 870a09abe650b373cd7a4050308fbcc83da772acaf615c36232701fe53835f8bf9d4d092259da42417f97387ed2b37f19d4f4fffbec31087dfa7188bb8bb7056
+EBUILD powerdevil-5.12.5.ebuild 1704 BLAKE2B 4bdc0745eac643a9cc4671736d1e0eb0a054c360c63587f823ecdc2941717697a1e5ff1c793713a11c35574e2b0d56860eeb45fac11fb9653838a18687db09c7 SHA512 dd1e730e8af4c771326521707272cbef59c3914405a01f4841569a06af203825689e273d8a5a15ce6b100b4ad65eb105f00de6a3d1917f6a93822fafa0106353
+MISC metadata.xml 534 BLAKE2B 97d15a7a27a14bea3c3301845fa9fced477357f50b4c507c469be325b427559e3740d2b2242de37c6e5139244ef2ca5ae7e89746cb0f1cbbf45725973e53ff57 SHA512 5bb040940f1c41b842305cdc4b25a3422fd0b4252009006f1c149081c56ebb4e234fe59bc5e1de593854c8846f9b1f890ba4ad54c160b9d381ad45b35a831c5e
diff --git a/kde-plasma/powerdevil/metadata.xml b/kde-plasma/powerdevil/metadata.xml
index 35e126c72166..86d83ec7bd61 100644
--- a/kde-plasma/powerdevil/metadata.xml
+++ b/kde-plasma/powerdevil/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="brightness-control">Enable screen brightness control using <pkg>app-misc/ddcutil</pkg></flag>
 		<flag name="consolekit">Enable <pkg>sys-auth/consolekit</pkg> support instead of logind session tracking</flag>
 		<flag name="wireless">Enable wireless energy saving actions via <pkg>kde-frameworks/bluez-qt</pkg> and <pkg>kde-frameworks/networkmanager-qt</pkg></flag>
 	</use>
diff --git a/kde-plasma/powerdevil/powerdevil-5.12.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.12.5.ebuild
index ed23ce04aed6..e072de3d3b22 100644
--- a/kde-plasma/powerdevil/powerdevil-5.12.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.12.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Power management for KDE Plasma Shell"
 HOMEPAGE="https://cgit.kde.org/powerdevil.git"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="brightness-control consolekit +wireless"
+IUSE="consolekit +wireless"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -40,7 +40,6 @@ DEPEND="
 	$(add_qt_dep qtx11extras)
 	virtual/libudev:=
 	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
 	wireless? (
 		$(add_frameworks_dep bluez-qt)
 		$(add_frameworks_dep networkmanager-qt)
@@ -59,7 +58,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_DDCUTIL=$(usex brightness-control)
+		-DWITH_DDCUTIL=OFF
 		$(cmake-utils_use_find_package wireless KF5BluezQt)
 		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
 	)
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 3e4538144138..6cdb2d9f7232 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/mailfilter/Manifest b/mail-filter/mailfilter/Manifest
index b08d83c2a597..5dffc66e6b07 100644
--- a/mail-filter/mailfilter/Manifest
+++ b/mail-filter/mailfilter/Manifest
@@ -7,5 +7,5 @@ AUX rcfile.example2 4554 BLAKE2B f5ea7e21821042e37506c6b43bb8aa0a8e3aa5872c6b24d
 DIST mailfilter-0.8.2.tar.gz 382966 BLAKE2B 83051f2b692dfe91865e2c5975a491882f8d167cd038a86e9481ff149be82616fd8be69ed171e8393fc0fff7f602802b0dddd0462a00c0b8cd7c0a3c91ffc2e7 SHA512 fc988fe8e36204e4041ce10d6a87f06c8fd48c311aee0d838c2eec08c0d26c13c082fb44a63e7d9c0610d8be52dbf69e340247241f3c76a209319391969ec387
 DIST mailfilter-0.8.4.tar.gz 424789 BLAKE2B 3ffee855a52b6d85ca7241ab55fd31093ff7dad218b37d2caeaf61dbe0a6ce14a283a60f6bee33409363e516902d8024ec4e5008041ddc28b48d7fc1313d5de3 SHA512 d6cd3399240f60020bf17f460376bfa73132e0714adf1e9b34e2993367440eba28d3cb8ef20b997b1ecf02419f69b761f704598641222d32b3aefdb8a96930e7
 EBUILD mailfilter-0.8.2.ebuild 755 BLAKE2B 6dbed812f71083d23b5cb6dd6e9bc97fbb1220ebf686b19e992d4d44956163d0e6c1e5e3be4d5efe25579d3742824501ff78b52112226fe2432f4d9a688f630a SHA512 ad758e9c232779001819bf6939b78bb689f4c243aa2a9bbeedefa3dc9ef78bf58de3565489be2c704a97a2830bf478158cc10cec5dd786311c5e0b34fe6232e4
-EBUILD mailfilter-0.8.4.ebuild 628 BLAKE2B 694bca058adf9a36d3b956780ab50fb27e06739fd49ccb54e4eee68cab61cc9c76e10bd7252282bac32f45d7eb857b6e273f30340fd136e835a07a34c9069a1b SHA512 d294531afba97b771e326de58db1ffbee519c875e744f51998bd686a8ab033740ca8ee7b1f7583e7ee3448799c09ba33c70431567d4acc602cc836ba9536281d
+EBUILD mailfilter-0.8.4.ebuild 627 BLAKE2B 15f1493f92ea5bf063ef6f39088fd94adb20e043d066449a94205be4f7f7efb2a2134ee6a941a1b90d3977150969ee56c8e6d5e90e85524a9a1a99a26609f21f SHA512 a8c53efa4c546c86aad764ed797b0b57c94f77e0a62680bd2c9b9ef1995dcd57c0581cdf21778e21aad76a22facaf899223d507a9261a73c7c8808d2e9a13ab8
 MISC metadata.xml 324 BLAKE2B 53d152511faa79f82e7644c5c191b702f516275c592c6e632577b208c0afab09b1965d2ced2a59a94855990615fa84362ecc8006f1a047fdb2040f3fb3358200 SHA512 3a74aa24b93ab3fc97e9f721991170234e3b04646f1c44fc417083da656473af97bbe13d0fc8a80742a08aba0b798e1666141952cf4fe2d00e43de1a9788dbab
diff --git a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
index f3fccbcc762c..966916901d05 100644
--- a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
 IUSE="+ssl"
 
 DEPEND="sys-devel/flex
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index ed31b2d8166c..fd4dbaa449d4 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/nanumfont/Manifest b/media-fonts/nanumfont/Manifest
index 41f177eefc5a..202fb2fac939 100644
--- a/media-fonts/nanumfont/Manifest
+++ b/media-fonts/nanumfont/Manifest
@@ -1,4 +1,4 @@
 DIST NanumGothicCoding-2.0.zip 2038498 BLAKE2B 965cea0994f106d44d68a2f348c72d76d3d943b068380fcadb2ea81db22354a84a301c452b596e7e2da2542cb3a6172a0dffdfc760c36aca7a782c0211486d74 SHA512 c69cf0dc2d72cac4f38a9ddfa90fb268b0d6673a9b74d728bf3fd08811d5cc8599cb17dae2a0e63e064aca0b733a56da27ae2fcc1efe2b02da631b14a54e1f3f
-EBUILD nanumfont-2.0-r1.ebuild 704 BLAKE2B 3671518fc2b832471780885a00be013a166c740dded6574047aa52eb45bd9d053e488f40a9e5ea9116a015a952acfbab8bc43868156e6f3124e77d907d861e0f SHA512 b8e2c3dd5239404d9a7729defa5c20a2704bc3f47315bc114df5c1da6b1e8ff4b4c6f15fd70f9e7d5a228d1852a57122f2d4a96d6589a817521cbb84f700d5f6
+EBUILD nanumfont-2.0-r2.ebuild 721 BLAKE2B b83f34b1eb0aee35cefc45ae26f2f236329b74ba050dbfd900b10d03caaa454557d6287557722413e6bcb7f1a040c1c5161eec0cffd6c114a5961784bf41e4c5 SHA512 20a66de7d5afc46b306e234485123b94c51431ff5b7e970f77f8d6b39c46d2569f21ba8abe36c298fe1ec3776e11a3502110b21d2c07d4cf95ef891359589e20
 EBUILD nanumfont-2.0.ebuild 487 BLAKE2B 9a9559df6ce4212d812be09d06107ed18fdc9481d0a1316f979b6fca553ed7cd6a2406b27caac5a91db3e72e89219fb58ea82911176a8ce4561fd7e465ceefce SHA512 33a32a6a1869a753df11f60e71d4082901b02fc5df72bd2eb9af413ca14ddadd1d7984285a29d4ffcfe3659d0fc5967db1270375802262d38c5d9ad56edb216b
-MISC metadata.xml 332 BLAKE2B 58065f27878c71ac52b58b5b3f23c5cba42973338a01bfd7ef85a9dde2c7ec53d66f8094fa5ca38fd96fe22a29f9a6947c4e84131ed2e7aff23f0be2a550053c SHA512 9a9acadc7af90e8d744d4ae3b8e1f31973c9d00dd3843261a578111df0fe0fe24df44a9858a466a265bcd0bcc1d55fecdcc8a699a3d093030236fe0e88b03bd9
+MISC metadata.xml 333 BLAKE2B 9d3792a2eb82c78418d947f6a870d94fcfd9f468e3109186cd440418bb0c34935f19b9776c5ec2a93be75f374ea143827e06d075a9cd9fb92a50cf6407cb86c8 SHA512 899b5a869916993f06c848adffadb0af91fcad7ecdf0f5bde10d7a801adcf060b3fb2d2ec7909458319b098b4e5a21a1e64a030ffc1a1c4299aa6a57da17510c
diff --git a/media-fonts/nanumfont/metadata.xml b/media-fonts/nanumfont/metadata.xml
index 45b61bd7e557..9ac950a35614 100644
--- a/media-fonts/nanumfont/metadata.xml
+++ b/media-fonts/nanumfont/metadata.xml
@@ -5,7 +5,7 @@
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
 	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
diff --git a/media-fonts/nanumfont/nanumfont-2.0-r1.ebuild b/media-fonts/nanumfont/nanumfont-2.0-r1.ebuild
deleted file mode 100644
index 8f5d07b24f43..000000000000
--- a/media-fonts/nanumfont/nanumfont-2.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit font
-
-MY_P="NanumGothicCoding-${PV}"
-DESCRIPTION="Korean monospace font distributed by NHN"
-HOMEPAGE="http://dev.naver.com/projects/nanumfont"
-SRC_URI="http://dev.naver.com/frs/download.php/441/${MY_P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-FONT_S="${S}"
-
-FONT_SUFFIX="ttf"
-
-src_prepare() {
-	# Rename names in cp949 encoding, bug #322041
-	mkdir recode || die
-	mv *-Bold.ttf recode/${PN}-Bold.ttf || die
-	mv *.ttf recode/${PN}.ttf || die
-	mv recode/* .
-}
diff --git a/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild b/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
new file mode 100644
index 000000000000..9e1a4b35a724
--- /dev/null
+++ b/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit font
+
+MY_P="NanumGothicCoding-${PV}"
+DESCRIPTION="Korean monospace font distributed by NHN"
+HOMEPAGE="http://dev.naver.com/projects/nanumfont"
+SRC_URI="http://dev.naver.com/frs/download.php/441/${MY_P}.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Only installs fonts
+RESTRICT="strip binchecks"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+FONT_S="${S}"
+
+FONT_SUFFIX="ttf"
+
+src_prepare() {
+	default
+	# Rename names in cp949 encoding, bug #322041
+	mkdir recode || die
+	mv *-Bold.ttf recode/${PN}-Bold.ttf || die
+	mv *.ttf recode/${PN}.ttf || die
+	mv recode/* . || die
+}
diff --git a/media-fonts/sil-padauk/Manifest b/media-fonts/sil-padauk/Manifest
index 444823bb705a..d9c15bfe538f 100644
--- a/media-fonts/sil-padauk/Manifest
+++ b/media-fonts/sil-padauk/Manifest
@@ -1,3 +1,4 @@
 DIST padauk-2.8.zip 556033 BLAKE2B c957dc2b65802010fc4f888ed2e900441030ae161b1f8fa3e0ea9c5d6ff403127a84ff4eebb00efa48968699392a9a8d242657e68cccf08daf8a76fa17ed8898 SHA512 7f9c4f89bf1c2ee097e0beaada6853b2b40d8e1cd557a94286382a412af2e8fefd30b54b302ba569fe75f281ac9c3b9e8b2210102adde9578bc4bae0114929dc
+EBUILD sil-padauk-2.8-r1.ebuild 497 BLAKE2B 4a75bf452abb9fef3f47b6aa2aefc9e8fa206c9dbacb777068053742857cbce4b3b4805c5e7d2185de975cdc7bd3931b895d3e3d20bb8de5653297503d9d1031 SHA512 f3c6f9c374212d2cd84005235632bb40a6dea91d2e8ff67e9d026d6caa97f718842cdb366dc0e37a637c53077937018270fb34eed459f8a3ae9cb8e2ba35b9ae
 EBUILD sil-padauk-2.8.ebuild 496 BLAKE2B 26c183757e6cdf9dd3a3795c775c0dcb21371b8f64bb03dfcc4872dcc97e26018b1c9881a25044b7a6391555b6f8bc07f305f55496fc727edc4b477b07310078 SHA512 f98a9664d554a8251fa56b3a1cf9188d0e05b3955213619f42a54eb7557239d043ac24a98902c76f1ae3fc9a28a22f38f1bfe7340297379221347d573cb382c4
 MISC metadata.xml 414 BLAKE2B d9beb4772ec5900f5d59dd25ddabb6839519b298affb780c548febe8e93fad52e53d1763b82d49b248cc3972bb5b7f3228fbad05c9fc2d611239faba2395ef60 SHA512 6cca51cb9d6fcd2c1253bccfcbe8ccecab7463bce295c430d81349cd7e7de227f7da7b8f301e600b4922137638500ff6a53b3a9cc803b1b6725c9b52de86c7f7
diff --git a/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild b/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
new file mode 100644
index 000000000000..2aee791b313d
--- /dev/null
+++ b/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit font
+
+MY_PN="padauk"
+
+DESCRIPTION="SIL fonts for Myanmar script"
+HOMEPAGE="http://scripts.sil.org/padauk"
+SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip"
+
+LICENSE="OFL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+FONT_S="${WORKDIR}/${MY_PN}-2.80"
+S="${FONT_S}"
+
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/source-han-sans/Manifest b/media-fonts/source-han-sans/Manifest
index a07d193c8cc5..5aa52637ca56 100644
--- a/media-fonts/source-han-sans/Manifest
+++ b/media-fonts/source-han-sans/Manifest
@@ -7,5 +7,5 @@ DIST source-han-sans-zh_CN-1.004.zip 50414779 BLAKE2B 61501ac790b4ab88ae48bbcfd3
 DIST source-han-sans-zh_TW-1.001.tar.xz 28238164 BLAKE2B 626bf22de0bf3aeaeb3ee552b13af62a0ad08b654662abd1e12231fbc55d9f3e1bcf473751a13438f8f8bc54a3e75d9f50cd92706548b8c9f50a0e2b68c5a993 SHA512 909b9a8ce3f28a878b806bf89b7016f31842c333b388db618cbe4acc005e2e0f53af6cfad4fe6957575b8743363ded4568a49b62a65f044d409b0464fe096e39
 DIST source-han-sans-zh_TW-1.004.zip 34014710 BLAKE2B 1cb3b344f8d9813b27ea79c6e08ec2c462567cb09325267d1d0dd2e463bef5935d4fd42af8ef8d16dd9b2441e2b2fd0cd323f5065abeddbd911a187a05f6205a SHA512 8e1a7ec36a368499cf132ef63dc531c61a19374eedcbc99c6937ef5d2c1e557662e79b796fa8df5e211ffce6fdf290186a235a357b0a2af75a103f3223b5f914
 EBUILD source-han-sans-1.001.ebuild 1194 BLAKE2B e72504920779c8f2cebd09239afaf3760dfca9f8feb4efe78228439d882ffa1d5cba1567956710886d8d2a92cb79fe7a5a4b12745e3b917d2543b3f3665a1068 SHA512 3dab3882c976162dcb36748f2ff51b7bc8fda748a47ca1cdae6d485b35518dc9c3df5f5652ebfb7b068da29ef2e1791bd51077f1aa55be64062410b034a0ff54
-EBUILD source-han-sans-1.004.ebuild 1431 BLAKE2B 39541f4950ef3eab90f3c42e9c8a86176ca03855cd7c7b961c68fff3a1eb7a7c5588ed6a606e5c10598c77f1b9d3910bcdd42479a8c5aab099282814a302a1f8 SHA512 2e235c052f727d97531f17c715cd45a01911a33c2d209e1debf421b6e6a5b03d07fb2340fe1ea1f9a06425c078cb863546063234d2b0cbb6a531e10350db972e
+EBUILD source-han-sans-1.004.ebuild 1443 BLAKE2B 9b839f997b647305eca937123114e90466708cde91e7a6856e31843722e0e617129a36685606b16bdf49bd2754a6f1ba1c99a3d8c577333b26ac0753d18da074 SHA512 ee81670bcd420a71d1a8288f9b10185039f3a86c3040c45954c5902bd517ae8457ad69132b845903df56a4e3a5f757250aef0c96171c857a3d59acd4f0589986
 MISC metadata.xml 575 BLAKE2B 4e46bc582aacf09caf57590ce707ccb64e76db1463bb84c6e82d019d1fa37a5d8e95b2580b2b5a024a4502a9f2b8788c1f4fcc8f74dab3086124c15a5eb6723d SHA512 b5e8f6a84958d00861fa1dd4a7a2bc42bfe91940db4fcc2b2b1c96c8aa00eaec06563e45afe4b03680857f2aa4667a5611c438d631c37c6b16d48ca326bcb420
diff --git a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
index a801140e2f2a..4ab248414568 100644
--- a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
+++ b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
 REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
 
diff --git a/media-fonts/source-pro/Manifest b/media-fonts/source-pro/Manifest
index f46e19c5df3d..caac9ba40a34 100644
--- a/media-fonts/source-pro/Manifest
+++ b/media-fonts/source-pro/Manifest
@@ -10,5 +10,5 @@ DIST source-serif-pro-20160608.tar.gz 1528897 BLAKE2B 1b28148bac4078f0a3d8a32f14
 DIST source-serif-pro-20170111.tar.gz 4682667 BLAKE2B cbb0a421be445534fc3e654a0c75af7e0b64b92160cbc5203a559db6ad538833af86145b5394be48f47b51a572307088d984d62f19e6c6ada05c2d73c61a6510 SHA512 7644269bc99674605014b2b6fe69dc04fcbb37714cfecf8fab4fa6921cd40ce310b4a10143da894003c5aad8fd0edd80ec18fd739aac5d74867f5f3890d96b23
 EBUILD source-pro-20141211.ebuild 1267 BLAKE2B cf69c222d1a71f8ca1d25b9f4dfec9bb1c6ec236016ddca448e05db2a7463ca8c7af50ae46770c181f586631f6b975c6128eacc34ff01ddb0bb283eb2f5c0bc9 SHA512 738d88240afa81289dab161ab9776aa5da8dc71c84e25a25db9292caa1cbc87dbe430e6421de57b350e9bbbc945e466175acd3d23ab5006ca49c5e619395dc2b
 EBUILD source-pro-20160608.ebuild 1320 BLAKE2B 3e43990d7f941084ad715f2c0a5505c7c917571f27cb227e35a4ff7945cd7a8c595b74943d1f7f2b8796899c2ad35e845c6429f7ec6e8f1219e1cabce9a3f748 SHA512 6d7fdcc337dfe24fc5e199db45c03cf8fa085b9709e398e711bdb0f1ba83803d351e2f1c4d2c94f936cb8a3b471b0cbf1323f57197acdc20b2209a3b79db7cea
-EBUILD source-pro-20170111.ebuild 1320 BLAKE2B 3f35bd827a7815d2e4a1bd3c67493eea91b21c43558d905ddcf5fa1c6ea2b2af532bfebf5bac9f49584465699f33f6100ced3f29d1f428e43fdd4ec8d1005d85 SHA512 805c94dbdb9df1a22dc700bd8a890e556c563350bb506119270b1df0d72aefd36fa9e28f10dc5381a5eca691ff760229d6dd219075c91a7fe9dc4c8502fb8409
+EBUILD source-pro-20170111.ebuild 1332 BLAKE2B 84a1d4108da637e3fcb57f1ff184df64ffe027ddf6c72361b3098a546dd6259b36e5708acc16799f252e70cd629b2957d6537a5993416e77f302b13daac01f43 SHA512 91938545e2062d1c157bfef9822d621ba68103bfd947db8b1819a195831d6031ab71864cda712bfb80b1e6fb02c308813c73770cd39a19ff79cbe0c8e2b77689
 MISC metadata.xml 391 BLAKE2B c0bb16c63d4e035da05e7f72abeaadee956760bbd9b82b1363cb09db1eeebe11fac61b6345f1f19cfb76f30415c2bdadfaa4888f886b0600780434248ca22968 SHA512 dc4ad0cdc83213489305cf3c520eb181249496727c83635b2b6d5675043a91644e29e4ca7d3478e0453c74a0981f3d4e5c5a35c0d7631a808d5f2710b613bf28
diff --git a/media-fonts/source-pro/source-pro-20170111.ebuild b/media-fonts/source-pro/source-pro-20170111.ebuild
index c0c9079e27bb..d3dd0c676868 100644
--- a/media-fonts/source-pro/source-pro-20170111.ebuild
+++ b/media-fonts/source-pro/source-pro-20170111.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="cjk"
 
 RDEPEND="media-libs/fontconfig
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d606c02ac1de..60137676995c 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 28ce28ecdc06..9579a227e2f4 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,3 +1,5 @@
+DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
 DIST engauge_5.2.tgz 5708224 BLAKE2B 65403f3eb322a3cfee2f04d3a973deef5196a475f594599e3226dad776505c639536fdc46ef94d955d94b0629faf9282378e7bb4d4d7945e0ae69cdd6160a858 SHA512 b1839a223c93866f880ca090b6dd5a9ab45a89b5f6f470fd6abba3e2aa4b108ed228c8b06c3888fa463316798c2d157e20b2e22975bd65a1124d007bb36d2d88
+EBUILD engauge-10.6.ebuild 2285 BLAKE2B 458d2526784e58cb6299bea5e0b92616fb496361fdd28ae2bbfd865562a8c87aad73b765c4de0849edf7a5950f267ec14f4c009b102a07f4a5b79672658d9c4f SHA512 860f7cf94e180125c46c943b60f62278d16226a2bcba4a28a810cfc630de704bad701340df7f368d4c445f06e639c32380e42566d86cfbc266f635ef4ba9c9ee
 EBUILD engauge-5.2.ebuild 1293 BLAKE2B 2225bac7ed507d6922587e930bebfc47c3d944df5bd65141e472d1ca4ed83a38594f43e7233b9a82b7fe868ad90c78190f81ef882ae18248ecd95d61e94192e5 SHA512 935c106dad40e7c48255002c2d59c8db5524ceb3e818f554b4bbc660bc7e4f081aeba4fe3db21f3c38151cc66877eaf9730a825351236af690026996b3540e1c
 MISC metadata.xml 337 BLAKE2B 8c46cdaadb388ccd12d29c41a075ec60130482855d0735cd468a174e631129964fec7c2e7649994e8f958def8ceb8f4ad0ecb60ab69ce37171c9945696825369 SHA512 41201e69d211283450ef6ff45a23e0978934044e170da84de7e7978360bd5ce1e3b277df4a90e00221cca3f987cd6839ee90fceea232c70cebeb69b5bc7c1c6d
diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
new file mode 100644
index 000000000000..ea7530fd0b5f
--- /dev/null
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils qmake-utils
+
+DESCRIPTION="Convert an image file showing a graph or map into numbers"
+HOMEPAGE="http://markummitchell.github.io/engauge-digitizer/"
+SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v$PV.tar.gz -> engauge-digitizer-$PV.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples jpeg2k pdf"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-libs/log4cpp
+	sci-libs/fftw:3.0
+	jpeg2k? ( media-libs/openjpeg:2 )
+	pdf? ( app-text/poppler[qt5] )"
+DEPEND="${RDEPEND}"
+
+S=$WORKDIR/engauge-digitizer-$PV
+
+src_prepare() {
+	eapply_user
+
+	# Make sure the documentation is looked for in the proper directory
+	sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \
+		-i src/Help/HelpWindow.cpp || die
+
+	# This otherwise overrides user CFLAGS
+	sed -e '/QMAKE_CXXFLAGS_WARN_ON/s/-O1//' \
+		-i engauge.pro || die
+
+	# Neuter the non-pkg-config hackery
+	sed -e '/error.*OPENJPEG_/d' \
+		-e '/LIBS.*OPENJPEG_LIB/d' \
+		-e '/QMAKE_POST_LINK.*OPENJPEG_LIB/d' \
+		-e '/error.*POPPLER_/d' \
+		-e '/LIBS.*POPPLER_LIB/d' \
+		-i engauge.pro || die
+}
+
+src_configure() {
+	eqmake5 \
+		CONFIG+=link_pkgconfig \
+		$(usex jpeg2k "CONFIG+=jpeg2000 PKGCONFIG+=libopenjp2" "") \
+		$(usex pdf "CONFIG+=pdf PKGCONFIG+=poppler-qt5" "") \
+		engauge.pro
+	pushd help >/dev/null || die
+	./build || die
+	popd >/dev/null || die
+}
+
+src_install() {
+	dobin bin/engauge
+	doicon src/img/engauge-digitizer.svg
+	make_desktop_entry engauge "Engauge Digitizer" engauge-digitizer Graphics
+
+	# Install qt help files
+	insinto /usr/share/doc/${PF} # this must match sed expression in src_prepare
+	doins bin/documentation/engauge.{qch,qhc}
+	docompress -x "${EPREFIX%/}"/usr/share/doc/$PF/engauge.{qch,qhc}
+
+	if use doc; then
+		pushd doc >/dev/null || die
+		doins -r . || die "install documentation failed"
+		popd >/dev/null || die
+	fi
+	if use examples; then
+		doins -r samples || die "install examples failed"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/fbgrab/Manifest b/media-gfx/fbgrab/Manifest
index bacd9f2e756c..eea2e5ce38e1 100644
--- a/media-gfx/fbgrab/Manifest
+++ b/media-gfx/fbgrab/Manifest
@@ -2,6 +2,6 @@ AUX fbgrab-1.0-Makefile.patch 428 BLAKE2B 6d2b35128b71ddde843351e79f221ce3c8ec60
 AUX fbgrab-1.0-zlib_h.patch 263 BLAKE2B ef76dcd3320e31950beb9bc178533e8e99796790578faa8647ad58259aca7f6c0a5cb01422040b3cdac04f160fb25992ea45c275bdbdeb8d47788914af546cb7 SHA512 ac8576a25e963451ec298888208f92d8bb383c06655a96bf691779c5600db9c85c6e488b139519832b46878a46caba05d47f37ab27a3b2529f657341e5e93dbb
 DIST fbgrab-1.0.tar.gz 11928 BLAKE2B 7a87727eb428e9612f1575e119995bac06ea0cb5499f075a296a111e4f983cebede5b1b2c0c76304c320e2dff36331e085e1124f4d9c34d6d33dcc792d760e8a SHA512 83346be21b3dc393165cfbb210284679e9fc746380fde9939d96d8174cd320d71cc6bfbf23a9495a107c8f0a6ded43342f843b530996f695ebba0388669a35f0
 DIST fbgrab-1.3.tar.gz 13027 BLAKE2B 57acd93432b01befd99c73e45337bd2eecfdb18b9b5d98106e1a433b48bb03ef05cc5d3a99e0a34f501bb4d0731c8d6c92bcd8b145dd5f503632b63d41d902d5 SHA512 2d1166890f41d7de813a6c9b722db148980fcc802da38dea1a42d1f150cbdc16d0dd6757bc334586402f109b382e5039d44b03f9f19024f546958bdf21ca5d52
-EBUILD fbgrab-1.0-r2.ebuild 679 BLAKE2B 63c82d6e4a45881af375d9fdcf66ccc2693044460444078cc87ddca889635bdef8bd28dc15931eb04534898c68660cd6196592d09cf76f7245c9f2615106f1c4 SHA512 5dfe9dac506ace89c43bec3fc63841c04d82666185198028c18948cb88f484cad3308ff77bb7992885adacb5a63a4c2534e2fa3e40d64f016cb2d25915212f67
-EBUILD fbgrab-1.3.ebuild 619 BLAKE2B 1c47751578c9b5eb19036ee19ad35187ec17ce7869d12155f5109d25a1635b5cf0d735481a67ad82120b24a903835bb546939e635ca003b41fea5fa7647917b2 SHA512 67c4907d143d92d263e37776adb4acc021627d5297ee2789c84d09f0a78d37ba7f690bc53f09c989c139cbfe77f99594757d530114938e7b76d32b2d522199dd
+EBUILD fbgrab-1.0-r2.ebuild 681 BLAKE2B 70a68abab4e8ae84ffa80bad0aa5465b5785e4018fb0ec6747c3a81fa06b4da7ec5808a43b9a3960c3068f2c3d7a416397d4da8f49717ef7ff03015ea82d5504 SHA512 11806c19157a92bf3b799fa7e4ee9ddc0aadc8703d10fde65cff260b1c66d02e9aed7af270d57eb72503cc82596cd5e1e8491dfe90ac69d997a6dca729e379e5
+EBUILD fbgrab-1.3.ebuild 621 BLAKE2B 3b77470a9c15d6ed2e846c621e1071ad116c2e6c1ef25dc88052b5ee76e90f4f58f97659c4515ee770c896b6abea3f97c0431171553c7b70f7a7c70e6a18807c SHA512 25b0a43aa49b49527892b0226fcd11e58a9260d7077bd9da9f22ef43b26a8889ff9d3f7444b0249553af15a923bd3bbe83ce51210d5c741b2a3f293e3f979896
 MISC metadata.xml 355 BLAKE2B 907ae0fec9a4a2284f98737d79de3747882c83bf3dee2588056ab3baa2720b987eda2930a3b79dae83327363d13fa72b98cc04d7b3d477f0b53f26eb6e11396b SHA512 31b407791cd97b141997fff192ac75298957edee59fe3a9c46d7a08f839b99ca2e4f3536632beca933d74a8e22464dbd7fd34fa61c106829c62c8dc69b1b8231
diff --git a/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild b/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild
index 77413c616e07..a6a0d1458ef1 100644
--- a/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild
+++ b/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Framebuffer screenshot utility"
-HOMEPAGE="http://hem.bredband.net/gmogmo/fbgrab/"
-SRC_URI="http://hem.bredband.net/gmogmo/${PN}/${P}.tar.gz"
+HOMEPAGE="https://hem.bredband.net/gmogmo/fbgrab/"
+SRC_URI="https://hem.bredband.net/gmogmo/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-gfx/fbgrab/fbgrab-1.3.ebuild b/media-gfx/fbgrab/fbgrab-1.3.ebuild
index 0a53b0370185..79ccfa440935 100644
--- a/media-gfx/fbgrab/fbgrab-1.3.ebuild
+++ b/media-gfx/fbgrab/fbgrab-1.3.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Framebuffer screenshot utility"
-HOMEPAGE="http://fbgrab.monells.se/"
-SRC_URI="http://fbgrab.monells.se/${P}.tar.gz"
+HOMEPAGE="https://fbgrab.monells.se/"
+SRC_URI="https://fbgrab.monells.se/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index a3ab669457c3..4288f4b7aca4 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,9 +1,13 @@
 DIST ImageMagick-6.9.9-31.tar.xz 8819864 BLAKE2B f6cdb19bff58a0b318a9af78f3fa429137cc4e79bbe075f9c6444204ce8a4324dde5792ab7232e6898a4993ad558c514a143c14469370de822038d1d669fdffa SHA512 85cbe4e4991a08a5c11c01b4276525fa1d63bcef9a9814fee1f8ede3a5ed432da8d3d84965ed75105723948d07ad879f7cf07d5121f0d624df9275dd4e41cb8f
 DIST ImageMagick-6.9.9-40.tar.xz 8919136 BLAKE2B 04b9585948194e6ba03efa549d9ef6a8b12fce141346ddd7dc1b40e72349dc603bc6154a3826496dae47ff8c0eb5b6a5b80ae51a60d0d8a632debcd9229cf3da SHA512 416c2e248e3d1c6d89b930b8179194a9e1dfd160b9de1a75f98ceeb4199dd1b5f3b1d0ce646c26429054e7970680c40b77e2bf0a97ca82bbe84aa66648393fb4
+DIST ImageMagick-6.9.9-43.tar.xz 8912476 BLAKE2B e6106b321c68c05f048eeaa0beaaa87fe724556d9b16842bd0643d806f3a2cfae3016bc835dd9fe1f9842e8fd61ee52c6ddceea6ce44d9c265387cfd35b57d89 SHA512 ff5b7daf521b6e0ae8cc123a56eca72e2abafd08101f0134866745ddafe21c9a08a1f6c73218bc3d95d8afc79dd0f66926d514b2c6083468391efead5afac6e7
 DIST ImageMagick-7.0.7-19.tar.xz 8546416 BLAKE2B 6750dba45f7971f7a7e74ac7ae3ec94732a2bd31f638afac8a91abd595e81aadca1372ddb46dcc3bf2dcb258ececfa69a8e8ad5ff753930462d46804863c0f4e SHA512 656520f719a375c837b2ddebb7e5920e9c06a9f81f3529b8a7c405958ca75f7464790ff931b7a32e104ef500570e71ff80d3dfb7c5cf777b2a5ad8207fde7928
 DIST ImageMagick-7.0.7-28.tar.xz 8611096 BLAKE2B f4e70f32c5716f5e4673d9b938ea3924fbfc1005084bfad06afab493d50bcee2e43cd8b5ca0f83945dbc80f731c914633c2a401172e8d4e0289c7c9afe4b1209 SHA512 0a370ee3b8eb42c563bb15fa469208ee70520aa148af1752721e29be90a6a95a5773674f2d685d1f2fca77903f9592ffcbb9d7214ea96818848ea9dd135aef08
-EBUILD imagemagick-6.9.9.31.ebuild 5119 BLAKE2B 2cbb928e6cfe041c36fcdc672fb2a0919cd0aa21fa7f15d9a34ee041038a549e96f714995bebebce79645d8b90bba47a6d57545eba452d7a8067a9cb19553074 SHA512 e2d8cf21b2221d2ce766243ee805ad371b294fe4d00d3a0565ecc296acc027d99d5e6d90a8929621bb7363e1cd4b0a3e12aac34c7f4b2ce93106763b730aa436
-EBUILD imagemagick-6.9.9.40.ebuild 5120 BLAKE2B 743006779fe1fa491552b3296339b20525aee009fead6a0ccdf0a47b0241ea1fa96f92c812a2c76c720b82093ef133abd68a683c4ca93d9b7f7295066a6175c5 SHA512 6ba2b95f552ec595f5a6d53d93a7b51ea087d326b5953e702bcbe98e18dce88aa523a4d4aee57933540c3e9b42e02654d9ceb0faf1499487adb8bb6148f2de84
-EBUILD imagemagick-7.0.7.19.ebuild 5125 BLAKE2B 9fa2d0ba9e119d28bea9119012f1da9ff36e1f46ee33658439fdc7b6d1c6d766168409c91cc9b9850b6a4cb3ba5705517a4b18ba8c42094567263ce97417ee4e SHA512 0db05a2bf38b3be497655cefe90873df4868796874da5607620ea1c65c7e59ed34b16746255ee71d2987c9906a40ca730c48785f6e86c4ec69e2cbfc5c32fb40
-EBUILD imagemagick-7.0.7.28.ebuild 5126 BLAKE2B d72b2d20622f173d4734854359886a2b786e5be9e5cd153ca8adcbb98693b005c87d947063fd368ddf7e39345ff0937c2ac36c746269c8099720298161bb77fc SHA512 292096aa5856a91a8434605172132d5e57a686b4be2422d5e7e0f00dd162e867811c21cbd4693a5a7e51cc1b6aba69692582818abd563ef185b172aae0c0e2bc
+DIST ImageMagick-7.0.7-31.tar.xz 8613064 BLAKE2B 6d4f731002cf099b5fc007e645fbfec32fb87b5f9b77f1c8a15897fed44c5fe55f8d356775675c709cf3ea600a2cbf67b8b9c7d7a0cec5c55647714d5d0ade27 SHA512 6575c009b021eb759e2129908e8deafcfa766758aae0b8f51d8b0c555444440c404bf20df63671259315b7e33476322217e3239aa2ba1c8b938996d54e988ee5
+EBUILD imagemagick-6.9.9.31.ebuild 5120 BLAKE2B 0d046adad40ac52ebb6f091eae800054b7c22ebd425f6e64a7de68fd6f10ecd699c537a5284f39f496f02be1ecfc44252209599589a3c8686f81988a8e7adfbd SHA512 b45803b538b7d1c6e3d4c3abcd363354b561e01360eaf36cf587e61bae66bbc2543d754dbae8b782cff89aafec267538253f6e3af34211e146e152d1a688e140
+EBUILD imagemagick-6.9.9.40.ebuild 5121 BLAKE2B 686029e7c87384f8f6e06c0eb0ed3a348a48b0e52bddca4f4942cc105b2f1d280859031c9aa6ea9198c981373e74a9f9dd19e95e553e62b6e9d6f9c3d41b8265 SHA512 4c02b42d699833cc4ab7597d576d21d64f991bb947d9193992ce3100d0599fa0cd71306c93316521409b096bd813f3720a474283491dc3e937a8a68264b3b3e7
+EBUILD imagemagick-6.9.9.43.ebuild 5129 BLAKE2B b7b332d8137559fc443657fe4510668dce05852e1012d055cf8612668182ead6b20850a0182340ca9f6ebdb96356ab63c99c788ff4eb3ffc961a166d80059c3e SHA512 aa9cc3f5bed77db0a14ad9fc2400393287ff6656d31fc9dce58b969c04a38c6efbd4b6c48a9cef0e19407315226766725147341bd9bf86db184d729586c9bb20
+EBUILD imagemagick-7.0.7.19.ebuild 5126 BLAKE2B 944cdfc402eaf48aeeb4fc8fe7411233774ff8c44cab855aa50b79c22502adeeb38879fc8c454c428504b8d290e4fa7b41386a3a0404204df322928cf180425c SHA512 a9b3b238e38e931d534fe4826b0ba525bc6c9850a1aca244c701199d66fa989faf86d7c0a4995a0012e5bb68bbf09e15628494aebe8bbb3b8dc8a725a5e95885
+EBUILD imagemagick-7.0.7.28.ebuild 5127 BLAKE2B 8f974d1ca9caeafa2894d3210407f9f0455bd342c3c92505e595bb623ee1e729cecab7f4229f124a74e8ca6d25d942646b69af2c3f01ccf7fe617bdf167ab0c2 SHA512 4f87c1cf80d6e9fa77e2a7f5241e7958afc151c4d434b87f305e9a528ed1f238fe383f0276916b138ac11c769c3acfcefa5b4a420e16c2f0dcb41e66eaaecf34
+EBUILD imagemagick-7.0.7.31.ebuild 5135 BLAKE2B 4ae4afe162f2ee49efff7e8411db1c3b6091ce92d5f87bf361e2efe4b4414b8357a480b5f29d4c65f7291f673e7e5324dd42dd84dd4f387e40230394cf60cc70 SHA512 73588fd964051bc8ba3e1465b25e63a90882d8b452a04a9cd40070953a6c3c59ccfc8fd64b4a7f537d6d1811b7f8160db534abcb46bd6e0be4260e0ff1138b77
 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
index 22edbc5a0ffd..f92a349caf39 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.imagemagick.org/"
+HOMEPAGE="https://www.imagemagick.org/"
 SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
index d971391a6a9c..7805c757cc97 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.imagemagick.org/"
+HOMEPAGE="https://www.imagemagick.org/"
 SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.43.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.43.ebuild
new file mode 100644
index 000000000000..52e77059cb1d
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.43.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local mesa_cards ati_cards nvidia_cards render_cards
+	default
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
index 4874250e8c06..0c38238d52c4 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.imagemagick.org/"
+HOMEPAGE="https://www.imagemagick.org/"
 SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
index 7b4ac4bbb033..ba362cfde7f7 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.imagemagick.org/"
+HOMEPAGE="https://www.imagemagick.org/"
 SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.31.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.31.ebuild
new file mode 100644
index 000000000000..1db0353011d7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.31.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local ati_cards mesa_cards nvidia_cards render_cards
+	default
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/scantailor/Manifest b/media-gfx/scantailor/Manifest
deleted file mode 100644
index cd4f6ba5f0db..000000000000
--- a/media-gfx/scantailor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scantailor-0.9.12.2.tar.gz 1207379 BLAKE2B a2949c0d9a495d50927d27e33f889567a033149c3745ad522b00d3ea3b6a0c0bc7e6cc66dd79acd3b29b95eb41293774ff78215b5da7618dfd51757e1b1e6ab5 SHA512 d98603c5b3dfadeae3bda66d8b5ea085107edf9ee03efd299d50bf88a01f2b1092957f1ed4abe1a5d53b9028b7dec16dc5a8452d1a197fe0f3aaddeff6d02793
-EBUILD scantailor-0.9.12.2.ebuild 1145 BLAKE2B 71f0f2a643a491ff37f0803bf304ee8e7520f6259de415212af6c6eda9d7b8be814c6a063112174cd155e67d5ef4ec100ff5e77408727dadefec4738718de503 SHA512 451755455e848fe065829dffd38acdecab33e8dc53e25c064045efe5fb06c523041a45e25e84bf7f7a74cad47d2ce37c0a29ec50aafc0d6f27ffeee4df9242d8
-MISC metadata.xml 345 BLAKE2B 309269dbfc7a962d80f42e3ae5f034d26dace8d374e75c50dad2547725ade2c6b57cfe09e9754a20f003e73e33d3077331ec6edc3927516e283bda7a175ba14c SHA512 9cf847f38815e0611b5fe52a7a70a8a51d21a48ba68b13a204de1c3d8613e472a815790597bd691215ba09a50d57c5b6a7c7b122cf4bee166d89384f43a2045d
diff --git a/media-gfx/scantailor/metadata.xml b/media-gfx/scantailor/metadata.xml
deleted file mode 100644
index 9e17a6dcaa61..000000000000
--- a/media-gfx/scantailor/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">scantailor/scantailor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/scantailor/scantailor-0.9.12.2.ebuild b/media-gfx/scantailor/scantailor-0.9.12.2.ebuild
deleted file mode 100644
index 6dee26316088..000000000000
--- a/media-gfx/scantailor/scantailor-0.9.12.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils virtualx toolchain-funcs versionator
-MY_PV="RELEASE_$(replace_all_version_separators _)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A interactive post-processing tool for scanned pages"
-HOMEPAGE="http://scantailor.org/ https://github.com/scantailor/scantailor"
-SRC_URI="https://github.com/scantailor/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="opengl"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libXrender
-	opengl? ( dev-qt/qtopengl:4 )"
-DEPEND="${RDEPEND}
-	dev-libs/boost"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_configure() {
-	tc-export CXX
-
-	local mycmakeargs=(
-		-DCOMPILER_FLAGS_OVERRIDDEN=ON
-		-DENABLE_OPENGL=$(usex opengl)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	virtx emake test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon resources/appicon.svg ${PN}.svg
-	make_desktop_entry ${PN} "Scan Tailor"
-}
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index fb6f3a618661..1cf2aa71035e 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,7 +1,9 @@
 DIST shotwell-0.26.4.tar.xz 5619280 BLAKE2B 0ca9ecf6e96019aa8e9bd4bae09d1b888902fc054633271854e09e1fa9b474774b7b5f2e6e3bcfed60a5b0f3ba30a2d89133d2676a94db5f4da6ee6a0af41102 SHA512 6a0772a40759d636807652ef27814306cbc2217119b071590db36c628b6e9d04f876ae1748c88476fbebc1db0c83e6a108c9f74261b7faa348c6bd37c1da198d
 DIST shotwell-0.28.2.tar.xz 5582276 BLAKE2B 20d35f714543d35bd04fe81617040419664e662664ae504cbfb0b3bb160d97a5469478e1e134b6432b174fc19bb4fc370b5eb38c576c805e876d00999fb7d979 SHA512 dc00f45e55eabadaaf825de5a4152d40db2eb652f966b870a08d36006887a18aacf570b05d232a9fc7ef7df097a468a497778022bf7b86ae2143877c02540cc0
+DIST shotwell-0.28.3.tar.xz 5531900 BLAKE2B b585989434e3da9b2d5f43aabf41451e33b7b2f537a21305ff9decd9992d42e5422971d1f89836936630f641efdac1242dc21574d86f61a4c71562b657e0300d SHA512 9a0c15bfe856dabaa85038fe875cc178be6a3e104397b36555005615212ac92579234fc6277f1a4a7bddba517e9ea0db5ed06e0fc30614453e3db1153b47dc16
 DIST shotwell-0.29.1.tar.xz 2368080 BLAKE2B b706229803528c55486219a4190d1145d98b513ff26a4a3d2989abd57ff3465ffab231b1779014b7babf7ce33cc875fa11905a95bbf108251c57d3692a5156a4 SHA512 25e7e7d303ecbe89ecf4eba219b6f10ad44d23209d2c2724c6d61afae47afc0a6e1a7a7fe99931888f7374419818c5d74e28bb6120383e191c038c967c84ce39
 EBUILD shotwell-0.26.4.ebuild 1488 BLAKE2B a18a437d65ca3a9999f0f238d7442564c012b08d209384d8b47fedd12a8eca4c1e91e28ba18b456ff860c56a16cd1059b2d7a0541d06f10d2937efcf893a607b SHA512 2cd5b9e390f61de3d0db9ff5d0ea59ff36eef745afb237ea82d87f584fda7ca200b95eb7273e1a74f401e5a7187e8eb78c98910723d68dccdf90535a094bd0d6
 EBUILD shotwell-0.28.2.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
+EBUILD shotwell-0.28.3.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
 EBUILD shotwell-0.29.1.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
 MISC metadata.xml 900 BLAKE2B 62d1bd65c242a5da435f9217c538250495879be4d0b2de3477111018ed456f019abeb0bf678835997ff2c567fdbb844ca257d0c4bad8d07c3ad590adc82202cf SHA512 aab4bb7556cb7fc926b59e68d16a2425af57cab5ae80c68ce2dd650bf49b9e3872771fee51552aa0aba9c50167a33b1976700f65bbc1531de44ac638cdd4a0be
diff --git a/media-gfx/shotwell/shotwell-0.28.3.ebuild b/media-gfx/shotwell/shotwell-0.28.3.ebuild
new file mode 100644
index 000000000000..ed1f73414218
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.28.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome2 multilib toolchain-funcs vala versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/gcr-3[gtk]
+	>=dev-db/sqlite-3.5.9:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libgee-0.8.5:0.8
+	>=dev-libs/libxml2-2.6.32:2
+	gnome-base/dconf
+	>=media-libs/gexiv2-0.10.4
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-libs/lcms:2
+	>=media-libs/libexif-0.6.16:=
+	>=media-libs/libgphoto2-2.5:=
+	>=media-libs/libraw-0.13.2:=
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	>=net-libs/libsoup-2.42.0:2.4
+	net-libs/webkit-gtk:4
+	virtual/libgudev:=[introspection]
+	>=x11-libs/gtk+-3.14.0:3[X]
+	dev-libs/libgdata
+
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.7
+	>=sys-devel/m4-1.4.13
+	virtual/pkgconfig
+"
+
+# This probably comes from libraries that
+# shotwell-video-thumbnailer links to.
+# Nothing we can do at the moment. #435048
+QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 6f183956f1d4..392e18b6e00e 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,11 +1,7 @@
 AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1
-AUX zbar-0.10-no-v4l1-check.patch 2270 BLAKE2B aeaeeeed38d5d2d7cf500d8a10f294341aadab8cc1a0843a3b4aa3fa2f5d3b5857112ea15a73c85b09c10ee0d1ccc1f855ac44d54179f2801c6d4ac0dd0bca88 SHA512 f2f66476769469d701206bf1efae16d384cfbaa138c877a0ea32bedcd39b5abfd6dae630e7d729b009ab50052db0166198949f49ddfb66d708792000808da74d
 AUX zbar-0.10-python-crash.patch 604 BLAKE2B 463f23b6338455b0029fce845fcbb02168c86b9ddc116f34f15668459d8ac86d77dabe388cd61af9182c02be37475363ff832d7c8c705d29bf1829f7ccb167b3 SHA512 56e1848466b2178fb25a1f88f1a35113c01d370927b5778af96f1b96bcdaa8349308ac7ef14fb247bc5ec4165b2f7daa717159f3f7786ced9c043428afd641ba
 AUX zbar-0.10-v4l2-uvcvideo.patch 1487 BLAKE2B 61486465183a50ee0e515d6232923c63819e707d4a429a653f94ea6b7f404e8a5ab54602e074df0fab3f0188c50e8f4fc12a6ac5a63509484d7cd24925bb1957 SHA512 6a53eb54ed3ad83cacb9a09d0b119550d364e586990725f0a423a180fab790e18c2c6d8201d185a51bd26ea3955018416b2993fbdb5e5a555e13183b3bce7b1a
 AUX zbar-0.10_p20121015-ImageMagick-7.diff 1064 BLAKE2B 95d67582bbc8ad65aa23c8a7a5152c198c0a9c105189c769b785d418128871d326ff3b9c8ed52e316e3e0b0fc5c6e9c247c0115b6d82ccb812f243cfaab93138 SHA512 90e09dabfaec0f1e68e8bdb040a2903377c658a39f9d0beb1a92546c26acf7e68115a6f6a745f930edc7c55353f51c7f58888fea564c259d1f5155ff1f35d6f9
-DIST zbar-0.10.tar.bz2 592602 BLAKE2B e3379bb915d52912e9d64b4166c60e0625b1c3aae06492040b958b822e14cb9d5974e1e6b1dc69ef3cc4db11115aae76c98359198f1d0fad81312da3e6226e16 SHA512 76cb8a469e3ac9ea7932a95c500cf933501249cdb8dce4df558bf5681bd44c62111327b494e6e887079a5fd30b32154887dcc12962e6d27b1453f55457483db4
 DIST zbar-0.10_p20121015.zip 991578 BLAKE2B 021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18 SHA512 7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1
-EBUILD zbar-0.10-r6.ebuild 1742 BLAKE2B 1ef919eae08a5aca610dcede6c34b5f6325f20cd384a406642d3f040efc7ff2b01f8e2d8d6a75a9abac290bf9dcd4e2b9dbcf5e197c1e8b9842d9d83d039eda9 SHA512 6a03ed2a6ed2b3a1c28cd58703600869148428030151f779324fc06d32d6fd1eae74584c40c53aba3f38b999229a01e2ce275fbb8e31885d951efa5ad42f9897
-EBUILD zbar-0.10_p20121015-r1.ebuild 2397 BLAKE2B 2fa90db3ece690a7b988139e1fcdd089892967d9141a4dff719af8b4d91a8ff3bd16168a978ab298bac54338c41b8cedd9e03cb9cda9bdda2d8186142cf16067 SHA512 b5f6232d3fce9cb1842d5630537ff52056b185036506bae78f605dc5d2f0ec54f5d41edb2d58b6caa379e1f7dfdd266fcc9bd0d454eada9c73507924ae9dad55
-EBUILD zbar-0.10_p20121015-r2.ebuild 3644 BLAKE2B cd003a0f9801fa2474602024116fcc90cee831deef02920503ac47ee4eec0b347e663941141902b599c20e37c865929bdf29eccde9308cce5157a41269f83612 SHA512 77657b8a159511b20573c04064c710b4a92514a41cad0104d8b955b631330b89939eed3e05289c4ef0f6344d1dfecd6bc73173c56c154fc6b6866aaf508486a4
+EBUILD zbar-0.10_p20121015-r3.ebuild 3551 BLAKE2B 3e3b0d7557555561cbab893a3fc8c0be9add582606919c7c50cb257cebe84c5b8c2f863df7744c770aa51508220bd9a3290d7d4f9b5ab662858d88c4866fb41a SHA512 130c52b8e2d7ecadfd6e248309fb649bfff97c458c173e2b64ae1b82bdfed5f3ec255c02f1e2de99db0c6316b2fbc052d7823ebc74d3a355f8803e08be4ff6c5
 MISC metadata.xml 317 BLAKE2B f900040957f979d0931359e9399f89d60de14ef9e7d359de21f5c02807748a3efb0004926ab2890708511908b21aba7b824eace5bd13f5194c7f6bb633d4bd98 SHA512 911dee4073890017c8816d892b3e77e460328fc8e25e59c3ba74eafc909de73d743ac8c1c3015385bcbba1e7f175796704f6b1be6b1f37e0ce652da1749ee830
diff --git a/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch b/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch
deleted file mode 100644
index b25827a0b998..000000000000
--- a/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- zbar-0.10/configure.ac
-+++ zbar-0.10/configure.ac
-@@ -147,19 +147,13 @@ 
- with_video="no"
- AS_IF([test "x$enable_video" != "xno"],
-   [AS_IF([test "x$win32" = "xno"],
--    [AC_CHECK_HEADERS([linux/videodev.h], [with_video="v4l1"],
--      [AC_MSG_FAILURE([test for video support failed!
--rebuild your kernel to include video4linux support or
--configure --disable-video to skip building video support.])])
--       AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"],
-+    [AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"],
-          [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])],
-     [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"],
-       [AC_MSG_FAILURE([test for VfW video support failed!
- configure --disable-video to skip building vidoe support.])])])
- ])
- AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"])
--AM_CONDITIONAL([HAVE_V4L1],
--  [test "x$with_video" = "xv4l1" || test "x$with_video" = "xv4l2"])
- AM_CONDITIONAL([HAVE_V4L2], [test "x$with_video" = "xv4l2"])
- 
- dnl X
---- zbar-0.10/zbar/Makefile.am.inc
-+++ zbar-0.10/zbar/Makefile.am.inc
-@@ -53,12 +53,9 @@ 
- zbar_libzbar_la_SOURCES += zbar/processor/posix.h zbar/processor/posix.c
- endif
- 
--if HAVE_V4L1
--zbar_libzbar_la_SOURCES += zbar/video/v4l1.c
- if HAVE_V4L2
- zbar_libzbar_la_SOURCES += zbar/video/v4l2.c
- endif
--endif
- if WIN32
- if HAVE_VIDEO
- zbar_libzbar_la_SOURCES += zbar/video/vfw.c
---- zbar-0.10/zbar/video/v4l2.c
-+++ zbar-0.10/zbar/video/v4l2.c
-@@ -39,6 +39,9 @@ 
- # include <sys/mman.h>
- #endif
- #include <linux/videodev2.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+#include <fcntl.h>
- 
- #include "video.h"
- #include "image.h"
-@@ -507,3 +507,23 @@ 
-     vdo->dq = v4l2_dq;
-     return(0);
- }
-+
-+int _zbar_video_open (zbar_video_t *vdo,
-+                      const char *dev)
-+{
-+    vdo->fd = open(dev, O_RDWR);
-+    if(vdo->fd < 0)
-+        return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-+                               "opening video device '%s'", dev));
-+    zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd);
-+
-+    int rc = -1;
-+    if(vdo->intf != VIDEO_V4L1)
-+        rc = _zbar_v4l2_probe(vdo);
-+
-+    if(rc && vdo->fd >= 0) {
-+        close(vdo->fd);
-+        vdo->fd = -1;
-+    }
-+    return(rc);
-+}
diff --git a/media-gfx/zbar/zbar-0.10-r6.ebuild b/media-gfx/zbar/zbar-0.10-r6.ebuild
deleted file mode 100644
index 618e4f0f1ffe..000000000000
--- a/media-gfx/zbar/zbar-0.10-r6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic python-single-r1
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="http://zbar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
-	imagemagick? ( virtual/imagemagick-tools )
-	jpeg? ( virtual/jpeg:0 )
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
-	)
-	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	X? (
-		x11-libs/libXext
-		xv? ( x11-libs/libXv )
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-v4l1-check.patch \
-		"${FILESDIR}"/${P}-errors.patch \
-		"${FILESDIR}"/${P}-python-crash.patch \
-		"${FILESDIR}"/${P}-v4l2-uvcvideo.patch
-
-	use python && python_fix_shebang examples/upcrpc.py test/*.py
-
-	sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die #423581
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DNDEBUG
-	econf \
-		$(use_with jpeg) \
-		$(use_with gtk) \
-		$(use_with imagemagick) \
-		$(use_with python) \
-		$(use_with qt4 qt) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with X x) \
-		$(use_with xv xv) \
-		$(use_enable v4l video)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc HACKING NEWS README TODO
-	rm -r "${ED}"/usr/share/doc/${PN}
-	prune_libtool_files --all
-}
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild
deleted file mode 100644
index d07b29d89057..000000000000
--- a/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild
+++ /dev/null
@@ -1,100 +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 autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="http://zbar.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk imagemagick java jpeg python qt4 static-libs +threads v4l X xv"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
-	imagemagick? ( virtual/imagemagick-tools )
-	jpeg? ( virtual/jpeg:0 )
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
-	)
-	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	X? (
-		x11-libs/libXext
-		xv? ( x11-libs/libXv )
-	)"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.4 )"
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.4 )
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	#vcs-snapshot doesn't work on .zip
-	default
-	mv * ${P} || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.10-errors.patch \
-		"${FILESDIR}"/${PN}-0.10-python-crash.patch \
-		"${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
-
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		epatch "${FILESDIR}/${P}-ImageMagick-7.diff"
-	fi
-
-	use python && python_fix_shebang examples/upcrpc.py test/*.py
-	java-pkg-opt-2_src_prepare
-
-	sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
-		-e '/^AM_CFLAGS=/s: -Werror::' \
-		-i configure.ac || die
-	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
-		-i java/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	if use java; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
-	fi
-
-	append-cppflags -DNDEBUG
-	econf \
-		$(use_with java) \
-		$(use_with jpeg) \
-		$(use_with gtk) \
-		$(use_with imagemagick) \
-		$(use_with python) \
-		$(use_with qt4 qt) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with X x) \
-		$(use_with xv xv) \
-		$(use_enable v4l video)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc HACKING NEWS README TODO
-	rm -r "${ED}"/usr/share/doc/${PN}
-	prune_libtool_files --all
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-}
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
deleted file mode 100644
index 6c764241f4d0..000000000000
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal \
-	python-single-r1 virtualx
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="http://zbar.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk imagemagick java jpeg python qt4 static-libs test +threads v4l X xv"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( X ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
-	imagemagick? ( virtual/imagemagick-tools )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
-	)
-	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}]
-		dev-qt/qtgui:4[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
-	)"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.4 )"
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.4
-		test? ( dev-java/junit:4
-			dev-java/hamcrest-core:1.3 ) )
-	test? ( ${PYTHON_DEPS} )
-	app-arch/unzip
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	#vcs-snapshot doesn't work on .zip
-	default
-	mv * ${P} || die
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.10-errors.patch \
-		"${FILESDIR}"/${PN}-0.10-python-crash.patch \
-		"${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
-
-	# fix use of deprecated qt4 function, bug 572488
-	sed -e 's:numBytes:byteCount:g' \
-		-i "${S}"/include/zbar/QZBarImage.h || die
-
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		eapply "${FILESDIR}/${P}-ImageMagick-7.diff"
-	fi
-
-	use python && python_fix_shebang examples/upcrpc.py test/*.py
-	java-pkg-opt-2_src_prepare
-
-	sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
-		-e '/^AM_CFLAGS=/s: -Werror::' \
-		-i configure.ac || die
-	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
-		-i java/Makefile.am
-	eautoreconf
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi && use java; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
-		if use test ; then # bug 629078
-			java-pkg_append_ CLASSPATH .
-			java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
-			java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
-		fi
-	fi
-
-	append-cppflags -DNDEBUG
-
-	# different flags for image/graphics magick (bug 552350)
-	myimagemagick="--without-imagemagick"
-	has_version media-gfx/imagemagick &&
-		myimagemagick="$(multilib_native_use_with imagemagick)"
-	mygraphicsmagick="--without-graphicsmagick"
-	has_version media-gfx/graphicsmagick &&
-		mygraphicsmagick="$(multilib_native_use_with imagemagick graphicsmagick)"
-	ECONF_SOURCE=${S} \
-	econf \
-		$(multilib_native_use_with java) \
-		$(use_with jpeg) \
-		$(use_with gtk) \
-		${myimagemagick} \
-		${mygraphicsmagick} \
-		$(multilib_native_use_with python) \
-		$(use_with qt4 qt) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with X x) \
-		$(use_with xv xv) \
-		$(use_enable v4l video)
-
-	# work-around out-of-source build issue
-	mkdir gtk pygtk qt test || die
-}
-
-src_test() {
-	virtx multilib-minimal_src_test
-}
-
-multilib_src_install_all() {
-	dodoc HACKING NEWS README TODO
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-}
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
new file mode 100644
index 000000000000..ecdd0ad2dbfc
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
@@ -0,0 +1,132 @@
+# 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 java-pkg-opt-2 multilib-minimal \
+	python-single-r1 virtualx
+
+DESCRIPTION="Library and tools for reading barcodes from images or video"
+HOMEPAGE="http://zbar.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gtk imagemagick java jpeg python static-libs test +threads v4l X xv"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( X ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+	imagemagick? ( virtual/imagemagick-tools )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
+	)
+	X? (
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
+	)"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.4 )"
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.4
+		test? ( dev-java/junit:4
+			dev-java/hamcrest-core:1.3 ) )
+	test? ( ${PYTHON_DEPS} )
+	app-arch/unzip
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	#vcs-snapshot doesn't work on .zip
+	default
+	mv * ${P} || die
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.10-errors.patch \
+		"${FILESDIR}"/${PN}-0.10-python-crash.patch \
+		"${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
+
+	# fix use of deprecated qt4 function, bug 572488
+	sed -e 's:numBytes:byteCount:g' \
+		-i "${S}"/include/zbar/QZBarImage.h || die
+
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		eapply "${FILESDIR}/${P}-ImageMagick-7.diff"
+	fi
+
+	use python && python_fix_shebang examples/upcrpc.py test/*.py
+	java-pkg-opt-2_src_prepare
+
+	sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
+		-e '/^AM_CFLAGS=/s: -Werror::' \
+		-i configure.ac || die
+	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+		-i java/Makefile.am
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if multilib_is_native_abi && use java; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
+		if use test ; then # bug 629078
+			java-pkg_append_ CLASSPATH .
+			java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
+			java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
+		fi
+	fi
+
+	append-cppflags -DNDEBUG
+
+	# different flags for image/graphics magick (bug 552350)
+	myimagemagick="--without-imagemagick"
+	has_version media-gfx/imagemagick &&
+		myimagemagick="$(multilib_native_use_with imagemagick)"
+	mygraphicsmagick="--without-graphicsmagick"
+	has_version media-gfx/graphicsmagick &&
+		mygraphicsmagick="$(multilib_native_use_with imagemagick graphicsmagick)"
+	ECONF_SOURCE=${S} \
+	econf \
+		$(multilib_native_use_with java) \
+		$(use_with jpeg) \
+		$(use_with gtk) \
+		${myimagemagick} \
+		${mygraphicsmagick} \
+		$(multilib_native_use_with python) \
+		--without-qt \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with X x) \
+		$(use_with xv xv) \
+		$(use_enable v4l video)
+
+	# work-around out-of-source build issue
+	mkdir gtk pygtk qt test || die
+}
+
+src_test() {
+	virtx multilib-minimal_src_test
+}
+
+multilib_src_install_all() {
+	dodoc HACKING NEWS README TODO
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 07874f19c33f..c69389dbf31c 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/atlas-c++/Manifest b/media-libs/atlas-c++/Manifest
deleted file mode 100644
index 4f50e7a03a3b..000000000000
--- a/media-libs/atlas-c++/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX atlas-c++-0.6.3-Werror.patch 481 BLAKE2B f1727a1eb22ce4f0aaaa6ce2382d827cb02a7f310d52a84877ecf228595f0c418858e2a917122b4a2b4cc525f10e19f079cd5ce2f1ffa50f1c8e524f5d6eab35 SHA512 20c806939d1f99a178856d594a4965f3e0887326a17c786015022866f0d6dc12b827d950fbf8a567a3d473d70032fa9d1f08ab08a879bdc3687106cc420a32a1
-DIST Atlas-C++-0.6.3.tar.bz2 527537 BLAKE2B ab3c0251b9937763ebaf769921c094f6d010be342ef3b9c9ff71985cc5bdadea459260c77591d898b09208814c8ecaf94befb7c109b6d78f68fb4bb4108f1091 SHA512 3063a7fabbd5937cd4c9be72596a2fd1885a8ed8e8586f0014077a40477d124b3222280bb26f2034fa2e23aed14a1c6fa800cc40636af986a78a71d68ed40606
-EBUILD atlas-c++-0.6.3.ebuild 769 BLAKE2B 5dd254d0049fb545ddb7e95d707c0ba05ce10a714e9cde5951432bf450e8d200096d5f70757f197c5b55cd22ffd3b72faaa9413c0e2cb05c2d873c7a6b3c16ed SHA512 86ba0b7eccb1992ddaad12adb2c85f41828dae8f5221a77f92fec2a0be6a84e03244c76d027e40ef192b1290a0a7d399dd889227766289c5ce6f90acea204d35
-MISC metadata.xml 495 BLAKE2B e5bea0f6e9543088b56907c5ed3fdab9edf57237b163a84269c180254951c84831f99b6386e0d02805f9f43f3f3ad25b56eb1336c3ffb1e93d5f0728bb78229a SHA512 4d4391d5e10f240ac8b1643de52f59802479ff1c7af8c42e253fce0106a77cef22eb6e609f9f6276a3a248a9df801e06cff4f156e04b5f0092ce277a4c42ca8d
diff --git a/media-libs/atlas-c++/atlas-c++-0.6.3.ebuild b/media-libs/atlas-c++/atlas-c++-0.6.3.ebuild
deleted file mode 100644
index 638090b293f4..000000000000
--- a/media-libs/atlas-c++/atlas-c++-0.6.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-MY_PN="Atlas-C++"
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Atlas protocol, used in role playing games at worldforge"
-HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/atlas_cpp"
-SRC_URI="mirror://sourceforge/worldforge/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Werror.patch
-	eautoreconf
-}
-
-src_compile() {
-	emake
-	if use doc; then
-		emake docs
-	fi
-}
-
-src_install() {
-	default
-	use doc && dohtml -r doc/html/*
-	use doc && doman doc/man/man3/[^i]*
-	dodoc HACKING ROADMAP
-}
diff --git a/media-libs/atlas-c++/files/atlas-c++-0.6.3-Werror.patch b/media-libs/atlas-c++/files/atlas-c++-0.6.3-Werror.patch
deleted file mode 100644
index b13384ab5a12..000000000000
--- a/media-libs/atlas-c++/files/atlas-c++-0.6.3-Werror.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.ac.old	2011-05-02 11:16:53.851733207 +0200
-+++ configure.ac	2011-05-02 11:17:18.489283901 +0200
-@@ -35,10 +35,10 @@
-         if test "$enableval" = "yes"; then
-             CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG"
-         else
--            CXXFLAGS="$CXXFLAGS -Wall -Werror -DNDEBUG"
-+            CXXFLAGS="$CXXFLAGS -Wall -DNDEBUG"
-         fi
-     ],[
--        CXXFLAGS="$CXXFLAGS -Wall -Werror -DNDEBUG"
-+        CXXFLAGS="$CXXFLAGS -Wall -DNDEBUG"
-     ]
- )
- 
diff --git a/media-libs/atlas-c++/metadata.xml b/media-libs/atlas-c++/metadata.xml
deleted file mode 100644
index 9eee47fc1c94..000000000000
--- a/media-libs/atlas-c++/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="person">
-		<email>tupone@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-Atlas-C++ is the current C++ implementation of the Atlas protocol, a
-communications layer designed to be used in the WorldForge MMORPG gaming
-system.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">worldforge</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index f16bb4478721..dc445109c7bb 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -10,7 +10,8 @@ DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051c
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
 DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
 EBUILD freetype-2.8.ebuild 5276 BLAKE2B ab6ab026dec672db2407ace0cb9b3037cee83b2100f3432ee1ec140754f6a204449590a07dc82789d7b53fdb1ca3834852bec506763bc7dcafd852abdbb78889 SHA512 2d38568b0d55fbbb8e54600c5c1ce75088faa47009982840ed5e287b33e3cefe110e7ea3f00e22bee30b348d40af73a30f86724d6e21364aaa9aa1c476831a68
-EBUILD freetype-2.9.1-r1.ebuild 6659 BLAKE2B 0201fee0a5459e361c12bc3d0c67e31ac99c86af837c1d23eee60d00372a54d68a2953d169491267ade78b6a038accc4fdc66e73bf80381c4b2b70738c7af8eb SHA512 826b44091c3bf85f63241a4fe678069a9613c7477b46e377d4d15b55d17d403452ec6aecd851bf4cbb27843c19833397c98b39ba7a5d71d1a3378e02ea6d0f1d
+EBUILD freetype-2.9.1-r1.ebuild 6657 BLAKE2B cc3b2f8bcc0c3c10ce70936d66074654763f290d4a288c8b1a650dedc08b016f70908501ddf5c7a01bab283917e2e524899029c42748aa8133359184c7d5d69e SHA512 660dc53ed5e0e0a723cbff7d3319d3d0b0a3979d2a88ca6ee6f298be51900eb06de8f14dc1e37b06a2f1675f8f69be6a358e08bdf11385c6e623d8290fce5ee2
+EBUILD freetype-2.9.1-r2.ebuild 6659 BLAKE2B 0201fee0a5459e361c12bc3d0c67e31ac99c86af837c1d23eee60d00372a54d68a2953d169491267ade78b6a038accc4fdc66e73bf80381c4b2b70738c7af8eb SHA512 826b44091c3bf85f63241a4fe678069a9613c7477b46e377d4d15b55d17d403452ec6aecd851bf4cbb27843c19833397c98b39ba7a5d71d1a3378e02ea6d0f1d
 EBUILD freetype-2.9.ebuild 5288 BLAKE2B 439147ccd14d1fa1b022c491fbc6233fa86b1f545229b3abb85d2f186f53b26fd8098d228588c843801cb343b9fa3a615f25663a432c0c96a8f1cd4c949b25bf SHA512 47904142a2fd8c80658f18a472f6838926434297d8b39f243e6fa19e9a0f7896130d2e6e7337bb7ad8ad5b71b819b5c6de3cfff7a82d5563985c4c28e0c21b26
 EBUILD freetype-9999.ebuild 6659 BLAKE2B 0201fee0a5459e361c12bc3d0c67e31ac99c86af837c1d23eee60d00372a54d68a2953d169491267ade78b6a038accc4fdc66e73bf80381c4b2b70738c7af8eb SHA512 826b44091c3bf85f63241a4fe678069a9613c7477b46e377d4d15b55d17d403452ec6aecd851bf4cbb27843c19833397c98b39ba7a5d71d1a3378e02ea6d0f1d
 MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
diff --git a/media-libs/freetype/freetype-2.9.1-r1.ebuild b/media-libs/freetype/freetype-2.9.1-r1.ebuild
index f8e4fb37a31a..af4cd85ca024 100644
--- a/media-libs/freetype/freetype-2.9.1-r1.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
@@ -162,8 +162,8 @@ multilib_src_configure() {
 	type -P gmake &> /dev/null && export GNUMAKE=gmake
 
 	local myeconfargs=(
-		--disable-freetype-config
 		--enable-biarch-config
+		--enable-freetype-config
 		--enable-shared
 		$(use_with bzip2)
 		$(use_with harfbuzz)
diff --git a/media-libs/freetype/freetype-2.9.1-r2.ebuild b/media-libs/freetype/freetype-2.9.1-r2.ebuild
new file mode 100644
index 000000000000..f8e4fb37a31a
--- /dev/null
+++ b/media-libs/freetype/freetype-2.9.1-r2.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="https://www.freetype.org/"
+IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+		mirror://nongnu/freetype/${P/_/}.tar.bz2
+		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
+			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
+		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
+			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	IUSE+=" doc"
+else
+	inherit autotools git-r3
+fi
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+RESTRICT="!bindist? ( bindist )" # bug 541408
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
+	utils? (
+		X? (
+			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+		)
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+
+PATCHES=(
+	# This is the same as the 01 patch from infinality
+	"${FILESDIR}"/${PN}-2.7-enable-valid.patch
+
+	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+)
+
+_egit_repo_handler() {
+	if [[ "${PV}" == 9999 ]] ; then
+		local phase="${1}"
+		case ${phase} in
+			fetch|unpack)
+				:;
+			;;
+			*)
+				die "Please use this function with either \"fetch\" or \"unpack\""
+			;;
+		esac
+
+		local EGIT_REPO_URI
+		EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2.git"
+		git-r3_src_${phase}
+		if use utils ; then
+			EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2-demos.git"
+			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
+			git-r3_src_${phase}
+		fi
+	else
+		default
+	fi
+}
+
+src_fetch() {
+	_egit_repo_handler fetch
+}
+
+src_unpack() {
+	_egit_repo_handler unpack
+}
+
+src_prepare() {
+	if [[ "${PV}" == 9999 ]] ; then
+		# inspired by shipped autogen.sh script
+		eval $(sed -nf version.sed include/freetype/freetype.h)
+		pushd builds/unix &>/dev/null || die
+		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
+			< configure.raw > configure.ac || die
+		# eautoheader produces broken ftconfig.in
+		eautoheader() { return 0 ; }
+		AT_M4DIR="." eautoreconf
+		unset freetype_major freetype_minor freetype_patch
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	enable_option() {
+		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	# Will be the new default for >=freetype-2.7.0
+	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+
+	if use infinality && use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
+	elif use infinality; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+	elif use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	fi
+
+	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
+	# via environment (new since v2.8)
+	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+	if ! use bindist; then
+		# See http://freetype.org/patents.html
+		# ClearType is covered by several Microsoft patents in the US
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+	fi
+
+	if ! use adobe-cff; then
+		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+	fi
+
+	if use debug; then
+		enable_option FT_DEBUG_LEVEL_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	if use utils; then
+		cd "${WORKDIR}/ft2demos-${PV}" || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+		cd "${S}" || die
+	fi
+
+	# we need non-/bin/sh to run configure
+	if [[ -n ${CONFIG_SHELL} ]] ; then
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
+			"${S}"/builds/unix/configure || die
+	fi
+
+	elibtoolize --patch-only
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	local myeconfargs=(
+		--disable-freetype-config
+		--enable-biarch-config
+		--enable-shared
+		$(use_with bzip2)
+		$(use_with harfbuzz)
+		$(use_with png)
+		$(use_enable static-libs static)
+
+		# avoid using libpng-config
+		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+	)
+
+	case ${CHOST} in
+		mingw*|*-mingw*) ;;
+		# Workaround windows mis-detection: bug #654712
+		# Have to do it for both ${CHOST}-windres and windres
+		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Building utils"
+		# fix for Prefix, bug #339334
+		emake \
+			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Installing utils"
+		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
+		dodir /usr/bin #654780
+		local ft2demo
+		for ft2demo in ../ft2demos-${PV}/bin/*; do
+			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+				"${ED%/}"/usr/bin || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if use fontforge; then
+		# Probably fontforge needs less but this way makes things simplier...
+		einfo "Installing internal headers required for fontforge"
+		local header
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header; do
+			mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+		done
+	fi
+
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+	if [[ "${PV}" != 9999 ]] && use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index 06897f3d2993..19542fde6709 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -2,6 +2,6 @@ AUX jasper-2.0.14-fix-test-suite.patch 1097 BLAKE2B 050311299ad9e247663b045f87b0
 DIST jasper-2.0.12.tar.gz 1311323 BLAKE2B bc9922bfc4765ea4630f9a504c9e5a1c0992f78c2ef68cd077ba0c8a36332debd5db9fc5c639accc7eaa0eda64e478c1e615da9f2eaf363446635dd94a253fa0 SHA512 a308983511119d85e6580772f5164c188e2e170500fa4b98c8831aa63aa87cb661b88952b278e390497571f9ebf9286855a8aa946037692309ba5f41cffe265a
 DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940
 EBUILD jasper-2.0.12.ebuild 1807 BLAKE2B 724d504c046501904f8da136be0042665b453f02320574ec807f069b1b6f246b3ec11d53908ab03681f456d10888f35dabcf6c9e771975837336799d773974e9 SHA512 7fd349ca1e0f5f8c3bbded01685dbc8dd699811f98f3d781e32ef42e94c4c3c2c08af9b6b1ef8988e6c4b4b84a4f0c11d647bdb4aca1239b38000efe90fc84e1
-EBUILD jasper-2.0.14.ebuild 1914 BLAKE2B 69a77aa13d49503b02a3df848b32e1e9bf65d8c2c7307c9cc87360cc2cf3f41acdfdb99119dd7bac3717f2372e401bdd14bbccb3d64467b7e4ddf7fc30f45dc2 SHA512 8112b83152eeffa0515b13fbfcbfffcd9967668f79bfde74747898901f97991ab7341f300d64858f59b989ec5ef48d1a0f9e7d0bc0780a0fbe75d3e233b81372
+EBUILD jasper-2.0.14.ebuild 1913 BLAKE2B 541191df7ed9dd4817558e63e245cc59931cd3ff7a3b7c782544219748ac8e039fc988229f747a6abc7e747d4ebe12ac67ecd3a141f7fcaf53d44bcf6578aafc SHA512 334d3da15982c086eb85d456551c988ad315e9db40fa575beba37475c6f35455276f82e66300f0ea5409aa9a29686467f7c9e24db95750267eb7272281742806
 EBUILD jasper-9999.ebuild 1814 BLAKE2B ff6b0d726b1988d0b1fbbf8e737808839f29fbd253c18d9a0c1b2b451b8ff8e7966672d45f04963c5c104dbcf3f2b9656d2c3ecc939b871a4210fd061c1126ab SHA512 3d137d1caac04177169b847a5fc1b8ae3148f8dc215fcfb51881d7a793c6d889ac818f03bf670b97999a461ec4810eb6ec19d1a34a58aa915e4aedb15a00e5f2
 MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20
diff --git a/media-libs/jasper/jasper-2.0.14.ebuild b/media-libs/jasper/jasper-2.0.14.ebuild
index bea8a9231ead..7109e0380511 100644
--- a/media-libs/jasper/jasper-2.0.14.ebuild
+++ b/media-libs/jasper/jasper-2.0.14.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	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 ~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 ~x64-solaris ~x86-solaris"
 fi
 
 # We limit memory usage to 128 MiB by default, specified in bytes
diff --git a/media-libs/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index 6746eec7b788..fef130cda5dc 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -3,6 +3,6 @@ AUX libmp3splt-0.7-libltdl.patch 672 BLAKE2B adca950fbde7d41e6c657711964b8db2ce0
 DIST libmp3splt-0.9.1a.tar.gz 702948 BLAKE2B 96661e2fdc96d1ce4555bfc9b84f44bb1ecf9bd05f6b6038274a3097a657707bb6c6ef8b2b6ecf673c390f52a1885a6c91b555c1971d490df7089523d0739329 SHA512 07229c048c4f999c7c723ab2f7bb06807d264609c8c1e38f8ff40f11e54285212de71548bbd66ba3100287d563673d80a8704bd384d7ffcd2145a098faabd389
 DIST libmp3splt-0.9.2.tar.gz 707598 BLAKE2B 4e8223472a7cd05d71d7df81a88b7d545a726a45d62dc6284d694e8cf8ad9406b037e274dbe28f2cf95febc87d8ba30aa15291f58df95b83a3aa0b5d3469ffea SHA512 e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed
 EBUILD libmp3splt-0.9.1a.ebuild 1244 BLAKE2B 1809d4d5b3da03405fa6080259ddd79967f51ec40c9975f0a22a785f26aec47eeebd34005a592164c43f9d1798320af7813828e6a2fdd76ba02ae606abf0dfd9 SHA512 39cd447f9f20810b14b4864df837d58952ffc52d6947cb0ba672e1b4bed87da12eba7391a19cab3fcda5336b9de36d565da917a1f99f140d455a72eb3a96e285
-EBUILD libmp3splt-0.9.2-r1.ebuild 1290 BLAKE2B 50c5e57bf90178aeafeb959d927c95e29a4400224134c8945bf31ef2d8daae2253d41e0d1fbc614ce423754206efc66ad807fc02d63c387f010a822161db8ebb SHA512 cb3e489de08fd00128321ee8d6ded88341004c4784b83685bad92c09e42dc098ead85445e3c124d66bdd511bd12c36256f8d02fbd76e5643a525d9addef6237d
+EBUILD libmp3splt-0.9.2-r1.ebuild 1289 BLAKE2B 514a8c4c8d479a48f013ab5e1263207d5c971be53d0bba4c7beabc0f67922904c5d137758fbc96b33e046e81cebf65f83ef133ff27eb73ee9f3a0cfd3dc6c495 SHA512 dc2618e6a91b711e889e745f2f7d642e0a4a2eb58feef4660f0f7d5f76a72c5df1e685fec8bc807255ab27d0068f80d72693bcafcd58572402f39b67f468b1f6
 EBUILD libmp3splt-0.9.2.ebuild 1245 BLAKE2B 23dda3aa0055c03908bc81994f2e7e819be9e79066b939d4fc23bf3f0cc55ce66b85d7bd3194a9405ea3e43c8829285f94319c149568aba6febbb6f8afe9980a SHA512 899074eb64a40a328a0ec8afa7784ae362cf13d76167d6427417f0c99a4aad3068134ce7ae866c55e6a855c83bb0507f8afd0b407b9479197f16dc47dcfe9005
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
index 9c0c926646ca..29e8e0e2e9e6 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="doc flac pcre"
 
 RDEPEND="media-libs/libmad
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 0a041afffd59..0f1730ff5138 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -8,5 +8,5 @@ DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56
 EBUILD libpng-1.2.57.ebuild 876 BLAKE2B f0cb7b05dc3482ce809203e21cb68b6e85aaf6ca8aff492fd9d30349a0c11f927e263a2edbfad9ac615acc174338a128b3d01fcad5465b6e319ffb34b9751ad8 SHA512 3619d150972189cb9d9a3f7d72f7df74f5377f52405006b99dfa6cef66291c1eae2bb4e157180d1eaa8b2a217e6d321a5bc3f6e368f5c8efa2eade305f14a370
 EBUILD libpng-1.5.28.ebuild 1651 BLAKE2B b651d04efd3f74d50225ebe18bd06aec7e38f933e44a4913ff973a17ee4799151171dfc78ccea2921be8e9b364c68f09f2d0bbd1e3ebb377f23667438b9a9a60 SHA512 94a6c624ce02d7b03071653184ac91acf949244c1c0c1d2cc51483e3ca8bda9860e6ba76e2a77513dcf4a08d717888bebb91c1b464c5c201d3766499cd01fd9d
 EBUILD libpng-1.6.29.ebuild 1333 BLAKE2B afb45e4346f2dc5c307c3d5a1c03a8ce9202b1182475fbf2153c7c0ac8b4398227e68e9d65b5d26ad4415a0472373fdd70ac89b6f06c599b245514d4a753a481 SHA512 0fd0d8cf9b06a6fdf8276bd7f1d7656d7211b01e42180aa8d69ae79f227f669d04460e6749e04a4ab03fabf55de8449faac6db5994aaa49c56049e8351941093
-EBUILD libpng-1.6.34.ebuild 1376 BLAKE2B fda9a870045ca13ee8f2026e9e7ea32e52c10a19c26f13cb422c157141ae6e610fc4746aea948f4a509f053bc5247bc7c859c7ceb0f7f256ead818d661255ee7 SHA512 8f2ec1684283457b8ce6fb0ee894e89d2c944f91eb138b74327abeb614d8f7f553892f0eed3a70b9882050be6014a25da473a50a09915f560804a571532a0396
+EBUILD libpng-1.6.34.ebuild 1375 BLAKE2B 2e28d00203b0cbbbd88512107791a9a275cbfe8cdbe187a4500be290c81d3e4b006eb9f13065b6f08413691aedfcacb2557471ae9bdc880c9dbcadfe19abebf1 SHA512 e22e6928bfa12bf2fca79975fc5061752f5478796c4635dc87527dcd3ca10e934b4676d0871eb1b635f1c33c0b404955886037dc619148cea247942ed8aa1e20
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index e621970e82c6..f88b0b274431 100644
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/varconf/Manifest b/media-libs/varconf/Manifest
deleted file mode 100644
index baf5291aa7cf..000000000000
--- a/media-libs/varconf/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST varconf-0.6.6.tar.bz2 251689 BLAKE2B e0e46249c5d0b07b0bfe5df8777bc4f67ea0c2683230cc292964b880ad90b1e6af307ce079c076814cd9538c0dac5258967acb49ba1633881bf74b1f7f01f56c SHA512 44f1d59c188bb2560e1c119d2bcb18e4da1d847634ec55181c8777ba57d2424a3bfa177c63603f814791d45e70e34f92f22f98c12936edde7977af94c1178ac6
-DIST varconf-0.6.7.tar.bz2 272485 BLAKE2B b19abdb76ef49cd630d82484bb526ba4cd59650adb32fd3a5b86a352358854befb05ca02748f2c36f6dcae1097fe9da19a9939ffa7855c3a34ae967fcf667897 SHA512 7fc281834b6dbf4872cd6af42f1d59f7c47e0ed253feb4b39af3b7e8f7d0e0a05160ff37ba4210aefc02792ca33a3f9706cb73128fb92d8acd8143d76dae1834
-EBUILD varconf-0.6.6.ebuild 598 BLAKE2B 3d17e6c6aede61fa5a5c61df663f2763143a7f060d5b75b7135f2271587c639bdb0b915195c10421dc583552ce08c756deee063fdedb2e1e0d4912cd0d3517a3 SHA512 071f2ff582933080ba2b85818ca84f77e3f97fa832d6190d726c3cabc8c11dc9dde2e607580f6e81a941e9a44470f0542b7d3b80e40ba0b77d91eaad5ee46615
-EBUILD varconf-0.6.7-r1.ebuild 512 BLAKE2B 31e5ffc28560bae3192a49566a68adae33a003e3a3c7e4e7d0b4540a67138fe454ad3f629899375b761bc160b804127da04b7bb788cb7ab30ff3b7b0b12b6d46 SHA512 cb4a23850688b7a043740d219dd94b8a134d07ea985ab585088a263b028e1a5f5bf9b04f6aef8571b082d3d994cb6d464a93adb49c65d4969a799dbd7096f5fe
-EBUILD varconf-0.6.7.ebuild 601 BLAKE2B 7b930a1c8233d83f23a73f803c1d15a0873dc318527a088a2328d28e56db39949ad65e25eb08a7ef1e6a098ff4b063da8bf04622f2f6a5b6fdc62cdcb22801f3 SHA512 2666a9c1e1d680c9a95452454ca0f60f3d4d51f130fd5a0d8f40a3c6b30b6a0c830f6c9668628896730cbb04586fc4ba20ec8bc3b732ef8dbcbeccae412843a4
-MISC metadata.xml 634 BLAKE2B de92aa3d3b491466d0f034bb49fe09eaf1feb08b3337916ab1cfa2452158ab50d36b0f6ffc7bb0da65474b83a93ff80a1b682e0249e8f5fdbcd1b0f4547308e3 SHA512 cb3491dbf5a96a9e17c6132198262825c19889dbec9f34deaa63eda3e16c4458c673273a9efcbaa7653746adcb9e1383fad9ab0a44228736329000d722df808e
diff --git a/media-libs/varconf/metadata.xml b/media-libs/varconf/metadata.xml
deleted file mode 100644
index 9024ee604a54..000000000000
--- a/media-libs/varconf/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>tupone@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-Varconf is a configuration system designed for the STAGE server.
-Varconf can parse configuration files, command-line arguments and environment
-variables.  It supports callbacks and can store its configuration information
-in separate Config objects or in one global configuration instance.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">worldforge</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/varconf/varconf-0.6.6.ebuild b/media-libs/varconf/varconf-0.6.6.ebuild
deleted file mode 100644
index ff95f242f8e6..000000000000
--- a/media-libs/varconf/varconf-0.6.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A configuration system designed for the STAGE server"
-SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
-HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/varconf"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libsigc++-2.0"
-DEPEND="$RDEPEND
-	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO \
-		|| die "Installing doc failed"
-}
diff --git a/media-libs/varconf/varconf-0.6.7-r1.ebuild b/media-libs/varconf/varconf-0.6.7-r1.ebuild
deleted file mode 100644
index 6b539b9c870f..000000000000
--- a/media-libs/varconf/varconf-0.6.7-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic
-
-DESCRIPTION="A configuration system designed for the STAGE server"
-SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
-HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/varconf"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libsigc++-2.0"
-DEPEND="$RDEPEND
-	virtual/pkgconfig"
-
-src_prepare() {
-	append-cxxflags -std=c++11 #566328
-}
diff --git a/media-libs/varconf/varconf-0.6.7.ebuild b/media-libs/varconf/varconf-0.6.7.ebuild
deleted file mode 100644
index 400f45c61737..000000000000
--- a/media-libs/varconf/varconf-0.6.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A configuration system designed for the STAGE server"
-SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
-HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/varconf"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libsigc++-2.0"
-DEPEND="$RDEPEND
-	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO \
-		|| die "Installing doc failed"
-}
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index e34392c27fb2..da22feeadb4e 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -3,11 +3,8 @@ AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1
 AUX xine-lib-1.2.6-libxcb-1.12.patch 1304 BLAKE2B e60d0d5ee86fc7cd9e9d7f846d06662659d59c8f15e0b378518117ba55b7ee5a5fd55cc8fb7c896e2cbc80d297fd1b89e8437c6278d7e442453779e5f933f930 SHA512 c3415c9a0f65ec35dcb59b6880905ae525c6cfc38a42578d96ac713a4426b642069613e4234903e46e852e8f33b4eeab3ffce3864ca672efe8170ae987121783
 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 5696 BLAKE2B 7560e459258e066d5df9bd939e559845e22f86a63213bababdd6f98febbd26c616c1659ac06dc79bcad3e10d670b539ec735170d257ffa96c57c6123d3164be2 SHA512 4e84e6312fb3df90291680cd338ef336dae7a7835c282c16fd792b33b4112782c8ea77dbca2f72ca42ee9aaa2f4f0940e50184d4e77be2b3e4ff5f33fe58df45
 EBUILD xine-lib-1.2.9-r1.ebuild 5497 BLAKE2B aaba38e048f06472cd2aea6f0b46fc7b7210016caebf45d31699fb11fb82b2d228db1d5f8ec2a8bc24ee6c6bd17b25f90b664a15f8c03cfc24169ce40eae49b4 SHA512 da46ba5be24111bc6ff5102db146d419849b606d14b8e265e1c19700f0724d1c2282aaa376d392ed2a35fb00441fbce3ba883eb52275b7218c223492f52330b7
-EBUILD xine-lib-1.2.9.ebuild 5565 BLAKE2B 6e5ca0d27be4dae22f23dbc822e849c2b24696ebfbc2dd788b1391470cea49c9ad5ee5ebc44b2c76c55c94e256e80cf1c95d8d91d630a933eb1b4ddee2bfbf05 SHA512 7cd31a34ec4cb49b0faf0c56a3b6e672b5d602f50a3d732ddcab8934808531599f49bce3ef599bb72fef30b2b4a7de735f43b53f996d3671590aafe1fffd4763
 EBUILD xine-lib-1.2.9999.ebuild 5385 BLAKE2B 5be07886ffa9a495a74ecb5c8ba77ac1fb833260a22b17423651ad84ab560111cf9959e67b4e8e5a349e8724cbc51de9bea444e62ac1303b6eced26eee742bbf SHA512 312298cf43fe939a7cdfa489677445dcd04b8be19c94d8ac35132f82c450ca679c3b4a3369ea32937a15c68f21d6de4e38f858b5fd015308fd4c3feed3a708c2
 MISC metadata.xml 2668 BLAKE2B 64956b27b10284478ae15509a1aa4a1408104c1e98263ac7e1ea376cbb8e596f532e049f4b3381c51f86d4cd4187784be6ad481177ffc62aef0964c90094d6b1 SHA512 17263da5cdc28752dc9344b9806665d236d8a5d3ccad7b19209912a3510b17c9d6587fd1aa847e509a3c4accd53cc96c7d1fc476f6adf9aa63c90b7eed45183b
diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
deleted file mode 100644
index 09a56a22a579..000000000000
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic libtool multilib eutils
-
-if [[ ${PV} == *9999* ]]; then
-	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
-	inherit mercurial eutils
-	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
-	!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 )"
-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
-
-	eautoreconf
-
-	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=()
-	[[ ${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[@]}"
-}
-
-src_compile() {
-	# enable verbose building, bug #448140
-	emake V=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		htmldir="/usr/share/doc/${PF}/html" \
-		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.9.ebuild b/media-libs/xine-lib/xine-lib-1.2.9.ebuild
deleted file mode 100644
index 993b8a7a53ec..000000000000
--- a/media-libs/xine-lib/xine-lib-1.2.9.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# 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/zimg/Manifest b/media-libs/zimg/Manifest
index 60cd3a2c46e6..4df4ef22c972 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -3,7 +3,7 @@ DIST zimg-2.5.tar.gz 213054 BLAKE2B 0532693c11c1b2bcc0d5bde3a0bc16bf4f736ceff5fc
 DIST zimg-2.6.3.tar.gz 238372 BLAKE2B 4651381c61b978bedd78871117fbe0b1be7e40e3b0d32b399ab47cab06d596befb61078a6f979f2a2ea962ba66046f776e18a2bbf304dee4a2428b303a3094a7 SHA512 497d3b5b0c004fe720c9be2460f251196789ed055a0081b774c78f8c311dc097c2b5d975cb0a7d41e819ca21527e961186b665b5791032787c3b30647011e7da
 DIST zimg-2.7.4.tar.gz 246376 BLAKE2B b6a21a1f7ca5106810485a69bb4e8f1d59d67fe3a619fd0ac412b1e441fe2d8892f64826666fbdfa48ae441fa5a21512b5ba0977eeaca7dcb7e0fcc43447f6e4 SHA512 adbb525b2611ef5267a4c0d4e8c6dd164c2814241c4d58d5356545b23dcf0cbeabb140141ae6ff0e70ef8e0741e351cbfadbadd60923061ddd693a2c3d9e5fde
 EBUILD zimg-2.5.1.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
-EBUILD zimg-2.5.ebuild 824 BLAKE2B 90ca6baceb71c7d2918f3e54a44978630c25cdbdcccc7965c6389fa92960cff631d45c3e2393203d6ed2f92b194a840e421ee69e763611c807f39864d1fdeb25 SHA512 29eea5cf1b3ac94b0b09933ac9bec0b0c2c2e6d646e4079891da7e284f822878701a2283b820be67d4bdbbfb94ab9375c889142b2c29c40914567c9226a64b93
+EBUILD zimg-2.5.ebuild 823 BLAKE2B 1b5643d3bb640c804cf63b3a8242a4af066265ccc909e10181b87a02b32f5a1c112e672fb95f339c05ef33811311f7bdfc4f84b5cc61ac8ffd642559da083edf SHA512 cca5c262169ef0ccff3a739a346f0f17f48b24aefb56aecf3102a2851ab256d8a2f4fe3645bf6f45d6f3dc05cb0b0f85c10465f5ef8c3e298c6663911a254325
 EBUILD zimg-2.6.3.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
 EBUILD zimg-2.7.4.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
 EBUILD zimg-9999.ebuild 831 BLAKE2B 0abe9fd5f08a84b02a1cda0247532b13f0ba27ce0ed566995c1e3257c6f64e0e0fbf972aa4f3a7421817772089a4e46612e3fbe10ca2eca30376394f3284405e SHA512 c0bb801fbae480836447c87e888c2c96f834d39e24c815fb52bb4e681ddf1b73ebf9b5f69e63382de7327d26b64ba874783607dcb5874bf2efbd86e3b7a7e7a9
diff --git a/media-libs/zimg/zimg-2.5.ebuild b/media-libs/zimg/zimg-2.5.ebuild
index 3debf52018e5..5abc7d61bbb8 100644
--- a/media-libs/zimg/zimg-2.5.ebuild
+++ b/media-libs/zimg/zimg-2.5.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
 if [ "${PV#9999}" = "${PV}" ] ; then
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
 
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index e67e44ca77a0..30a9cbc7fd84 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 7b032564ce45..e0836751ddc9 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,10 +1,5 @@
 AUX fix-manpage-generation.diff 1264 BLAKE2B 8b31a038bc0b7c3c77d4852a170981f5eba4bf690cd922d7a883d16a0ebd7a2be9df6e3b0716a78ecf6b7008d56bc3554564757ee84ec5bc56754773a6475f8d SHA512 c2d402b3830f16307ed44cd85e0d7c05b204b9b7556a754a84a13af1c7d794d976d7dc36a45d187d84be764c14f9193ca4d90b2771bcfdf715368ba32f176010
-AUX vdr-epgsearch-1.0.0_vdr-1.7.25.diff 909 BLAKE2B f8506ebd9e3a02c36fd14071b3d0326dd1a4d95c01968c358550875b2751118dad1714cbf9388ffc9a09a7dab7b43cc445fe95604478c059d9464cef4864470f SHA512 4a9bf07360c4703b32c426d04ec6a904cc689df859d67781ba0d957ffc3e32217bf97ea018c0b2b195244b592bccf67d7e12373b262492cdd9ed884939917940
-AUX vdr-epgsearch-1.0.0_vdr-1.7.33.diff 4901 BLAKE2B 97ff253d4902ccc3420377b5cc443c1bcdf31cb62cf40ddf42be8719afd09a147aa8287207e025a36663ae76ddf5f205027b227c4ffb6431d34967146f95c80e SHA512 8bcdff9978f7ea0e50e0aac6b065103ebcb3f9676e1f37b0706a6195a2ae81944dbaaa3103600654eb421570ea452c43f6c6379bad806fd94eddead866e87c31
-AUX vdr-epgsearch-1.0.0_vdr-2.1.2.diff 472 BLAKE2B fd9546d765d1df3405fafb14c6c901561fa7eabb3b09a614a9374bbbd2fbe8c3d4ef45ec45227752729543c552c8126e3fb80fbd0c9a1b0f0e9b087f48cb49a7 SHA512 04b4b448e196a7aa77a38a21c233b52f41ca93ef3e3611e92d9cd367d2a6ad9ff27defc650b65c4ee4e7a6b333e6242f8b48786698d57841837900d55ad3ca86
 AUX vdr-epgsearch-1.0.1_beta5_makefile.diff 1136 BLAKE2B 3b82bfc71e75d02739f02071afb9cdc7d6fc0c0f0d7169b8f02a360c2b493d829f141dd586ce7d7f9a854f4b76423191e3f1b7a8df29b0c42beb037ff9cf9729 SHA512 79114081c2cb17402c0e0a431204d7afbc161a90d911d0c389a90f047280ee17b8112b3f2e9d32295c1dd15ef86695935a54354211c9b28669ad925df8173b92
-DIST vdr-epgsearch-1.0.0.tgz 667633 BLAKE2B 6a5c03b595f1f25c1f77b8e1e86f9a35a59ce20c258a196c5d828d48e139d25bf1d6c8da32d2e55fcc1576165c9f0c849e1ae8199657f062baf9ed738d97344a SHA512 3105dc847a75ad54ca854418a83db847942ba1d85f1c65a94b88310dfcdd5d614b89f0f27fd3ffc8e8c5db6c1c1e0f36e8e7a33cc71299922287f2d19dd385af
 DIST vdr-epgsearch-1.0.1_p20141227.tar.gz 472802 BLAKE2B 9ffc067c2aff29e3d79b620edf88ff7aca64ad5d1de3aa32b19fbc1889673e2439a6d65b46e2f3ff5fd3d416ff24cbafd6d41f562b3775210f0234c6990f03ab SHA512 952d58f6f03d2804f97be14779faf37c3788b42d78a6460102e2f1c74f6a58d7d68639e7e95e40f27417ce3658c0d5bf856399b6e8e8c214ea143d2865507562
-EBUILD vdr-epgsearch-1.0.0-r1.ebuild 2564 BLAKE2B efd5b036305aa8fca4486a15204cddf9a520443510968ed1751b890ef0c90c44e18dd018f500f3e19788ebf5df5274c5f919cb8276bb5f0deefc3c5f9479ea5d SHA512 19d9a030befb7d03c8eb2e817d70ab786eff287f9f9effb4f5fa8447ca62d9025c77b35c6b73eeaaf9c07936423c60c2297b2613411bb0dfbe73cbbd24487e88
 EBUILD vdr-epgsearch-1.0.1_p20141227-r1.ebuild 2712 BLAKE2B ee96a3d9ad98c5103aeced80afee2f4b99392cb6f38a8afc0154467565510e18afd5ad7835cffab36bd7cea3e3babaeee78a939c1d0aa630b24ec1fb5f8452ca SHA512 d232cb2eb3ec4ac55d175904885288e67fbbad80da193a219064c2231ba860f89f63d81be8431a51c74bd62a90a70060d560d7a223ba73494e6741f558035a5c
 MISC metadata.xml 816 BLAKE2B 2a7a4b5223b30aaffd7e0300ceba04f69d411e1b4615e0fb8d1ff6afa65850f4558c065a1e3ca6a12c2526d2bf736cbc7b6aba8a9fc66b3dcef09dfa4b7ec3bc SHA512 ea3e5fac06c7e1a53b127d2ce10bbccbf97a80cadcd172100f39512772b0120f59ef9f538b779ebc6a8df6431000f1e4112a18a0300841a8e2c5065f4016b3cd
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff
deleted file mode 100644
index 3a8babbc16fb..000000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- epgsearch/conflictcheck.h.bak	2012-03-03 15:33:15.000000000 +0100
-+++ epgsearch/conflictcheck.h	2012-03-03 15:35:43.000000000 +0100
-@@ -169,12 +169,12 @@
- 				    result = true;
- #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
- 				else
--				    result = Priority >= Setup.PrimaryLimit;
-+				    result = Priority >= 0;
- #endif
- #endif
- 			}
- 			else
--			    result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
-+			    result = !IsPrimaryDevice() || Priority >= 0;
- 		    }
- 		    else
- 			needsDetachReceivers = true;
-@@ -259,12 +259,12 @@
- 				result = true;
- #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
- 			    else
--				result = Priority >= Setup.PrimaryLimit;
-+				result = Priority >= 0;
- #endif
- #endif
- 			}
- 			else
--			    result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
-+			    result = !IsPrimaryDevice() || Priority >= 0;
- 		    }
- 		    else
- 			needsDetachReceivers = true;
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.33.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.33.diff
deleted file mode 100644
index aa51685cb282..000000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.33.diff
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Naur epgsearch-1.0.0.orig/epgsearchsvdrp.c epgsearch-1.0.0/epgsearchsvdrp.c
---- epgsearch-1.0.0.orig/epgsearchsvdrp.c	2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/epgsearchsvdrp.c	2012-12-15 11:44:38.000000000 +0100
-@@ -564,7 +564,7 @@
-             strftime(bufStart, sizeof(bufStart), "%H%M", localtime_r(&start, &tm_r));
-             strftime(bufEnd, sizeof(bufEnd), "%H%M", localtime_r(&stop, &tm_r));
- 		
--            int timerMatch;
-+            eTimerMatch timerMatch;
-             bool hasTimer = false;
-             if (Timers.GetMatch(pEvent, &timerMatch)) 
-                hasTimer = (timerMatch == tmFull);
-diff -Naur epgsearch-1.0.0.orig/mail.c epgsearch-1.0.0/mail.c
---- epgsearch-1.0.0.orig/mail.c	2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/mail.c	2012-12-15 11:45:02.000000000 +0100
-@@ -49,7 +49,7 @@
-     const cEvent* pEvent = GetEvent();
-     if (!pEvent) return "";
- 
--    int TimerMatch = tmNone;
-+    eTimerMatch TimerMatch = tmNone;
-     cTimer* pTimer = Timers.GetMatch(pEvent, &TimerMatch);
-     if (!pTimer) return "";
- 
-diff -Naur epgsearch-1.0.0.orig/menu_commands.c epgsearch-1.0.0/menu_commands.c
---- epgsearch-1.0.0.orig/menu_commands.c	2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_commands.c	2012-12-15 11:45:40.000000000 +0100
-@@ -121,7 +121,7 @@
- {
-    if (!event) return osContinue;
- 
--   int timerMatch = tmNone;
-+   eTimerMatch timerMatch = tmNone;
-    cTimer* timer = Timers.GetMatch(event, &timerMatch);
-    if (timerMatch == tmFull) 
-    {
-diff -Naur epgsearch-1.0.0.orig/menu_event.c epgsearch-1.0.0/menu_event.c
---- epgsearch-1.0.0.orig/menu_event.c	2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_event.c	2012-12-15 11:46:17.000000000 +0100
-@@ -92,7 +92,7 @@
-       cEventObj* eventObjPrev = GetPrev(event);
-       cEventObj* eventObjNext = GetNext(event);
- 
--      int timerMatch = tmNone;      
-+      eTimerMatch timerMatch = tmNone;      
-       Timers.GetMatch(event, &timerMatch);
-       const char* szRed = trVDR("Button$Record");
-       if (timerMatch == tmFull)
-diff -Naur epgsearch-1.0.0.orig/menu_main.c epgsearch-1.0.0/menu_main.c
---- epgsearch-1.0.0.orig/menu_main.c	2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_main.c	2012-12-15 11:47:08.000000000 +0100
-@@ -181,7 +181,7 @@
-   if (item) {
-       if (item->timerMatch == tmFull) 
-       {
--	  int tm = tmNone;
-+	  eTimerMatch tm = tmNone;
- 	  cTimer *timer = Timers.GetMatch(item->event, &tm);
- 	  if (timer)
- 	    {
-diff -Naur epgsearch-1.0.0.orig/menu_searchresults.c epgsearch-1.0.0/menu_searchresults.c
---- epgsearch-1.0.0.orig/menu_searchresults.c	2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_searchresults.c	2012-12-15 11:51:12.000000000 +0100
-@@ -217,7 +217,7 @@
-    if (item) {
-       if (item->timerMatch == tmFull) 
-       {
--         int tm = tmNone;
-+         eTimerMatch tm = tmNone;
-          cTimer *timer = Timers.GetMatch(item->event, &tm);
-          if (timer)
- 	   {
-diff -Naur epgsearch-1.0.0.orig/menu_searchresults.h epgsearch-1.0.0/menu_searchresults.h
---- epgsearch-1.0.0.orig/menu_searchresults.h	2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_searchresults.h	2012-12-15 11:51:57.000000000 +0100
-@@ -50,7 +50,7 @@
-     bool episodeOnly;
-     cMenuTemplate* menuTemplate;
-  public: 
--    int timerMatch;
-+    eTimerMatch timerMatch;
-     bool inSwitchList;
-     const cEvent *event;
-     const cSearchExt* search;
-diff -Naur epgsearch-1.0.0.orig/menu_whatson.c epgsearch-1.0.0/menu_whatson.c
---- epgsearch-1.0.0.orig/menu_whatson.c	2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_whatson.c	2012-12-15 11:52:37.000000000 +0100
-@@ -527,7 +527,7 @@
-    {
-       if (item->timerMatch == tmFull) 
-       {
--         int tm = tmNone;
-+         eTimerMatch tm = tmNone;
-          cTimer *timer = Timers.GetMatch(item->event, &tm);
-          if (timer)
- 	   {
-diff -Naur epgsearch-1.0.0.orig/menu_whatson.h epgsearch-1.0.0/menu_whatson.h
---- epgsearch-1.0.0.orig/menu_whatson.h	2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/menu_whatson.h	2012-12-15 11:53:09.000000000 +0100
-@@ -35,7 +35,7 @@
-   const cEvent *event;
-   cChannel *channel;
-   showMode mode;
--  int timerMatch;
-+  eTimerMatch timerMatch;
-   bool inSwitchList;
-   cMenuTemplate* menuTemplate;
- 
-diff -Naur epgsearch-1.0.0.orig/services.c epgsearch-1.0.0/services.c
---- epgsearch-1.0.0.orig/services.c	2012-12-15 11:42:41.000000000 +0100
-+++ epgsearch-1.0.0/services.c	2012-12-15 11:53:34.000000000 +0100
-@@ -143,7 +143,7 @@
-          strftime(bufStart, sizeof(bufStart), "%H%M", localtime_r(&start, &tm_r));
-          strftime(bufEnd, sizeof(bufEnd), "%H%M", localtime_r(&stop, &tm_r));
- 	    
--         int timerMatch;
-+         eTimerMatch timerMatch;
-          bool hasTimer = false;
-          if (Timers.GetMatch(pEvent, &timerMatch)) 
-             hasTimer = (timerMatch == tmFull);
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff
deleted file mode 100644
index 5b9d657e95ec..000000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur epgsearch-1.0.0.orig/uservars.h epgsearch-1.0.0/uservars.h
---- epgsearch-1.0.0.orig/uservars.h	2013-10-23 00:54:29.000000000 +0200
-+++ epgsearch-1.0.0/uservars.h	2013-10-23 00:56:21.000000000 +0200
-@@ -537,7 +537,11 @@
-     cVideodirVar() : cInternalVar("%videodir%") {}
-     string Evaluate(const cEvent*, bool escapeStrings = false) 
- 	{ 
-+#if APIVERSNUM > 20101
-+        return cVideoDirectory::Name();
-+#else
- 	    return VideoDirectory;
-+#endif
- 	}
- };
-  
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild
deleted file mode 100644
index d550ca75a669..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: Searchtimer and replacement of the VDR program menu"
-HOMEPAGE="http://winni.vdr-developer.org/epgsearch"
-
-case ${P#*_} in
-	rc*|beta*)
-		MY_P="${P/_/.}"
-		SRC_URI="http://winni.vdr-developer.org/epgsearch/downloads/beta/${MY_P}.tgz"
-		S="${WORKDIR}/${MY_P#vdr-}"
-		;;
-	*)
-		SRC_URI="http://winni.vdr-developer.org/epgsearch/downloads/${P}.tgz"
-		;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pcre tre l10n_de"
-
-DEPEND=">=media-video/vdr-1.3.45
-	pcre? ( dev-libs/libpcre )
-	tre? ( dev-libs/tre )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="pcre? ( !tre )
-	tre? ( !pcre )"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	fix_vdr_libsi_include conflictcheck.c
-
-	if has_version ">=media-video/vdr-1.7.25"; then
-		epatch "${FILESDIR}/${P}_vdr-1.7.25.diff"
-	fi
-
-	if has_version ">=media-video/vdr-1.7.28"; then
-		sed -i "s:SetRecording(recording->FileName(), recording->Title:SetRecording(recording->FileName:" menu_searchresults.c
-	fi
-
-	if has_version ">=media-video/vdr-1.7.33"; then
-		epatch "${FILESDIR}/${P}_vdr-1.7.33.diff"
-	fi
-
-	epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
-
-	# disable automagic deps
-	sed -i Makefile -e '/^AUTOCONFIG=/s/^/#/'
-
-	if use pcre; then
-		einfo "Using pcre for regexp searches"
-		sed -i Makefile -e 's:^#REGEXLIB = pcre:REGEXLIB = pcre:'
-	fi
-
-	if use tre; then
-		einfo "Using tre for unlimited fuzzy searches"
-		sed -i Makefile -e 's:^#REGEXLIB = pcre:REGEXLIB = tre:'
-	fi
-
-	# install conf-file disabled
-	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf
-
-	# Get a rid of the broken symlinks
-	rm -f README{,.DE} MANUAL
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	diropts "-m755 -o vdr -g vdr"
-	keepdir /etc/vdr/plugins/epgsearch
-	insinto /etc/vdr/plugins/epgsearch
-
-	doins conf/epgsearchmenu.conf
-	doins conf/epgsearchconflmail.templ conf/epgsearchupdmail.templ
-
-	dodoc conf/*.templ
-
-	doman man/en/*.gz
-
-	if use l10n_de; then
-		doman -i18n=de man/de/*.gz
-	fi
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.9.18"
-	previous_less_than_0_9_18=$?
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
-		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
-		cd "${ROOT}"/etc/vdr/plugins
-		local f
-		local moved=""
-		for f in epgsearch*.* .epgsearch*; do
-			[[ -e ${f} ]] || continue
-			mv "${f}" "${ROOT}/etc/vdr/plugins/epgsearch"
-			moved="${moved} ${f}"
-		done
-		elog "These files were moved:${moved}"
-	fi
-}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 4e1875f8062f..1098c9b820a1 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/gpredict/Manifest b/media-radio/gpredict/Manifest
index afd46e1d03a8..3ffb849f3c74 100644
--- a/media-radio/gpredict/Manifest
+++ b/media-radio/gpredict/Manifest
@@ -1,13 +1,8 @@
 AUX gpredict-1.1-doc.patch 593 BLAKE2B d6ba512ea18d6991651ab980c771d8d9e2ffddcd8792a7406dd8de7d34376d857fe3a83166eace1e121d4600d04da9c8d98433530b127e1b77e733404778f2ef SHA512 80ddd04a14018a39a19a11f91ab84e9e5916d634d1f572572e4f90e861106d5fed6edb32b706575ef39e6bb58578b3a689567c316fb48cc02b6a83cfec433061
 AUX gpredict-1.3-doc.patch 592 BLAKE2B 67ac50b6d1f99971246f94d9b32ae75c595969af54c357a73fd22045b69c6c67c11d984093382ff4527f90d0d4b45fd3a49510d15fa06a9d94ddb377ce39f215 SHA512 68682ea921daeb7d476e0fb04872d305c217808ed13b7be376355c25589c849238b16d731be4db502affa00474a4311a031e2bc5e0a03caa7e22b0164a242079
 AUX gpredict-2.0-doc.patch 563 BLAKE2B 7c95bb3261774799e7316eaa57b30ad72a9cadb2562103a581339699d7293fa9378aa6e8b224e75930665ec60570a5a60a0367c9a470ec8135c230547f260262 SHA512 04cc303d3bdcd8d312ec9ff99dd7e2f921feef5c50c7d4cd6e20199f7a9caefb5023b6dfdb1cb410ed3693a60f016a6545446e02eff4f678dd2897dc275ecb3e
-DIST gpredict-1.3.tar.gz 4750388 BLAKE2B e67858ea6101d150481012c99fd31fc1428d9c040ced84b3df291cfd8476ee7ec18119d35ba59c3d319b502606d58da707e579d56fd9f7d9d9fd515d49110a22 SHA512 e465e5162d46375e6d8c1ca6b98ec5860f974eec0cbcf8219b65c919ab74ce342e6296886e3fadcb64882c9059da26707e8b10670dac7b1f8146641ed0992f09
-DIST gpredict-2.0.tar.gz 5129500 BLAKE2B 4e0db6166eb91adf558496d3d2e20a92aaf3a61ddb733d68978194b7e3c5c7ee6c6c01d0ce8cec97fe987a8b0f40db344148f3e065776734589846c80a958013 SHA512 9bd9c2350b5ba5acc49c7f4a4a492a3d28ca884a1185925d09de827ea69e3dc4aeaef6f8514672bd4c0f7afcc0cc329047593794a129204ed33eb1df194e5fb5
 DIST gpredict-2.2.1.tar.bz2 4647342 BLAKE2B 989b80fd0f0029551854c18c1e00bd5d223bffe4aa20004b828bec87ab56dd488edf4d62289d394225e2a6b0c89ca1c9962cf63afe076a355757371127712ea7 SHA512 590a218bc95a465ca9772f892b77763b92a6c41c7d9f3b48279f28916cef8a5bfe616e6cdda1002e7dda082f37f37a98af8c8180895c572fec9c96aa76888f5d
 DIST gpredict-2.2.tar.bz2 4646331 BLAKE2B 5f07484814cbc3973617e2f161eed4fdc9ead11b9369cd2f6ffacbf60a5a73651e8081c2110ecc7e83a8214d4278a0d7ba9d5b313a9c1bbda7ca3e5c5a6730a9 SHA512 4884459922da4fcbe221252c002e76ac06926bda4745e3eaa480c93c9fdbed9da7a78c7d11a6e7fb5777d8e11cc1f0859c18461fb19f249d924882bfe7ace32c
-EBUILD gpredict-1.3-r1.ebuild 1048 BLAKE2B e3e1479e179c0cce5cb969795e28088e0a8adb28188255c7e093f6d7ec30df4509736a3697e942aacc6fe8eadc5d91724b92c2309a061b5671cdbb48ec85e3de SHA512 703233bf44f1c5a08f20f388633938ffcce752fe2827c83d96d6ea1554104f1b22c9a1fa105d35eca013b34d75d73eb094ded4919c8a955f79bd071b63e8b4a4
-EBUILD gpredict-1.3-r2.ebuild 892 BLAKE2B b9c5aa3dd563c0d2fbf2421d3cb49a7575ea9158acbd18aa494c171fc071444f27bf4a8e60109f7e35a47a7f5bd64a6484f58f728f7d3206119ad720ae56e2ea SHA512 6985cdbbed0f6581ce5782e2bb9f5eb07311e1c0b32ac83ab4bafae48163c70c4c2bdf4affcb87a2d11f476ea90cfdadd5a43f47c4ad2e3d472a69a31c2fefbf
-EBUILD gpredict-2.0.ebuild 849 BLAKE2B 9eb4aaab9de47f9948148c84181613e87187c23296b84db8f44b319e5069e7165b3a4849999eed8569a1b94a021dba08041a8369e0a02741f85b87eff77a951c SHA512 4349bda0355a33c02c9bda83ad89095151fd718c1844579efbface8b82946a6f103b301e955e762fc273bb9de1aa2b9be88d521e9aa2060e52406ca7f2bf9bd9
 EBUILD gpredict-2.2.1.ebuild 676 BLAKE2B 06046d126159c8a40932c10ae18316ab1ec2abcf9260a81bbdaac465e2a8d1d9c822f3ebdb2536c21dda442d62ba2d837e47be9479540e8af1aeaa24bcbc80bb SHA512 85db5e9edeeb75c3b5e22d09c3fd2dadc74c7ec96b040d5291093105e303b4c280552732d68ba2db773732ccb0f2016b12837dbdc3458a0262afdaa0d51661c2
-EBUILD gpredict-2.2.ebuild 674 BLAKE2B f04e3e69484375ef96bc79182462231be9128c08235be712250034303a7e063d9e85834a259620b27bb67a9f446e5c8d5f0897202d9cb0456e32bed14aed0863 SHA512 8425a9210352063a0a05a4cee574b5a29ac37a8aea414672dc37049615cea6507692fa7edf65cb8b2e3ffc224c512c2347e8d199032e2e3c50254c46d3309d62
+EBUILD gpredict-2.2.ebuild 673 BLAKE2B a29c4df80eed560c2ea8cee5728777c5a5c11fba55de631fc65e7d27fb20db4d36db101557253532fa92064acf51ec821d1d82e2ba8d3303c374d811f563ddb8 SHA512 89ad3c414051ab016e72523b9e0d3f2e3bb8b4124b81a3012fe01c20a864331cb436a243fa3a9745506bcd9a434cc937fc9ca5d887d2bca49de02e5bc723aced
 MISC metadata.xml 327 BLAKE2B 337b6c3aaf2d60785241601818dcaa4c831b122e339826560343f32712bda042b0f5140f321e9de6f2fc680e66702b39b0148aea2aaac52aa3b3faa7ef5292d4 SHA512 8e461ba4d187a96f1e15e1fab90da3755ec7ad6b24f1182b65eeacffa996375bd0bd905907c329bb53a92b94c22b08283ea936956acc58e5153634e464d9a147
diff --git a/media-radio/gpredict/gpredict-1.3-r1.ebuild b/media-radio/gpredict/gpredict-1.3-r1.ebuild
deleted file mode 100644
index 6a14b3c8e3d8..000000000000
--- a/media-radio/gpredict/gpredict-1.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Real-time satellite tracking and orbit prediction application"
-HOMEPAGE="http://gpredict.oz9aec.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gdk-pixbuf[jpeg]
-	x11-libs/gtk+:2
-	x11-libs/goocanvas:0
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	# remove wrong doc location
-	epatch "${FILESDIR}/${PN}-1.1-doc.patch"
-	sed -i -e "s/0.15/0.14/g" configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	make_desktop_entry ${PN} "GPredict" "/usr/share/pixmaps/gpredict/icons/gpredict-icon.png" Science
-	# provide a link to GPL license to allow the program to show it (see
-	# Help->license menu entry)
-	dosym /usr/portage/licenses/GPL-2 /usr/share/${PN}/COPYING
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-radio/gpredict/gpredict-1.3-r2.ebuild b/media-radio/gpredict/gpredict-1.3-r2.ebuild
deleted file mode 100644
index 4d41ca55836b..000000000000
--- a/media-radio/gpredict/gpredict-1.3-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=5
-
-inherit autotools eutils
-
-DESCRIPTION="Real-time satellite tracking and orbit prediction application"
-HOMEPAGE="http://gpredict.oz9aec.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gdk-pixbuf[jpeg]
-	x11-libs/gtk+:2
-	x11-libs/goocanvas:0
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	# remove wrong doc location
-	epatch "${FILESDIR}/${PN}-1.3-doc.patch"
-	sed -i -e "s/0.15/0.14/g" configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	make_desktop_entry ${PN} "GPredict" "/usr/share/pixmaps/gpredict/icons/gpredict-icon.png" Science
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-radio/gpredict/gpredict-2.0.ebuild b/media-radio/gpredict/gpredict-2.0.ebuild
deleted file mode 100644
index 8f757d9e2734..000000000000
--- a/media-radio/gpredict/gpredict-2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Real-time satellite tracking and orbit prediction application"
-HOMEPAGE="http://gpredict.oz9aec.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gdk-pixbuf[jpeg]
-	x11-libs/gtk+:3
-	x11-libs/goocanvas:2.0
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	eapply_user
-	# remove wrong doc location
-	epatch "${FILESDIR}/${PN}-2.0-doc.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-	make_desktop_entry ${PN} "GPredict" "/usr/share/pixmaps/gpredict/icons/gpredict-icon.png" Science
-}
diff --git a/media-radio/gpredict/gpredict-2.2.ebuild b/media-radio/gpredict/gpredict-2.2.ebuild
index d68859821a29..b6f1c87b1200 100644
--- a/media-radio/gpredict/gpredict-2.2.ebuild
+++ b/media-radio/gpredict/gpredict-2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1cf38486ff61..4cbe7b944a14 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 774692135c08..d0652796e6cf 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -11,5 +11,8 @@ AUX mixxx-2.0.0-sqlite3.patch 345 BLAKE2B 2c06cea5358df63d0c5e690fb700766b8a3631
 DIST mixxx-2.0.0-ffmpeg30.patch 714 BLAKE2B 00c5cdc233262e64fa52abcc97fc15d1347a391d411b5a0e2650bc3d06f1ef994b28c1f5bd942026201850925f6959fa0b3896c5dff48fbad1c28df8bcd8067b SHA512 60788ecab1fa92b825815fff5dfdfefe02fb097e46f7f55f318bb8a8677da42e4601cce51eaaec51988990eebb72d59346d1ec45ed76cac3c8a7f9a9d1e8cf54
 DIST mixxx-2.0.0-ffmpeg31.patch 2844 BLAKE2B ee44c1da8af553cff478d12bc4fb05ae50bd788340ba5e414b6a535873a3c1868363762697ab21580bfa8f4006c0314acdc2c778f80a910c316a49d91c3e0205 SHA512 7207ad72d0ea851b1425ff7472aafe5f828ca70aad0821a1ef1eb54845527532489ac7913f6584e3af5fb53bf3459abc173fbf482f83be8a22358d28b1b5cf74
 DIST mixxx-2.0.0-src.tar.gz 25300881 BLAKE2B a0dbc03350bf6d6a8ce5abd06df50bf58cf3d75fcc3f8614873c807ad8a77d1afb12a8715944ebba80da5750e4c6d6570ea60a5afb83b87f8cc54c7c4d0ccb00 SHA512 8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a
-EBUILD mixxx-2.0.0-r4.ebuild 3655 BLAKE2B f32545f7134a60415587c30738d3f128161a39ffa3ea85aef2fbd292d84d86c9b1225c069969066a499cf8b0ba51518e9bf72bf08a4a27344957504dd4060d6a SHA512 f5c31c079f440b381e5f9407a97ce3738789345052f764b997361fe1af5098c3d081d6a7508631f897651be52da58a3bebb14d6e4e0c2951c4072e89015ab463
-MISC metadata.xml 549 BLAKE2B 20dba66bc128eceb037f39f0bd04ee4f4dafda37968f90f09de12d6485b37f1391963d1bcf343755da69a74c3d3f72218e97b9cf13e9e699bae4ea098fbcf9af SHA512 c89877382e9baf90038ca7c6175ef8edc3296950dc7386b00f861a90fcc3296ec4d21df665c8aa62042c1b952cd270af77b85a5959518600f43f963ffce51296
+DIST mixxx-2.1.0.tar.gz 34835250 BLAKE2B 7a90c3794a146001fd0df6bb7c9c6231c0d26814eafc5c83da666d511d7af0e193b75da9b8728ad399dbef208cf2437881df2c87818e503945b02591bc300567 SHA512 d9f4fab92c2896ec455e2041aa6033f9a9091d2915a185a99427b9c35afe7c99565350ce477bf0487c6276c9585875f0be61f310779ae90195917d2e995bbf90
+EBUILD mixxx-2.0.0-r5.ebuild 3717 BLAKE2B 3e838a7dff793c2ef3bb4c99803746e3dd85fc19e837f4022d15189b8527eb6c775627c8e95c8dda42c875e33e1e89737791469f0df17784c2f15f318adfde6d SHA512 429289d7d632a723bc3919740f9f8fcde60707923e1c4b384ce4dbeea843a110b954c95519b3e91bff5fa7084179982736008e5ae207a4b018af2a087a32be21
+EBUILD mixxx-2.1.0.ebuild 2873 BLAKE2B af6a8c6f07aede897cc7e43c57aaaa5bd6f82837f4a4429f5e52b57af65e5ea58544f5fae705d5efd668ddf6999058206057bf699f51977d106282b38f2d974e SHA512 72000f7ff37fcf0955a342744b7bb4a88cab8021fc8d7c24d3b9805924b97cbe762b079bb79d3618b752ad5103406ab6bc54b3d2b80d3a13a1b94961cb2812b3
+EBUILD mixxx-9999.ebuild 2986 BLAKE2B 33afc804015de16f29df83796c47f27be5ef2e24026885e816d6e57a27a62aad2b688348ad4545bf84d5e7a7c03312472c31d10e1823c22b1be2605e4b6e3b5d SHA512 b8dbe54fa89cca6aaaa348a34cde7573f5ea5b4716ae7bd9b1318a6edf69732b9d20d4e18be422b8d76e233cc081579528234ebc2f6f39effc8c85f795eac2e8
+MISC metadata.xml 642 BLAKE2B 125facf06db489fe7e3f4663b1664a4e0c4288cad028b9d0e73db345c8e6a8004383b4efb70e7b5315028fba769fb790cb2b39949980b5adc6f3de2178c0f7c9 SHA512 e336e472a4ee405e18a2521cbd296917a1c555c444eb3794eea602a36ec30f5eab99e9dcad36a08c9852c228253721311d957ef632ae0d14c96391a95ad4dd5e
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 4627d1b0b257..3c563007a7bc 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="hid">Enable HID controller support</flag>
+		<flag name="opus">Enable support for opus codec via <pkg>media-libs/opusfile</pkg>.</flag>
 		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
 	</use>
 	<upstream>
diff --git a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
deleted file mode 100644
index d8a4bb179981..000000000000
--- a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic scons-utils toolchain-funcs
-
-DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-SRC_URI="https://downloads.${PN}.org/${P}/${P}-src.tar.gz"
-
-# Upstream patches
-SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/51d95ba58d99309f439cb7e2d1285cfb33aa0f63.patch -> ${PN}-2.0.0-ffmpeg30.patch"
-SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772afdfb79cbc3c.patch -> ${PN}-2.0.0-ffmpeg31.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aac debug doc ffmpeg hid mp3 mp4 shout wavpack"
-
-# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
-# got fixed
-RDEPEND="
-	dev-db/sqlite
-	dev-libs/protobuf:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5[scripttools]
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/chromaprint
-	media-libs/flac
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libsndfile
-	>=media-libs/libsoundtouch-1.5
-	media-libs/libvorbis
-	>=media-libs/portaudio-19_pre
-	media-libs/portmidi
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	virtual/libusb:1
-	virtual/opengl
-	x11-libs/libX11
-	aac? (
-		media-libs/faad2
-		media-libs/libmp4v2:0
-	)
-	hid? ( dev-libs/hidapi )
-	mp3? ( media-libs/libmad )
-	mp4? ( media-libs/libmp4v2:= )
-	shout? ( media-libs/libshout )
-	wavpack? ( media-sound/wavpack )
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.0-docs.patch
-
-	"${DISTDIR}"/${P}-ffmpeg30.patch
-	"${DISTDIR}"/${P}-ffmpeg31.patch
-
-	"${FILESDIR}"/${P}-chromaprint-1.4.patch #604528
-	"${FILESDIR}"/${P}-gcc62.patch #595090
-
-	"${FILESDIR}"/${PN}-2.0.0-sqlite3.patch #622776
-
-	# The following patches were taken from sunny-overlay (bug #608430)
-	"${FILESDIR}"/${P}-fix-formatting-of-time-durations.patch
-	"${FILESDIR}"/${P}-eliminate-unnecessary-heap-allocation-of-qtime.patch
-	"${FILESDIR}"/${P}-fix-missing-pointer-initialization.patch
-	"${FILESDIR}"/${P}-move-definition-of-time-formatseconds-into-dot-cpp-file.patch
-	"${FILESDIR}"/${P}-fix-formatting-of-time-durations2.patch
-	"${FILESDIR}"/${P}-rmx2-backport-controller-scripts.patch
-)
-
-src_prepare() {
-	# use multilib compatible directory for plugins
-	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
-
-	default
-}
-
-src_configure() {
-	local myoptimize=0
-
-	# Required for >=qt-5.7.0 (bug #590690)
-	append-cxxflags -std=c++11
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #591968
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		if [[ ${i} = native ]] ; then
-			myoptimize="native"
-			break
-		fi
-	done
-
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
-		faad="$(usex aac 1 0)"
-		ffmpeg="$(usex ffmpeg 1 0)"
-		hid="$(usex hid 1 0)"
-		hifieq=1
-		m4a="$(usex mp4 1 0)"
-		mad="$(usex mp3 1 0)"
-		optimize="${myoptimize}"
-		qdebug="$(usex debug 1 0)"
-		qt5=1
-		shoutcast="$(usex shout 1 0)"
-		vinylcontrol=1
-		wv="$(usex wavpack 1 0)"
-	)
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
-}
-
-src_install() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
-		install_root="${ED}"/usr install
-
-	dodoc README Mixxx-Manual.pdf
-}
diff --git a/media-sound/mixxx/mixxx-2.0.0-r5.ebuild b/media-sound/mixxx/mixxx-2.0.0-r5.ebuild
new file mode 100644
index 000000000000..a8fcb5ca5c84
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.0.0-r5.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic scons-utils toolchain-funcs
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+SRC_URI="https://downloads.${PN}.org/${P}/${P}-src.tar.gz"
+
+# Upstream patches
+SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/51d95ba58d99309f439cb7e2d1285cfb33aa0f63.patch -> ${PN}-2.0.0-ffmpeg30.patch"
+SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772afdfb79cbc3c.patch -> ${PN}-2.0.0-ffmpeg31.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="aac debug doc ffmpeg hid mp3 mp4 opus shout wavpack"
+
+# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
+# got fixed
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/protobuf:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	virtual/libusb:1
+	virtual/opengl
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? ( media-libs/opusfile )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+
+	"${DISTDIR}"/${P}-ffmpeg30.patch
+	"${DISTDIR}"/${P}-ffmpeg31.patch
+
+	"${FILESDIR}"/${P}-chromaprint-1.4.patch #604528
+	"${FILESDIR}"/${P}-gcc62.patch #595090
+
+	"${FILESDIR}"/${PN}-2.0.0-sqlite3.patch #622776
+
+	# The following patches were taken from sunny-overlay (bug #608430)
+	"${FILESDIR}"/${P}-fix-formatting-of-time-durations.patch
+	"${FILESDIR}"/${P}-eliminate-unnecessary-heap-allocation-of-qtime.patch
+	"${FILESDIR}"/${P}-fix-missing-pointer-initialization.patch
+	"${FILESDIR}"/${P}-move-definition-of-time-formatseconds-into-dot-cpp-file.patch
+	"${FILESDIR}"/${P}-fix-formatting-of-time-durations2.patch
+	"${FILESDIR}"/${P}-rmx2-backport-controller-scripts.patch
+)
+
+src_prepare() {
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	default
+}
+
+src_configure() {
+	local myoptimize=0
+
+	# Required for >=qt-5.7.0 (bug #590690)
+	append-cxxflags -std=c++11
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #591968
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		if [[ ${i} = native ]] ; then
+			myoptimize="native"
+			break
+		fi
+	done
+
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
+		faad="$(usex aac 1 0)"
+		ffmpeg="$(usex ffmpeg 1 0)"
+		hid="$(usex hid 1 0)"
+		hifieq=1
+		m4a="$(usex mp4 1 0)"
+		mad="$(usex mp3 1 0)"
+		optimize="${myoptimize}"
+		opus="$(usex opus 1 0)"
+		qdebug="$(usex debug 1 0)"
+		qt5=1
+		shoutcast="$(usex shout 1 0)"
+		vinylcontrol=1
+		wv="$(usex wavpack 1 0)"
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
+		install_root="${ED}"/usr install
+
+	dodoc README Mixxx-Manual.pdf
+}
diff --git a/media-sound/mixxx/mixxx-2.1.0.ebuild b/media-sound/mixxx/mixxx-2.1.0.ebuild
new file mode 100644
index 000000000000..ff679b823489
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.1.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic scons-utils toolchain-funcs
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
+
+# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
+# got fixed
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	virtual/libusb:1
+	virtual/opengl
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+)
+
+src_prepare() {
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	default
+}
+
+src_configure() {
+	local myoptimize=0
+
+	# Required for >=qt-5.7.0 (bug #590690)
+	append-cxxflags -std=c++11
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #591968
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		if [[ ${i} = native ]] ; then
+			myoptimize="native"
+			break
+		fi
+	done
+
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
+		faad="$(usex aac 1 0)"
+		ffmpeg="$(usex ffmpeg 1 0)"
+		hid="$(usex hid 1 0)"
+		hifieq=1
+		m4a="$(usex mp4 1 0)"
+		mad="$(usex mp3 1 0)"
+		optimize="${myoptimize}"
+		opus="$(usex opus 1 0)"
+		qt5=1
+		shoutcast="$(usex shout 1 0)"
+		vinylcontrol=1
+		wv="$(usex wavpack 1 0)"
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
+		install_root="${ED}"/usr install
+
+	dodoc README Mixxx-Manual.pdf
+}
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
new file mode 100644
index 000000000000..6ab9fb77f7c3
--- /dev/null
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic scons-utils toolchain-funcs
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
+
+# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
+# got fixed
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	virtual/libusb:1
+	virtual/opengl
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+)
+
+src_prepare() {
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	default
+}
+
+src_configure() {
+	local myoptimize=0
+
+	# Required for >=qt-5.7.0 (bug #590690)
+	append-cxxflags -std=c++11
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #591968
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		if [[ ${i} = native ]] ; then
+			myoptimize="native"
+			break
+		fi
+	done
+
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
+		faad="$(usex aac 1 0)"
+		ffmpeg="$(usex ffmpeg 1 0)"
+		hid="$(usex hid 1 0)"
+		hifieq=1
+		m4a="$(usex mp4 1 0)"
+		mad="$(usex mp3 1 0)"
+		optimize="${myoptimize}"
+		opus="$(usex opus 1 0)"
+		qt5=1
+		shoutcast="$(usex shout 1 0)"
+		vinylcontrol=1
+		wv="$(usex wavpack 1 0)"
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
+		install_root="${ED}"/usr install
+
+	dodoc README Mixxx-Manual.pdf
+}
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
index ebc4f42c8f40..dd3c79c3320a 100644
--- a/media-sound/mp3gain/Manifest
+++ b/media-sound/mp3gain/Manifest
@@ -1,4 +1,4 @@
 AUX mp3gain-1.6.1-CVE-2017-12911.patch 2804 BLAKE2B 71d410abe4196cb47d4f006af7d8fd73a0308280ce57aaa955434c9f7b1bb8bf3363eb1ad8dbe0da3b5dd79e4ac5a355b796cdc253608c5bf2ba7c03527c3b32 SHA512 b5b093f18160cd4205870952d8f092c300f66d6fa025ac09114f55b1e5b37af6ab8ea1b505e33446f6c7153a5ffad04c001b67f9a069db8d3418c6fae3e73002
 DIST mp3gain-1_6_1-src.zip 68932 BLAKE2B 8c1ed35123f1613e189ec7bd74ee9f6176404a1b79c660f8f1a6df461cdfd3c6bb505daa09b8cc4756e1755d0923fe473a45c3ae171fcf35df22daaa08a7717a SHA512 6d26a7716a1901c80caff9d7fb03a454a452c06c6a57a7a921d5979727e112ba139690d8a287dde7a6e5a09b022d3c6f57193b4756a9c25caa177cef65f9e375
-EBUILD mp3gain-1.6.1.ebuild 674 BLAKE2B 1c387f1c09c730edc6fc1cee1839afab6b7442c6438a18ffbdbbaaa0e8899f5f066152b09aed28f548062c1fee226e63a253dca0946974c7f5d6ada099274fc7 SHA512 f910267f3a4c42215714fa5371b0e475ddfcd0b84a6ff319037b840f0068c91f6ee76dff2a43d685c0210eff0105569c7f0a6d80fdf2d41c68596c581c931507
+EBUILD mp3gain-1.6.1.ebuild 673 BLAKE2B c319bf9335ba1a7ead43e9ed85d67ad8d941be8689031ecd9467eb111b59564d9d3dbfcdb42db3a94bc653a713bfe63157da0b2170ef4e5dcf248a6638cdb0a9 SHA512 9afdbbfd439edfb4edded5b815029f8a4e6a9c1be12e03fbe9177c6ebf501fd751bcc507c05b0df4ddecbd5ce39bad6a47b9dd5420a0f9906951e07d8d824cb9
 MISC metadata.xml 452 BLAKE2B c0b22d81f8e91934b834281f256b67e4e61a86fe9cfee08ace713baa8ff28221393594e9199aa631889c2b7e25b50bc108876b3f991ea7bef7575e486d5b206a SHA512 8ab00c2369fea3ed2ae75f5d04939ac81f4f227236215556157c3616ce1d72636c94af0988f06c995a08dd95c3774635c5d954e6992a077c20c7472be907a119
diff --git a/media-sound/mp3gain/mp3gain-1.6.1.ebuild b/media-sound/mp3gain/mp3gain-1.6.1.ebuild
index 8999596cf533..ac0cf8381c3d 100644
--- a/media-sound/mp3gain/mp3gain-1.6.1.ebuild
+++ b/media-sound/mp3gain/mp3gain-1.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 8cf276f2f64f..2357b400d740 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -2,6 +2,6 @@ DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686
 DIST mpg123-1.25.6.tar.bz2 919169 BLAKE2B 7b330d67465f332f608fa7efbfbfe1bbe69f8912a5678f72c56080b2deb44407d66bac6af23fb8c1359373eb90966ba67901235555f1776a00dc27e66167b0a5 SHA512 0b129c38c19462f7fbe3f56ea2b856222f8a1a3ba76ef8109ca759c9a9c668432cc0ec76059f9a7a3c37228ce615e4c628c7de3b1663073302cc7c8fc93f249c
 DIST mpg123-1.25.8.tar.bz2 920677 BLAKE2B bbffa9fa36c40557abb6c70af942b63a43739462c86a22839363b36a39e1a2f16ce3f4e5462f9be9cea2addda1b46af6fdd58b24b5a0b31949efc604ef475c19 SHA512 f226317dddb07841a13753603fa13c0a867605a5a051626cb30d45cfba266d3d4296f5b8254f65b403bb5eef6addce1784ae8829b671a746854785cda1bad203
 EBUILD mpg123-1.25.10.ebuild 2906 BLAKE2B 36462309ca3efd27d94b9788da674763b07ca21c70e0a8cdcfa7465b714dce07ee2d05ca5c3a133ba68178bf3db8c4ce826f9adc2b0e6bdd54b81274ea079bdd SHA512 1bec3fba575532df6b2fe44a87053c7bb7c7d87953589d4aa0491ff936911bf3b4a384d9a083b7b4a734d485c43e80e812a6c34ae65b098cb204032e1177baf8
-EBUILD mpg123-1.25.6.ebuild 2898 BLAKE2B 97ceefb25b80c5b12247d6cc20f41adc156e65abbed3c6504dbcb0a24751e501c078fd8a913cb7320c7404966d9f4675541d3b97ba0da30d04bffbc1e4fcb54f SHA512 054be057d7e194797b2cf4e79596d93982cbc47edafc725f3972a8edf9fe1e5b322f80faf76c61260005e80e757a38eacbf97e1d25d6b0250f444c9f29d130cc
+EBUILD mpg123-1.25.6.ebuild 2897 BLAKE2B 2c75049f7218b4247dafd05ead9e494d7cefe8dcabac640c0bb96c249c16be6ef0661d98409d0dd4ef1c99342247fbf146bdbeae570dcf199e6cf93c800f1ad0 SHA512 f051bc85bfa74ae50005369cea98f76cd30d92e6345d02b219da0a147c9c5e8a18f88a0b52461d5d14a2ebce5b2f84bf12cbf79fc1d27bcc92aea7a67791c5d1
 EBUILD mpg123-1.25.8.ebuild 2906 BLAKE2B 6f668c24fff43f542baec764d6dcb4f26e2d03361cfc78c91c635ee48f665fc71ad0f00413827b15334b3381f4509d0159d456e36baa5b82bc1c0a6b57f7c47b SHA512 8afd4947959627b1d97285e49753bb44177d1353ee209de8e99e2afe6ed5eba88554bb70cd129a2069e509944cce17b2da4ca8f804f04a035072f1aef3a4cddd
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.6.ebuild b/media-sound/mpg123/mpg123-1.25.6.ebuild
index 3de21c6e036b..39a7bcfda214 100644
--- a/media-sound/mpg123/mpg123-1.25.6.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.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
@@ -10,7 +10,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index 333d63c6e9ff..25561d2ebeb0 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -5,7 +5,7 @@ AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b
 AUX ts3server-bin 323 BLAKE2B ab3fb5522ffef33d4517d76f01c91091cb1322e1433ac158c2aaaf18c56f44a74875e3ae82e7c39209207291a668104bc4d08d54dbff7042e4faebc0e54104cf SHA512 578bee3c35fc6bc5a06ceebbab1aaeab6201fdb32a13e9c2473dffd78282690f57b1bc277a973006fb573cf9f1a11c0643c0479ff1a9e1318c015437086c6c42
 AUX ts3server.ini 538 BLAKE2B 10dd1ca73bf81fb53832f1e6d4e763aae965102f93ff12b057672b3b201a281bca009cf22481bf5b1fcf09af49b120f7eda9b21c85686f15af25d1968c62c23c SHA512 bd03d3de15625009aa2cfb49b8dc0f2a4832ee8cf1d76b869a8c1da7882e500df8d07ab19a94035ffaaed32a9bff6545c42d8dd25086f60dd7804f72b8f36974
 AUX ts3server_mariadb.ini.sample 556 BLAKE2B e7ea14b839f4e41c67726f9167cab198673d5a1109085b44fbcfe87e1c7f4a79670cec512b59c16fc4d08bc8377de9ba3802b72695bbb564b70405b783ba99e9 SHA512 ee74ef7e4bd7ceec81584586a20fe688d74171541154a13db55ae9fb7cfd210a13b6821aa3668edb76a13035263e30ffa94abbfa55ccc390315568663d6e6e2d
-DIST teamspeak3-server_linux_amd64-3.1.2.tar.bz2 7816668 BLAKE2B 4421a439e07ce6dac2556a95818bae7be91622ceea5c597f1fd02ee13815f760086dea13a3ac11a55c928ccfc4b134bb97c0f3092def85ff765e311d6ef69459 SHA512 42993b4cc881ca2bc7d7deb5eaf4e7a9cc3be462abba0f174d6074f0ca18bf59cbe8607dac5a9750331d28ac1984527a8210f53cf6cf077be86b26d141c7bc78
-DIST teamspeak3-server_linux_x86-3.1.2.tar.bz2 7676301 BLAKE2B a4b7557e215612f11bd4ee892dff199d0017e6af7a24bc3dce83a4ac6ddbe807b3960b66c9948298c4463ad2d08aedf27468487f91b15d197d0e2c01b7771956 SHA512 04dce6831332e44ff0edfdc664f422616522bb342338a2b6bb2cd73aba5cc5965dfa4c77fa7c041c06727a3f50fd842142198fd99568c1db6c9810f07accdb48
-EBUILD teamspeak-server-bin-3.1.2.ebuild 3423 BLAKE2B 175a99ff927642828cb40bd41b7ec51a39e3d421eab279dbe5126370df40f90404ec8a3c6850d4d4a10308dbefadce9607d338f49012b23b6f1712066296f6b5 SHA512 959677ab6bec85ee858223f7fe952fad48ea3d5669d0168dee56c9558cd3562e4af24b2329feb9a78cb252c2dd5e4051ef0e24497b735d5b2c4653c2112e242f
-MISC metadata.xml 659 BLAKE2B 77a9ce51277977d958712db9e729c1c6517ad29a3c87b0f775fe7c414273cf3fee43ca070894065949f766a22019af72e7a1a23fcbacd4641fa8c43571aa6a7f SHA512 2404a4075934843c4599d42c99e6042f99d9131066c9ec4a36ca08f361d01c9c15050676dc7760a34eff1a173be41cfd91c270fe616696dd36b08cae4f7fda53
+DIST teamspeak3-server_linux_amd64-3.1.3.tar.bz2 7818829 BLAKE2B 61f06e94c677c2569f3d5e13ba797f9aa04c750a4cb547edf98dfe5e461aa62a007220c695ec07ed5be26a20ed1c70192ff1bb46a881c1b60ba52cc5149a084c SHA512 732d3c9ad30796d1dc4028e953ff3e96835a3dc5f05389b44b1c35184dc07765bdd16a39f52d8f5a19a6f31a2a1035d8e3b39020178b4eab8837119fefbc0bab
+DIST teamspeak3-server_linux_x86-3.1.3.tar.bz2 7676538 BLAKE2B 2f57bee0bfb1e7f643e92695c813ed2bbb0b080a76fa2a0eb2a1bdb288edcbbd93c1233a6a8be129473c397c7471554743f57f6ee37242e272db2ba4dfa2bc8d SHA512 050423ed4ef9eedcfb96499cddaf15405aaf4e15ace6d89eed55085f9173394b431ac12e9d226af015e5eddaa484e65f8b475bd04167d3311cb7e33d8c059a7d
+EBUILD teamspeak-server-bin-3.1.3.ebuild 3406 BLAKE2B 40b59dac859af212de10cb58700741479122f81495258c5618c16a7e85cdf670deb95a5b12e3c9019b459d0ddb6da3c84bc8e702efbea3f7ac6fe7558dcf43d9 SHA512 05e1d0518cb99292e8cac74b2f0a8f0daff3bcc4911e726305040b165f5c10318d35609a79b9d294b3697527b7f37c17a7bb82ac5abef45d98de08157c2b3523
+MISC metadata.xml 784 BLAKE2B 2e51ada42240de0b09a52863cdd26f08dbd1fdf1e037d9b9d71a382c72410ed1b1bf2b8b73d90d650b877b4d9ece4902a7873e4e8b110e5e4a798575151d9c44 SHA512 5b186a986e94b62f72ee83e77a4aaacfaadb7c58aa6418187dddcc78a31bc9880d9a2b55c16fa7f7239233d6aefca6048e72ef2db74d99c7b9f4b4adbae1710f
diff --git a/media-sound/teamspeak-server-bin/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml
index 67ae94b5f922..812b26bfd184 100644
--- a/media-sound/teamspeak-server-bin/metadata.xml
+++ b/media-sound/teamspeak-server-bin/metadata.xml
@@ -9,10 +9,13 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>TeamSpeak Server (Voice Communication Software)</longdescription>
+	<longdescription>
+		TeamSpeak is a proprietary voice-over-Internet Protocol (VoIP) application
+		for audio communication between users on a chat channel, much like a telephone conference call.
+		Users typically use headphones with a microphone.
+		The server software allows users to connect and join chat channels.
+	</longdescription>
 	<use>
-		<flag name="doc">Install TeamSpeak complete documentation.</flag>
-		<!-- <flag name="mysql">Install TeamSpeak MariaDB support.</flag> -->
-		<flag name="tsdns">Install TeamSpeak DNS.</flag>
+		<flag name="tsdns">Install TeamSpeaks own DNS service.</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.2.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.2.ebuild
deleted file mode 100644
index 5bbbf749cb09..000000000000
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="TeamSpeak is software for quality voice communication via the Internet"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )"
-
-LICENSE="LGPL-2.1 teamspeak3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc tsdns"
-# IUSE="doc mysql tsdns"
-
-# RDEPEND="mysql? ( dev-db/mariadb-connector-c:0=
-#		<dev-libs/openssl-1.1:0=
-#		sys-libs/zlib )"
-
-RESTRICT="mirror strip"
-
-S="${WORKDIR}/teamspeak3-server_linux"
-
-QA_PREBUILT="opt/teamspeak3-server/libts3db_sqlite3.so
-		opt/teamspeak3-server/ts3server"
-
-pkg_setup() {
-	enewgroup teamspeak
-	enewuser teamspeak -1 -1 /opt/teamspeak3-server teamspeak
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if use amd64; then
-		mv "teamspeak3-server_linux_amd64" "teamspeak3-server_linux" || die
-	else
-		mv "teamspeak3-server_linux_x86" "teamspeak3-server_linux" || die
-	fi
-}
-
-src_install() {
-	# Accept license
-	touch "${T%/}"/.ts3server_license_accepted || die
-	insinto "/opt/teamspeak3-server"
-	doins "${T}"/.ts3server_license_accepted
-
-	exeinto "/opt/teamspeak3-server"
-	doexe "ts3server"
-	doexe "${FILESDIR}/ts3server-bin"
-	dodir "/opt/bin"
-	dosym "../teamspeak3-server/ts3server-bin" "/opt/bin/ts3server"
-
-	exeinto "/opt/teamspeak3-server"
-	doexe "libts3db_sqlite3.so"
-
-	insinto "/opt/teamspeak3-server/sql"
-	doins "sql"/*.sql
-	doins -r "sql/create_sqlite"
-
-	insinto "/etc/teamspeak3-server"
-	doins "${FILESDIR}/ts3server.ini"
-
-	newinitd "${FILESDIR}/teamspeak.initd" teamspeak3-server
-	systemd_newunit "${FILESDIR}/teamspeak.service" teamspeak3-server.service
-	systemd_newtmpfilesd "${FILESDIR}/teamspeak.tmpfiles" teamspeak3-server.conf
-
-	# Install optional mysql
-	# if use mysql; then
-	#	insinto "/etc/teamspeak3-server"
-	#	doins "${FILESDIR}/ts3server_mariadb.ini.sample"
-	#	doins "${FILESDIR}/ts3db_mariadb.ini.sample"
-	#
-	#	exeinto "/opt/teamspeak3-server"
-	#	doexe "libts3db_mariadb.so"
-	#
-	#	insinto "/opt/teamspeak3-server/sql"
-	#	doins -r "sql/create_mariadb"
-	#	doins -r "sql/updates_and_fixes"
-	# fi
-
-	if use doc; then
-		local HTML_DOCS=( "doc/serverquery/." )
-
-		docinto "serverquery"
-		dodoc "serverquerydocs"/*.txt
-
-		docinto "ts3server"
-		dodoc "doc"/*.txt
-	fi
-
-	if use tsdns; then
-		exeinto "/opt/teamspeak3-server"
-		doexe "tsdns/tsdnsserver"
-		dodir "/opt/bin"
-		dosym "../teamspeak3-server/tsdnsserver" "/opt/bin/tsdnsserver"
-
-		insinto "/etc/teamspeak3-server"
-		doins "tsdns/tsdns_settings.ini.sample"
-
-		docinto "tsdns"
-		dodoc "tsdns/README" "tsdns/USAGE"
-	fi
-
-	einstalldocs
-
-	keepdir "/etc/teamspeak3-server"
-	keepdir "/var/log/teamspeak3-server"
-
-	# Protect config
-	# if use mysql; then
-	#	echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini\"" > "${T}"/99teamspeak3-server || die
-	# else
-	echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini\"" > "${T}"/99teamspeak3-server || die
-	# fi
-	doenvd "${T}"/99teamspeak3-server
-
-	fowners -R teamspeak:teamspeak "/etc/teamspeak3-server" "/opt/teamspeak3-server" "/var/log/teamspeak3-server"
-}
-
-pkg_postinst() {
-	elog "If you have a Non-Profit License (NPL),"
-	elog "place it in /opt/teamspeak3-server as licensekey.dat."
-}
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.3.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.3.ebuild
new file mode 100644
index 000000000000..aa03952e42e4
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="A server software for hosting quality voice communication via the internet"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )"
+
+LICENSE="LGPL-2.1 teamspeak3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc mysql tsdns"
+
+RDEPEND="mysql? ( <dev-libs/openssl-1.1:0=
+	sys-libs/zlib:= )"
+
+RESTRICT="mirror strip"
+
+S="${WORKDIR}/teamspeak3-server_linux"
+
+QA_PREBUILT="opt/teamspeak3-server/libmariadb.so.2
+	opt/teamspeak3-server/libts3db_mariadb.so
+	opt/teamspeak3-server/libts3db_sqlite3.so
+	opt/teamspeak3-server/ts3server"
+
+pkg_setup() {
+	enewgroup teamspeak
+	enewuser teamspeak -1 -1 /opt/teamspeak3-server teamspeak
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64; then
+		mv "teamspeak3-server_linux_amd64" "teamspeak3-server_linux" || die
+	else
+		mv "teamspeak3-server_linux_x86" "teamspeak3-server_linux" || die
+	fi
+}
+
+src_install() {
+	touch "${T%/}"/.ts3server_license_accepted || die
+	insinto "/opt/teamspeak3-server"
+	doins "${T}"/.ts3server_license_accepted
+
+	exeinto "/opt/teamspeak3-server"
+	doexe "ts3server"
+	doexe "${FILESDIR}/ts3server-bin"
+	dodir "/opt/bin"
+	dosym "../teamspeak3-server/ts3server-bin" "/opt/bin/ts3server"
+
+	exeinto "/opt/teamspeak3-server"
+	doexe "libts3db_sqlite3.so"
+
+	insinto "/opt/teamspeak3-server/sql"
+	doins "sql"/*.sql
+	doins -r "sql/create_sqlite"
+
+	insinto "/etc/teamspeak3-server"
+	doins "${FILESDIR}/ts3server.ini"
+
+	newinitd "${FILESDIR}/teamspeak.initd" teamspeak3-server
+	systemd_newunit "${FILESDIR}/teamspeak.service" teamspeak3-server.service
+	systemd_newtmpfilesd "${FILESDIR}/teamspeak.tmpfiles" teamspeak3-server.conf
+
+	if use mysql; then
+		insinto "/etc/teamspeak3-server"
+		doins "${FILESDIR}/ts3server_mariadb.ini.sample"
+		doins "${FILESDIR}/ts3db_mariadb.ini.sample"
+
+		exeinto "/opt/teamspeak3-server"
+		doexe "libts3db_mariadb.so"
+		doexe "redist/libmariadb.so.2"
+
+		insinto "/opt/teamspeak3-server/sql"
+		doins -r "sql/create_mariadb"
+		doins -r "sql/updates_and_fixes"
+	fi
+
+	if use doc; then
+		local HTML_DOCS=( "doc/serverquery/." )
+
+		docinto "serverquery"
+		dodoc "serverquerydocs"/*.txt
+
+		docinto "ts3server"
+		dodoc "doc"/*.txt
+	fi
+
+	if use tsdns; then
+		exeinto "/opt/teamspeak3-server"
+		doexe "tsdns/tsdnsserver"
+		dodir "/opt/bin"
+		dosym "../teamspeak3-server/tsdnsserver" "/opt/bin/tsdnsserver"
+
+		insinto "/etc/teamspeak3-server"
+		doins "tsdns/tsdns_settings.ini.sample"
+
+		docinto "tsdns"
+		dodoc "tsdns/README" "tsdns/USAGE"
+	fi
+
+	einstalldocs
+
+	keepdir "/etc/teamspeak3-server"
+	keepdir "/var/log/teamspeak3-server"
+
+	if use mysql; then
+		echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini\"" > "${T}"/99teamspeak3-server || die
+	else
+		echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini\"" > "${T}"/99teamspeak3-server || die
+	fi
+	doenvd "${T}"/99teamspeak3-server
+
+	fowners -R teamspeak:teamspeak "/etc/teamspeak3-server" "/opt/teamspeak3-server" "/var/log/teamspeak3-server"
+}
+
+pkg_postinst() {
+	elog "If you have a Non-Profit License (NPL),"
+	elog "place it in /opt/teamspeak3-server as licensekey.dat."
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 0d3df9570d42..f35f3d52774c 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index e612bc3c5c58..8f4c5e2d018e 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -3,9 +3,10 @@ AUX ffmpeg4.patch 1832 BLAKE2B 1770e99dacc641b066d79b83ad145631a1cbe0330e5bcf938
 AUX gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch 542 BLAKE2B 31a9898e8a9741833acacdfa40db23b252a7c4de8491d7c9b80ed700499e11c078205889e402aa415a9e718cfa72783ac40ecc9956dc2e86db45cd5d90964fdc SHA512 65746044b1a8f2125b5113f4ec1ffa2c46b53f1927202c38130431e53875483ac834444e6e5ea1e589176dba0139e9703b4fc61be038ac305234b53765ba16cd
 AUX gpac-0.5.3-static-libs.patch 2843 BLAKE2B 99b301f9e4e0e87d9d93763dc40daa2bc2c57cbac4e09de4e9e86baff98c5ad62e598d532ba843e3eef8e0445c5fe66b03be0e3ef42b54c6dd3a84cff975878f SHA512 aa130e8744124c8cf4d280b669a0e1d133f57e3637a1ab7f151610439d37366145e1aec28a07338118f1c19e5a81c5068dcda813e15787575953332040603d5c
 AUX gpac-0.7.1-configure.patch 2928 BLAKE2B 98ce3227f87c3c4576f5d4bc3a28d560ca3f8d7912414984c7ea58dd27c5717ce30f28b0508368b39fb5b19159e363892fecd0d60d137bd65a4c3d7e02a6d69f SHA512 f359693d43b3d033bc05c8af4951aff9cb432601421d888e50296c6164157b85be368ea4ae828e5229ae9344738bd49136d947ef0eb57bf545f80c3243c94046
+AUX gpac-freetype.patch 622 BLAKE2B b27d2ae313ca95cd46280b56d42b631854995d5e283269ea2f059b6be8bb547949e6c241f62ec4692b7b31626898cf31874ee8e8462e6cc414353aa8b72965cf SHA512 8361efbe7fa8989d63a8de733094e2f9e0f7467d7bf437330477bcbc4091517619c925aef056a1ee57c3cc7b0f3e973abab5cb095a5a8444ff1b220bbb7a2dde
 DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
 EBUILD gpac-0.6.1-r2.ebuild 3211 BLAKE2B abcf08b642fec5182c653b186fc61a16b0f8be87bcad28cd7494c3a871cc9717c3d8e9cef51616a7a9b99ed61d9e12644f284ecf95d3fb9fb0f8462faa6667eb SHA512 2bfa94a7e2ccfb8953a505047bcbf2843218530d79b66a839dc2ee9c6d324914d37f673563a0bc71eca4fdd18ee720acdc30fe58d24efb8b347df6030afb75a5
-EBUILD gpac-0.7.1.ebuild 3406 BLAKE2B 37b5d6de46f3ab403b014387cac6b082c07d8cbbb085109cb7e9dcf40d95f94e739cd1feb4739a69db5d1649368e59874e0fabf24e456b20ca320c95694ac686 SHA512 98b41c2655f9e313e5eebafc2babce31072fac002cd83265ca4692ca0b7bd18be274330a2286b897b6edd451b942cc9b120b1689d242a7009a5b4d706f426d45
+EBUILD gpac-0.7.1.ebuild 3461 BLAKE2B 60a5c9e6acd71c5254fd0ca26e38f161ba53f8a24ea9a8856f55d9a80d8fc877566e83344ae20ab2941787292b54d1ef00ec43eddd5077157e2f2e243c272f03 SHA512 3499a090bc797415b05e138f55aa8fa57292a790d6f5a305e9ee7a0d6cceeada5306048027257f272cd2804d61e2dc99a402498f3a2a4745d8d31fd159040df4
 EBUILD gpac-9999.ebuild 3095 BLAKE2B 5a1223e8f93f7b0ac751e1a8f46c305b60d578bb8235d23c9bb9f9619db405ee35607714df635d003a0e742b425265114f3e4b2dca527b2601691ee93ce90ba5 SHA512 f5d8046010c916cdca9ae2698e5d08fe29fb2637a869799c021968aad872094d1e2ca68db77cf36c62b154bd5b5e31ff392b01cb522e701c04565304eb185a06
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/files/gpac-freetype.patch b/media-video/gpac/files/gpac-freetype.patch
new file mode 100644
index 000000000000..98224aff30e1
--- /dev/null
+++ b/media-video/gpac/files/gpac-freetype.patch
@@ -0,0 +1,15 @@
+Index: gpac-0.7.1/configure
+===================================================================
+--- gpac-0.7.1.orig/configure
++++ gpac-0.7.1/configure
+@@ -1117,8 +1117,8 @@ if docc $CFLAGS_DIR $ft_cflags $ft_lflag
+ fi
+ if test "$cross_prefix" = "" ; then
+     if test "$has_ft" = "no" ; then
+-        ft_cflags="`freetype-config --cflags 2>>$logs`"
+-        ft_lflags="`freetype-config --libs 2>>$logs`"
++        ft_cflags="`pkg-config --cflags freetype2 2>>$logs`"
++        ft_lflags="`pkg-config --libs freetype2 2>>$logs`"
+         if docc $ft_cflags $ft_lflags $LDFLAGS ; then
+             has_ft="system"
+         fi
diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild
index ca4acbd586ef..ed5c090d045f 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1.ebuild
@@ -56,12 +56,14 @@ RDEPEND="
 "
 # disabled upstream, see applications/Makefile
 # wxwidgets? ( =x11-libs/wxGTK-2.8* )
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 # DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
 PATCHES=(
 	"${FILESDIR}/${PN}-0.7.1-configure.patch"
 	"${FILESDIR}/ffmpeg4.patch"
+	"${FILESDIR}/${PN}-freetype.patch"
 )
 
 DOCS=(
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 67de1264aa2f..4c5d6d2d06e0 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,8 +1,10 @@
 DIST mkvtoolnix-19.0.0.tar.xz 4616780 BLAKE2B 72eb3b1a34bbed0d492098c02c1f60c7ce7f0ea6a8fbff6b88bd9d7af5891dda8c8adb9a0f856c65106fb430b481183ce74b9369590cd4dcfe881d7db84eb06d SHA512 dd18eeffc8a5210ca3c8a287321ad106f63cff8fbe5ad3891460aab7e60f2d5261a3f335f3991524a95724861288593cfb3bd9df6829a2f7751f6a1fdaba0ca6
 DIST mkvtoolnix-21.0.0.tar.xz 4682788 BLAKE2B 52d9920fc5b735f7d8af1f6e60828f143a914ce7cd7c635daacb6d2da584b0158f80e0f4d39824130b0c8fcc83b7c3a1215b2e965cb8b47b2b297df2d78414d5 SHA512 881e0c38eee2d36ab9dea5ccaa8ad74e0076cdc13606f873ab58bfeeec09c05e947529d3bad665b1d4df6a816faca30e8a685bc19115f90c18dac3c1ae27c252
 DIST mkvtoolnix-22.0.0.tar.xz 4714712 BLAKE2B 325a0a250db8c6c833b01e6bb613044ca21b4061cbbd516ee6c60388b17c9c3759cf9759af0e2c23091d8044fd86358122e0739bf7d6133be9befca37c6d0294 SHA512 59d299f21d484dc529dafe81a35d3351e4f57abf6a2d8889692d95b9b9ffacdca9b55a3cf373b147f3ff12595590bf98f49af5d22d311b9b2d03f12a4bba00a6
+DIST mkvtoolnix-23.0.0.tar.xz 4729056 BLAKE2B a264b482f141de502fb4c4aadcdc0ec1ed4e34d2ddc906d8d1f6a0b1ea76511a590ab9d90e035955aa138512877848752185012b8e7e1aeed3007c186c796190 SHA512 3c9072b54a4076e6fb934d40a2c2554dfa1316de1cb8d74ab262b0584eda1e679324aaf690195f68590413f9d3ca34d5d2a1f9f5545de065fe2db892eee19ffb
 EBUILD mkvtoolnix-19.0.0.ebuild 2549 BLAKE2B f205d940a9fe250d842cfeaffefd389be863556cfbb6d1d2960551c5b16ece35269c9c64f2c110655e38f2cda894c5940bf686fb04602ad997cca05f61ecb0b9 SHA512 e8291ce11ad3871b538ccce78d81e258ff4112098a14587f12a03969a40cec24ddb884a2c9e3c16503ac1272a586e6e61fef8d414c28e9ee526949c97e52124c
 EBUILD mkvtoolnix-21.0.0-r1.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
 EBUILD mkvtoolnix-22.0.0.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
+EBUILD mkvtoolnix-23.0.0.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
 EBUILD mkvtoolnix-9999.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-23.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-23.0.0.ebuild
new file mode 100644
index 000000000000..cc20f8c7ff38
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-23.0.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils gnome2-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+	inherit git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug pch test qt5"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+	>=dev-libs/boost-1.49.0:=
+	>=dev-libs/libebml-1.3.5:=
+	dev-libs/jsoncpp:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.8:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtmultimedia:5
+		app-text/cmark
+	)
+"
+DEPEND="${RDEPEND}
+	dev-ruby/rake
+	sys-devel/gettext
+	virtual/pkgconfig
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	app-text/po4a
+	test? ( dev-cpp/gtest )
+"
+
+DOCS="AUTHORS NEWS.md README.md"
+
+pkg_pretend() {
+	# https://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && { ./autogen.sh || die; }
+}
+
+src_configure() {
+	local myconf
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myconf+=(
+			--with-moc=$(qt5_get_bindir)/moc
+			--with-uic=$(qt5_get_bindir)/uic
+			--with-rcc=$(qt5_get_bindir)/rcc
+			--with-qmake=$(qt5_get_bindir)/qmake
+		)
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt5 qt) \
+		$(usex pch "" --disable-precompiled-headers) \
+		"${myconf[@]}" \
+		--disable-update-check \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	einstalldocs
+	doman doc/man/*.1
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index de24cc03e350..ffe4ea263b3c 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -2,12 +2,13 @@ AUX dump_ffmpeg.sh 2529 BLAKE2B 2c945fcf0b430d74c85557f82497dbc4a2a8308ecb34c86e
 AUX mplayer-1.3-CVE-2016-4352.patch 617 BLAKE2B 57f85be46230fa0576c6569bafc8c65f24b0a59d3b083c06d2e14fe176505567feca5024bafd73fb1b48960ea95a4705132ed6e2166a31aabcd1e34fc41e3803 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512
 AUX mplayer-1.3-ffmpeg4.patch 25679 BLAKE2B 08f9ddb05a11c9b7ce0de7fe7bb92b492d1b35e65437c09be07cd39aa70cd9541baf442ffae1ee3060fd94d78eca30fa35808db8eebfdf679456da2c1d8217e8 SHA512 9f29fcd0bfd374fecf15a40c51e2bac53d2646d939ea13e7afffc8e9854d6d2105142f95745f0b26d8f58e19938c5ccedb191af30858fb6f3520072c98db3081
 AUX mplayer-1.3-vdpau-x11.patch 547 BLAKE2B b168b61f5712788c25164cf286a119de1d42c1a142048fc8b138226d146614d7fc454dd7a5c05bfcbdef815bf5d5e18064e2893a3adecd0733fcb79a803a5876 SHA512 439c7925f97b973597239a8f684171e752321dad4bae80a3a2bad46dcf6bf0c49b0839cd5cdac5c8e0b9f5c165061b4177d05cd8060ebba6cd5c4e730ab019ab
+AUX mplayer-1.3.0-freetype_pkgconfig.patch 417 BLAKE2B 3eb3d8463917f938b587858bca55f974382eab82ca5b22d05f3a3f3ef0f640a991e4b0dc527a7b02788f9fe361ae96898208f9a8d45c6b7dc1ddea5dd07a2dea SHA512 6e934229ab5c3a7bbfb583c9e41365c9f9de8f1448ff6bd9dfb4a8053cae18b66081b64d9f1bd26678db69470372805566df52894cb9a433f38d3c15ed4a8815
 AUX prepare_mplayer.sh 757 BLAKE2B 5de1cb4b17628dd5443f98a20717f8ed028a76446104a471a669b1c7ed7a5b76a8e86203f436240312ac4814a0ba7dba7856bb4f3723da850188a3003aae8bbb SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a
 DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a38b2bc6a2ce0ce062f213bf46c11c67b0d93dd53ea3bd618c74df08bf756e8872d172c1b27e0e175fc67c236a077 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
-EBUILD mplayer-1.3.0-r3.ebuild 17205 BLAKE2B 98a2cabf8229a211dfd7501671f8578d23c801838535a05f004612e57bd969d9d69e8bc9afdf4377125ca815b567d52b2c3b4e3419d28d6c1330b2101e672e3b SHA512 b1e3f85d27613dd4973410425c6557a94cded0c4674a5fcac9e43ff38fbcd393f2c48cfbd054a4af127c14e09866a62fbfeb2165104978f6883809e65b3e8170
-EBUILD mplayer-1.3.0-r5.ebuild 17229 BLAKE2B d27d1532b472d951bf0d6349ac846fbfb523f1a0341bd05ea763eef01642816b3e612159f4e86d18cbba8ab9c34ca868edf8e1f5d30353b12c5c66cd4f4847a2 SHA512 e252f16bce5964d790cad463cfb1ae3a61778bb148a2852949933a04864da1fef352aeea391bf15e4449d8b73c0fd6e7ec4f216bee88150067825a3c5e52b71f
+EBUILD mplayer-1.3.0-r3.ebuild 17273 BLAKE2B 760bc09441661e7fcc1a2d0243c60ea084b7d7a7e378fe65c1b7475b46a04b087281f4d8075271bd5e79980bb0416291c5c2a03592d3f3c1dca6b07f111401e7 SHA512 48ebca46b6d865cdc075d5f68f775ed86366b24d8e848962cc8cdb165d5c8d243e6f7dd215c5b570705879b3d2287731d15d129f5f131560a25f5f26a47c9f9c
+EBUILD mplayer-1.3.0-r5.ebuild 17297 BLAKE2B 5cf6ff6c9d48f91e837c4fd3e2d6bda6486e85ef01427943bd2c12fd7a68264ca5c0ad52c48624b72e0b73721c649a95804e2569ddb98555d8dfe5cdf74597ea SHA512 42b9866eecfb3eb44fecdb08dfdeac0a8ae878cb3c4757f5fe7b2f97bc7e60fbf8451ccef81bac7ec49c24072260dfd43d8a661e52a5c9edc15f5e75ef37ea3f
 EBUILD mplayer-9999.ebuild 16983 BLAKE2B 22736905b595451ca6ecbb09ca28a32e59655de960850764e22a228caceb515a05b4dca2af04af1d63c1a1b3e78709c69c69b35f28e79c15aa9149e1344b3e36 SHA512 a8625386b91ee53d09dc50ae5a34938f9e981e174748399d580329308fbca99afdf71340214f4a7d577f5c4c61dd7ba1a6edef11d62f40bf3430eb3d365889a5
 MISC metadata.xml 2530 BLAKE2B 83baf1357e9b0d31244b7c04ceab7eec0bc7db7eb9a2de4ffc1a85cc49af40f1094d9bdbac22c9abff43c215c19e5b8c745afbd397ae7221921c24b422590e3a SHA512 b650af6aa25ee064d81d3db5cc066d634eaf8c8ccdf8e1352d449f0579b0a310026be2ff873999767c5b82c25a76c138af722220892794b9c615ce477335a93b
diff --git a/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch b/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..4bd67ca185aa
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch
@@ -0,0 +1,14 @@
+Index: configure
+===================================================================
+--- a/configure   (revision 38020)
++++ b/configure   (revision 38021)
+@@ -839,7 +839,8 @@
+ _macosx_finder=no
+ _macosx_bundle=auto
+ _sortsub=yes
+-_freetypeconfig='freetype-config'
++_freetypeconfig='pkg-config freetype2'
++type freetype-config >/dev/null 2>&1 && _freetypeconfig=freetype-config
+ _fribidi=auto
+ _enca=auto
+ _inet6=auto
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index c52e83c38b30..c48e3a8e79db 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -242,6 +242,7 @@ src_prepare() {
 		subversion_wc_info
 		printf "${ESVN_WC_REVISION}" > $svf
 	else
+		epatch "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240
 		epatch "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
 	fi
 	if [ ! -f VERSION ] ; then
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index 1e14de1f1ea4..6b515f5212dc 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -243,6 +243,7 @@ src_prepare() {
 		subversion_wc_info
 		printf "${ESVN_WC_REVISION}" > $svf
 	else
+		eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240
 		eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
 		has_version '>media-video/ffmpeg-3.5' && eapply "${FILESDIR}"/${PN}-1.3-ffmpeg4.patch
 	fi
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 459c88789d07..03219757039a 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -12,5 +12,5 @@ DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28f
 EBUILD mpv-0.25.0-r2.ebuild 10902 BLAKE2B fa9ae811c53d01d32b8288696436783f9cf434d04255c45ae5efb73d68821afe5bfc3a2548fde646e11b35b4329ca61fc4bf3d18e7277538274a10440cde9069 SHA512 00c1edd4c77e859fc03d8cbadfefa7278bceb94d788d1306478fbf7b7535225c15e6dc65058eccf8251b9e6f3a4f9ce7ba04bfbc2065ccff13416fc5a32ebb7b
 EBUILD mpv-0.27.2.ebuild 10508 BLAKE2B 37b3ba28fee39f4e5d54e8009888f2a2cdf6568b236acc43e58be9fee72c60b7140904c57db8ee9cba46698cc764908705076df3940e55858a141d59ab6d7a86 SHA512 ebf1bb73a7189768a522ac3d86d33eb63dd97459bbca488a08fa78554316d3ab28e7cd54ab80dd449b55b05dbd0dc00a0f3353bd18ca3fed7444978e0bf02aa9
 EBUILD mpv-0.28.2.ebuild 10150 BLAKE2B 6a578bb33d95a3f3f9a14e83415797b0db8958c6ac914154c864305721c7f25ffe8d7733a64e9cbae3db23bdffb157e9e35ba0aa2c5880f805cebd404bd14798 SHA512 0086735a3d64b4c918c24556d8738ab0f7a739d957f308f9ff5db7158091bce2febfdbe2056199f2a7d68bd6a1a1c93529c1bf58abab669438a6bcbe74776fe3
-EBUILD mpv-9999.ebuild 10002 BLAKE2B 665da5d08e33c03510e6c5ea78362ce1e6c7134b067e144d44ca26eb85e569a3a8ca1302082ed1426b91cbc21f66f8bc489c1e60b4b368ea0b71cbf5d2f6f1f0 SHA512 8db0e0ee96d643fd0f40653ed0e7c6c5ec1915bf7219e402cf82c669ef55190790f1e7a92a3031e6d9fa1d6b7f1c33f90b184c68fd069fcc7278071d9ccf3858
+EBUILD mpv-9999.ebuild 10052 BLAKE2B e947ea5eb136b6aa23a1fc605adb0c92f342437c37e80f11baf4c2c7d4d2c595b9bc41a3ab77725c80b440d4d06657d1007b4d3eb00c4224672ee5387991fc3a SHA512 0a8ae56b7c4769d96631aba34463a9ef9bad549d5db3b922347f97a40c8b2b40e6dc83b10c6bf838f224163482ff1d963a02c3c62d6fea354764275974ff6bd7
 MISC metadata.xml 2281 BLAKE2B fb3fb9a0a5798b9735a654b0b594961105427e03947709a098d73555844a52c38e961802cb3a5fe286dda25b5d502c8052dc874be3a5e509f2a7ed428aeea6a7 SHA512 cc2b169845069766379912edf2c30fd85fbd2d7bb584d18e9a4f599af6eb29e89e87dab8ac2d3f7a27ac5da7aec8edcd5b60c5c909821383b62e82c251931817
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 8ebf7c7bbb65..de7207561cea 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -119,6 +119,7 @@ DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
 	dev-python/docutils
 	virtual/pkgconfig
+	cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 )
 	doc? ( dev-python/rst2pdf )
 	dvb? ( virtual/linuxtv-dvb-headers )
 	test? ( >=dev-util/cmocka-1.0.0 )
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 05cc3e1579ef..c2113abb0140 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 72b494a0407a..55a4a1351eb4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 08 May 2018 12:08:21 +0000
+Fri, 11 May 2018 14:08:22 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 6726bb5a02b0..0ed1024c0d68 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 423449 BLAKE2B 490b3d49b1771ae622d89196faa36c2d3d274e6d765ed1a321c6f9c87e1eb16d0203672388185976cbe2316abc3aecaee60e0fd848bbf8c908b233ead62e69f8 SHA512 dbad8dc00d617765448bf9e5b166abdc6106321cb88ddbcbdeb94b96a977fd0d73a2a2806812a142d60c061d18208f0f31b4d01f9b25406ea237913f539f54fd
-TIMESTAMP 2018-05-08T12:08:26Z
+MANIFEST Manifest.files.gz 423609 BLAKE2B cbd920553b52bd805c115c763e4d6e2ee3d453ad1d6dfc315556c7a37a40f6e92d25437ae0c4238712e49a25ff5de88a4a56f425e3de6b9710d55daa2faef491 SHA512 3ac6837ed015c4c2f983100055b2867a7affaa1fd0de409b6c572144638db29f44f2af6b02450bb12cf8d1d79d3f90f56519fcc92e5b499d612f1c4c59fb4481
+TIMESTAMP 2018-05-11T14:08:26Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrxkzpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlr1o9pfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBz9Q//Uw0RGbgOAPchaH2Lkazt0lcMy7gc9hdf7CiscnPVa6MKS9lVKLXFqBvl
-nesDtXBphk1n+tLzGwNyyB9hFRCEQv+PepGhJBScMmrtuRDEpW18Jq4WPW/gKzdS
-xes9bJbmic0jJxrVL562CGWF+/qBJ3Xbh0SFLnbPBmRaHwFcalLrCwoCV70f5/5R
-altDrF/V325DYlgrghNcyxYq5EdWTCUacH1kdDUIZmhEw4/KKnW0dG6F1o8Ee5E0
-wdQOsirtNrtbkMSTXyWt6EZZfanRDeIjkbG3v4vZy/I1GxGqqhX+9Mp6C7mEzFUQ
-rGw2+xXekA6r2RBr80RKKroAisBabiO7I5ilsiJKdYGz5IJEpA4Y42d2uX9SkQSZ
-iBjteHYrSPriPGmLAI3Idp6KhM8ux15lXaU1iXK8hkvR+uVKgL/q6piJwqpkJM6m
-9kdW/ik6+7cDBPAs71K2Pe9udgvvHCxD/BI40N5xAlZgaVpAYmb4Ru1ndaPAG/DT
-GfL3AkpHmnkwOFy2lbeRFDSgeLAIL0LdOpOQfuIQdhrXfAWkxeAOu4sXVKJlSDRr
-p9cc6KUus6R4nOpCpbdE56VEo+KXaU+Iil2eLBevUk35rkuN/TyshbCz0hJ1E7y+
-oJduLbUhQrxA+wb7YfccNbCTvJR4p4tZu/jAqJ7mPQUJ3p4wc38=
-=ebyQ
+klB+AA/8D3g1f0uTJa+nMTdKsWlgF0qwXNP+2+Y5zHY93Th6+6bN+Q+NlJkQxvGM
+LAyPGVcUWIreIYNuJzt/fXqqK0XTyrCl5zWUiniWZZEP9QGXsSiv1GU5rHUHJH3j
+OX9/0QGrw9afjxVMvVwHTtn09bEFCE0JeGfE/nE66Rjaq3Wk9DXaPtqqDqwQbvGw
+FuAtiDdbar3ddwKtdbTpwjpY/x2inD3AmHzrak/cwErfpzSpZWzjIw3sAN/dq7oO
+13lQAazOTUNMrUlNpLsaCAiCa/Lpa0usWTXcp2etYphvDHnjP2PtxO+DE2dlPjVY
+oj15fJmvUfPvZa7gwpKo9V4/bEE6mk0++XPRtgNAZVn9qXPgVbv87DZfxPflUENl
+zi2cYczu/XRAJF8MnNInd3RullGshkvainpofnq/ZABcHigqBjXY+jWrHPzRXByK
+lVm8Dh2QRsGa4D6qS1f/iB5XYKeaXjZOaccZNXkC8FECB/pA0p7zXDX9rao+asbb
+O78BQZvsWasvK98lj2kt0SzciP9cZh1nJZVWnViRr7whBavBrN8+4FAezOsPpsWo
+ndY/LxVphiOPrHY+oLcRA3jStHOs1tr2huGpO5ux6uDvO152LI9dGa4DkDoQf8/f
+2eOBsIe2iQwM3kf77y0Cgmg2a2hBODmqxrA0FqLMtDQdBVscpt4=
+=TcjO
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 18c8fa3d4261..88517ac8974b 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-201805-04.xml b/metadata/glsa/glsa-201805-04.xml
new file mode 100644
index 000000000000..f63ce11ab625
--- /dev/null
+++ b/metadata/glsa/glsa-201805-04.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201805-04">
+  <title>rsync: Arbitrary command execution</title>
+  <synopsis>A vulnerability in rsync might allow remote attackers to execute
+    arbitrary commands.
+  </synopsis>
+  <product type="ebuild">rsync</product>
+  <announced>2018-05-08</announced>
+  <revised count="1">2018-05-08</revised>
+  <bug>646818</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-misc/rsync" auto="yes" arch="*">
+      <unaffected range="ge">3.1.3</unaffected>
+      <vulnerable range="lt">3.1.3</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>File transfer program to keep remote files into sync.</p>
+  </background>
+  <description>
+    <p>A vulnerability was discovered in rsync’s parse_arguments function in
+      options.c.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Remote attackers could possibly execute arbitrary commands with the
+      privilege of the process.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All rsync users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-misc/rsync-3.1.3"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5764">CVE-2018-5764</uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-05-03T08:10:23Z">Zlogene</metadata>
+  <metadata tag="submitter" timestamp="2018-05-08T15:27:34Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 72b494a0407a..55a4a1351eb4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 08 May 2018 12:08:21 +0000
+Fri, 11 May 2018 14:08:22 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 94cb37af3cfa..80519ec96966 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-e5c04f29237a0b5ac8d5c241b6f686f89d46e211 1525305465 2018-05-02T23:57:45+00:00
+b65153089d9ef7671aaa737050c3a53cb35a1893 1525793297 2018-05-08T15:28:17+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6070e7f95837..fbb27541ae65 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index e36befb3713f..386fd5127413 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/sudo-1.8.22-r2 b/metadata/md5-cache/app-admin/sudo-1.8.22-r2
index 1645aca6719e..7e4e99ec945b 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.22-r2
+++ b/metadata/md5-cache/app-admin/sudo-1.8.22-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
 HOMEPAGE=https://www.sudo.ws/
 IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
 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=https://www.sudo.ws/sudo/dist/sudo-1.8.22.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.22.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=122b67441244414a813a0c5a1f7054c3
+_md5_=63697c31e3c98574d4e4bcb5af00cda0
diff --git a/metadata/md5-cache/app-admin/sxid-4.2-r2 b/metadata/md5-cache/app-admin/sxid-4.2-r2
index 09bfec9a312e..5499339f96d0 100644
--- a/metadata/md5-cache/app-admin/sxid-4.2-r2
+++ b/metadata/md5-cache/app-admin/sxid-4.2-r2
@@ -3,10 +3,10 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=suid, sgid file and directory checking
 EAPI=6
 HOMEPAGE=http://freshmeat.net/projects/sxid
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=virtual/mailx
 SLOT=0
 SRC_URI=http://linukz.org/download/sxid-4.2.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=3892451f080b6390723dea0f9135379d
+_md5_=01469b2a2aa8581e3bdaba389802d88f
diff --git a/metadata/md5-cache/app-admin/vault-0.10.0 b/metadata/md5-cache/app-admin/vault-0.10.0
index e38dcad5a5f8..4646ff70156b 100644
--- a/metadata/md5-cache/app-admin/vault-0.10.0
+++ b/metadata/md5-cache/app-admin/vault-0.10.0
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v0.10.0.tar.gz -> vault-0.10.0.tar.gz
-_eclasses_=fcaps	29a56915716950cd3d23630cede80d68	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=9b28c4fec804b611bac337447aa2bfaf
diff --git a/metadata/md5-cache/app-admin/vault-0.10.1 b/metadata/md5-cache/app-admin/vault-0.10.1
index 0a170d889e96..c38785ff6338 100644
--- a/metadata/md5-cache/app-admin/vault-0.10.1
+++ b/metadata/md5-cache/app-admin/vault-0.10.1
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v0.10.1.tar.gz -> vault-0.10.1.tar.gz
-_eclasses_=fcaps	29a56915716950cd3d23630cede80d68	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=9b28c4fec804b611bac337447aa2bfaf
diff --git a/metadata/md5-cache/app-admin/vault-0.9.3 b/metadata/md5-cache/app-admin/vault-0.9.3
index 1f639ac7795f..e591ba38a061 100644
--- a/metadata/md5-cache/app-admin/vault-0.9.3
+++ b/metadata/md5-cache/app-admin/vault-0.9.3
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v0.9.3.tar.gz -> vault-0.9.3.tar.gz
-_eclasses_=fcaps	29a56915716950cd3d23630cede80d68	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=021cd6ec2fdba0fe1d171a9fb812376f
diff --git a/metadata/md5-cache/app-admin/vault-0.9.6 b/metadata/md5-cache/app-admin/vault-0.9.6
index 611e6cc9c9cb..b3b7489f0f45 100644
--- a/metadata/md5-cache/app-admin/vault-0.9.6
+++ b/metadata/md5-cache/app-admin/vault-0.9.6
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v0.9.6.tar.gz -> vault-0.9.6.tar.gz
-_eclasses_=fcaps	29a56915716950cd3d23630cede80d68	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=021cd6ec2fdba0fe1d171a9fb812376f
diff --git a/metadata/md5-cache/app-admin/webalizer-2.23.05 b/metadata/md5-cache/app-admin/webalizer-2.23.05
deleted file mode 100644
index 53224687e84f..000000000000
--- a/metadata/md5-cache/app-admin/webalizer-2.23.05
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare prerm setup
-DEPEND=>=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3[png] dev-libs/geoip >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Webserver log file analyzer
-EAPI=2
-HOMEPAGE=http://www.webalizer.org/
-IUSE=geoip nls xtended vhosts
-KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3[png] dev-libs/geoip >=app-admin/webapp-config-1.50.15
-SLOT=0
-SRC_URI=ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2 xtended? ( http://patrickfrei.ch/webalizer/rb29/webalizer-2.23-05-RB29-patch.tar.gz ) ftp://ftp.mrunix.net/pub/webalizer/webalizer-geodb-latest.tgz mirror://gentoo/webalizer.conf.gz
-_eclasses_=db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=af508a08d66a1da299822f60c81abb65
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 1586245ed64a..eb256aa73f68 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/p7zip-16.02-r3 b/metadata/md5-cache/app-arch/p7zip-16.02-r3
new file mode 100644
index 000000000000..8313793385f1
--- /dev/null
+++ b/metadata/md5-cache/app-arch/p7zip-16.02-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=wxwidgets? ( x11-libs/wxGTK:3.0[X] ) abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/nasm )
+DESCRIPTION=Port of 7-Zip archiver for Unix
+EAPI=6
+HOMEPAGE=http://p7zip.sourceforge.net/
+IUSE=abi_x86_x32 doc kde +pch rar static wxwidgets
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+LICENSE=LGPL-2.1 rar? ( unRAR )
+RDEPEND=wxwidgets? ( x11-libs/wxGTK:3.0[X] )
+REQUIRED_USE=kde? ( wxwidgets )
+SLOT=0
+SRC_URI=mirror://sourceforge/p7zip/p7zip_16.02_src_all.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=0e9addbe327a6f2ab9ea549ff082bb0e
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 5729a16a0c2f..42d427e3db4b 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/cdrtools-3.02_alpha07-r1 b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha07-r1
index b13ec633f4b8..6925e3e06220 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha07-r1
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha07-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
 RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
 SLOT=0
 SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.02a07.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=484a48c8b199e8b24054a4f06b6d18f1
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09 b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09
index 7f72f8b123f2..d262c89f6d5e 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
 RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
 SLOT=0
 SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.02a09.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b855bcc256b57266792741af98aa1434
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index b29961cd8c9c..1a45568a97f9 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.15.2 b/metadata/md5-cache/app-crypt/mit-krb5-1.15.2
deleted file mode 100644
index 855812a4851b..000000000000
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.15.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/yacc doc? ( virtual/latex-base ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/tcl:0 dev-util/dejagnu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=MIT Kerberos V
-EAPI=6
-HOMEPAGE=http://web.mit.edu/kerberos/www/
-IUSE=doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_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
-LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
-RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
-SLOT=0
-SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.15/krb5-1.15.2.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=440d7458f62a498321337cea434e844b
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.15.2-r1 b/metadata/md5-cache/app-crypt/mit-krb5-1.15.2-r1
deleted file mode 100644
index f151bb00ff47..000000000000
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.15.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/yacc doc? ( virtual/latex-base ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/tcl:0 dev-util/dejagnu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=MIT Kerberos V
-EAPI=6
-HOMEPAGE=http://web.mit.edu/kerberos/www/
-IUSE=doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_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
-LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
-RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
-SLOT=0
-SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.15/krb5-1.15.2.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=87da590c17936c01a58b024c094b6d98
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.16-r1 b/metadata/md5-cache/app-crypt/mit-krb5-1.16-r1
deleted file mode 100644
index 6ab5094aec80..000000000000
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.16-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/yacc doc? ( virtual/latex-base ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/tcl:0 dev-util/dejagnu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=MIT Kerberos V
-EAPI=6
-HOMEPAGE=https://web.mit.edu/kerberos/www/
-IUSE=doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_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
-LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
-RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-1.16.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=181a7ca23072fa925b3e625fd9666d7f
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.16.1 b/metadata/md5-cache/app-crypt/mit-krb5-1.16.1
new file mode 100644
index 000000000000..7f380fe4c6ed
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.16.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/yacc doc? ( virtual/latex-base ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/tcl:0 dev-util/dejagnu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=MIT Kerberos V
+EAPI=6
+HOMEPAGE=https://web.mit.edu/kerberos/www/
+IUSE=doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_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
+LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
+RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-1.16.1.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f3fee7458fb4df466362f12de71db4e1
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.23.9 b/metadata/md5-cache/app-crypt/p11-kit-0.23.9
index 2ba6a1a05dff..b8f8b784ffaf 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.23.9
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.23.9
@@ -4,11 +4,11 @@ DESCRIPTION=Provides a standard configuration setup for installing PKCS#11
 EAPI=6
 HOMEPAGE=https://p11-glue.freedesktop.org/p11-kit.html https://github.com/p11-glue/p11-kit
 IUSE=+asn1 debug +libffi +trust abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=asn1? ( >=dev-libs/libtasn1-3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) trust? ( app-misc/ca-certificates )
 REQUIRED_USE=trust? ( asn1 )
 SLOT=0
 SRC_URI=https://github.com/p11-glue/p11-kit/releases/download/0.23.9/p11-kit-0.23.9.tar.gz
 _eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=48198958a4614febe3c678b58366b63d
+_md5_=2261570b5be941414e1e19ca794c7120
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 04a7d3bb7a83..311cc4c2bbf1 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/myspell-es-2.3 b/metadata/md5-cache/app-dicts/myspell-es-2.3
new file mode 100644
index 000000000000..f0568a3bc919
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/myspell-es-2.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Spanish dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://github.com/sbosio/rla-es
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3 LGPL-3 MPL-1.1
+SLOT=0
+SRC_URI=https://github.com/sbosio/rla-es/releases/download/v2.3/es_ANY.oxt -> es_ANY-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_AR.oxt -> es_AR-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_BO.oxt -> es_BO-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CL.oxt -> es_CL-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CO.oxt -> es_CO-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CR.oxt -> es_CR-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CU.oxt -> es_CU-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_DO.oxt -> es_DO-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_EC.oxt -> es_EC-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_ES.oxt -> es_ES-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_GT.oxt -> es_GT-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_HN.oxt -> es_HN-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_MX.oxt -> es_MX-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_NI.oxt -> es_NI-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PA.oxt -> es_PA-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PE.oxt -> es_PE-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PH.oxt -> es_PH-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PR.oxt -> es_PR-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PY.oxt -> es_PY-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_SV.oxt -> es_SV-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_US.oxt -> es_US-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_UY.oxt -> es_UY-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_VE.oxt -> es_VE-2.3.oxt
+_eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
+_md5_=d7786565e0c324e6c3777bfa5ab34a40
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index dc2d08af738d..7207582a1dcf 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/gnuplot-mode-0.7.0 b/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
index 458124e63683..0b8ecc9c803b 100644
--- a/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
+++ b/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=Gnuplot mode for Emacs
 EAPI=5
 HOMEPAGE=http://xafs.org/BruceRavel/GnuplotMode
 IUSE=doc
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=sci-visualization/gnuplot[-emacs(-)] >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/bruceravel/gnuplot-mode/archive/0.7.0.tar.gz -> gnuplot-mode-0.7.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	71fc1fea53f2bcc9e39073663574ce4a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9ea75c106660ee83f8d3bcc57f050cb4
+_md5_=2190ff50741af619a6fb4892a293dd93
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 5b2939c13904..95f1e9bc8950 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
deleted file mode 100644
index b937fe9ed82c..000000000000
--- a/metadata/md5-cache/app-emulation/free42-2.0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-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	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8c41e746ec847fb6c3a0d1af7218c514
diff --git a/metadata/md5-cache/app-emulation/libdsk-1.5.8 b/metadata/md5-cache/app-emulation/libdsk-1.5.8
index 9d5937f54f56..ad66ab511fd7 100644
--- a/metadata/md5-cache/app-emulation/libdsk-1.5.8
+++ b/metadata/md5-cache/app-emulation/libdsk-1.5.8
@@ -3,8 +3,8 @@ DESCRIPTION=LIBDSK is a library for accessing discs and disc image files
 EAPI=6
 HOMEPAGE=http://www.seasip.info/Unix/LibDsk/
 IUSE=doc
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.seasip.info/Unix/LibDsk/libdsk-1.5.8.tar.gz
-_md5_=41b1345f2c5bff05055218fd67e2a9c7
+_md5_=3b8136743e1ed01804fed219771ef5ff
diff --git a/metadata/md5-cache/app-emulation/nemu-1.4.1 b/metadata/md5-cache/app-emulation/nemu-1.4.1
new file mode 100644
index 000000000000..510cbdfb37c9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/nemu-1.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=virtual/udev:= dev-db/sqlite:3= virtual/libusb:1 app-emulation/qemu[vnc,virtfs] sys-libs/ncurses:0=[unicode] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=ncurses interface for QEMU
+EAPI=6
+HOMEPAGE=https://lib.void.so/nemu
+IUSE=+vnc-client +ovf savevm debug
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=virtual/udev:= dev-db/sqlite:3= virtual/libusb:1 app-emulation/qemu[vnc,virtfs] sys-libs/ncurses:0=[unicode] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc )
+SLOT=0
+SRC_URI=http://lib.void.so/src/nemu-1.4.1.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8423b5719b919d52c9dc73614a095667
diff --git a/metadata/md5-cache/app-emulation/qemu-2.11.1-r2 b/metadata/md5-cache/app-emulation/qemu-2.11.1-r2
index d31ecbcc64b4..d42be30cd4e2 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.11.1-r2
+++ b/metadata/md5-cache/app-emulation/qemu-2.11.1-r2
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.11.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.11.1-patches-r1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e27eb18af8c87347174df1727f0ea84e
diff --git a/metadata/md5-cache/app-emulation/qemu-2.11.1-r53 b/metadata/md5-cache/app-emulation/qemu-2.11.1-r53
index 643c7b9b5409..2aadaea8d40d 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.11.1-r53
+++ b/metadata/md5-cache/app-emulation/qemu-2.11.1-r53
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.11.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.11.1-patches-r2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=cdfc923025c95ac02570632aef70079c
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index ba052b2b66fa..e23f7c910a8e 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
 REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=28a8aea4cbdb90c619f919fa9655b4aa
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.0.2 b/metadata/md5-cache/app-emulation/vagrant-2.0.2
index 13c4839ba4ab..b7b50bd149d1 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.0.2
+++ b/metadata/md5-cache/app-emulation/vagrant-2.0.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby23] >=dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] <dev-ruby/log4r-1.1.11[ruby_targets_ruby23] >=dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( >=dev-ruby/rake-12.0.0[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A tool for building and distributing development environments
 EAPI=6
-HOMEPAGE=http://vagrantup.com/
+HOMEPAGE=https://vagrantup.com/
 IUSE=+virtualbox test elibc_FreeBSD ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -10,6 +10,6 @@ RDEPEND=app-arch/libarchive net-misc/curl virtualbox? ( || ( app-emulation/virtu
 REQUIRED_USE=|| ( ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/mitchellh/vagrant/archive/v2.0.2.tar.gz -> vagrant-2.0.2.tar.gz
+SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.0.2.tar.gz -> vagrant-2.0.2.tar.gz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7f8e9873e717864cb22b81c5d2c90a35
+_md5_=056d3889b6f7c398a0bcb8a3a0dd77fe
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.0.3 b/metadata/md5-cache/app-emulation/vagrant-2.0.3
index 2deff1ed7864..ca61cc6e84fb 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.0.3
+++ b/metadata/md5-cache/app-emulation/vagrant-2.0.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby23] >=dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] <dev-ruby/log4r-1.1.11[ruby_targets_ruby23] >=dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( >=dev-ruby/rake-12.0.0[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A tool for building and distributing development environments
 EAPI=6
-HOMEPAGE=http://vagrantup.com/
+HOMEPAGE=https://vagrantup.com/
 IUSE=+virtualbox test elibc_FreeBSD ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -10,6 +10,6 @@ RDEPEND=app-arch/libarchive net-misc/curl virtualbox? ( || ( app-emulation/virtu
 REQUIRED_USE=|| ( ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/mitchellh/vagrant/archive/v2.0.3.tar.gz -> vagrant-2.0.3.tar.gz
+SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.0.3.tar.gz -> vagrant-2.0.3.tar.gz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7f8e9873e717864cb22b81c5d2c90a35
+_md5_=056d3889b6f7c398a0bcb8a3a0dd77fe
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.1.1 b/metadata/md5-cache/app-emulation/vagrant-2.1.1
new file mode 100644
index 000000000000..1f9c264d668f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/vagrant-2.1.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby23] >=dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] <dev-ruby/log4r-1.1.11[ruby_targets_ruby23] >=dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby24] >=dev-ruby/listen-3.1.5[ruby_targets_ruby24] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby24] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby24] <dev-ruby/log4r-1.1.11[ruby_targets_ruby24] >=dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby24] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby24] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby24] || ( dev-ruby/rest-client:2[ruby_targets_ruby24] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby24] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby24] <dev-ruby/mime-types-3:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( >=dev-ruby/rake-12.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A tool for building and distributing development environments
+EAPI=6
+HOMEPAGE=https://vagrantup.com/
+IUSE=+virtualbox test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-arch/libarchive net-misc/curl virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby23] >=dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] <dev-ruby/log4r-1.1.11[ruby_targets_ruby23] >=dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby24] >=dev-ruby/listen-3.1.5[ruby_targets_ruby24] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby24] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby24] <dev-ruby/log4r-1.1.11[ruby_targets_ruby24] >=dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby24] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby24] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby24] || ( dev-ruby/rest-client:2[ruby_targets_ruby24] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby24] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby24] <dev-ruby/mime-types-3:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.1.1.tar.gz -> vagrant-2.1.1.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6ef2fda182122675561bef99b3e8db32
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.1.32 b/metadata/md5-cache/app-emulation/virtualbox-5.1.32
deleted file mode 100644
index 74c34b8011f4..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-5.1.32
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.32 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998_pre20131130-r1 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_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(+)] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.32 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.1.32/VirtualBox-5.1.32.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a5cc94222efa33ea136ebb0f2e6762b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.1.34 b/metadata/md5-cache/app-emulation/virtualbox-5.1.34
deleted file mode 100644
index 5eb7e98d7302..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-5.1.34
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.34 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998_pre20131130-r1 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_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(+)] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.34 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.1.34/VirtualBox-5.1.34.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a34325d7a64bc26835a294da3c38923e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.1.36 b/metadata/md5-cache/app-emulation/virtualbox-5.1.36
index 593c25a7097d..5a3ebc51e442 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.1.36
@@ -4,11 +4,11 @@ DESCRIPTION=Family of powerful x86 virtualization products for enterprise and ho
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.36 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.36/VirtualBox-5.1.36.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c0a70bde5f03cdf4ab6e595ba2ce2b94
+_md5_=4d4fb10fdbf99459294288371aa2bd70
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.1.38 b/metadata/md5-cache/app-emulation/virtualbox-5.1.38
new file mode 100644
index 000000000000..f05af446eb1d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.1.38
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.38 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998_pre20131130-r1 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_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(+)] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.38 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.1.38/VirtualBox-5.1.38.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7f4fab33c056f1b96f9276d75cdbf01c
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.12 b/metadata/md5-cache/app-emulation/virtualbox-5.2.12
new file mode 100644
index 000000000000..5149ba5fec81
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.12 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_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(+)] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.12 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.12/VirtualBox-5.2.12.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.0-patches-01.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=677c9c89c2db6dd63b1c99d1cdfd47d2
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.8 b/metadata/md5-cache/app-emulation/virtualbox-5.2.8
deleted file mode 100644
index 4b0eb9ae7a35..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.8 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_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(+)] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.8 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.2.8/VirtualBox-5.2.8.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.0-patches-01.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=78fbbe9069da0129a229d0487bb0570e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.32 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.32
deleted file mode 100644
index 8c0daf997134..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.32
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.1.32/VBoxGuestAdditions_5.1.32.iso
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=22c051e04d61f4ef11068257ba6096a1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.34 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.34
deleted file mode 100644
index b778673a0759..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.34
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.1.34/VBoxGuestAdditions_5.1.34.iso
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=378cc9e89df1e573943eb52f7caab439
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.36-r1 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.36-r1
index 07ffabf0855f..a232555af4da 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.36-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.36-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=CD image containing guest additions for VirtualBox
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.36/VBoxGuestAdditions_5.1.36.iso
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=55d1f906dffbd1a7cda66c985f25ecad
+_md5_=22c051e04d61f4ef11068257ba6096a1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.38 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.38
new file mode 100644
index 000000000000..f5daf886633a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.38
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.1.38/VBoxGuestAdditions_5.1.38.iso
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=378cc9e89df1e573943eb52f7caab439
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.12 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.12
new file mode 100644
index 000000000000..758e89a3a5a9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.12/VBoxGuestAdditions_5.2.12.iso
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=378cc9e89df1e573943eb52f7caab439
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.8 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.8
deleted file mode 100644
index b80b962e54c6..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.2.8/VBoxGuestAdditions_5.2.8.iso
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=378cc9e89df1e573943eb52f7caab439
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.32.120294 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.32.120294
deleted file mode 100644
index 183259d8cdee..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.32.120294
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-arch/unzip python_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(-)] >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=5
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.1.32 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_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 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.1.32/VirtualBox-5.1.32-120294-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.1.32/VirtualBox-5.1.32-120294-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.1.32/Oracle_VM_VirtualBox_Extension_Pack-5.1.32-120294.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.32-120294.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.1.32/VirtualBoxSDK-5.1.32-120294.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9a942423a24a9fd415df35c2da4a5530
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.34.121010 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.34.121010
deleted file mode 100644
index 735f372d30b0..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.34.121010
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-arch/unzip python_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(-)] >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=5
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.1.34 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_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 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.1.34/VirtualBox-5.1.34-121010-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.1.34/VirtualBox-5.1.34-121010-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.1.34/Oracle_VM_VirtualBox_Extension_Pack-5.1.34-121010.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.34-121010.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.1.34/VirtualBoxSDK-5.1.34-121010.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2f1bed5253a66641a958359159d6f9e2
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.36.122089 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.36.122089
index d404595c0a57..4deac251e516 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.36.122089
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.36.122089
@@ -4,7 +4,7 @@ DESCRIPTION=Family of powerful x86 virtualization products for enterprise and ho
 EAPI=5
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 PUEL
 RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.1.36 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_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 )
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.1.36/VirtualBox-5.1.36-122089-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.1.36/VirtualBox-5.1.36-122089-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.1.36/Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.1.36/VirtualBoxSDK-5.1.36-122089.zip )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=03090ef2ad134c7d8d716ac8dd47a70a
+_md5_=cd2c915f805e4f7998048f0d6fe7c488
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.38.122592 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.38.122592
new file mode 100644
index 000000000000..da5265649069
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.38.122592
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-arch/unzip python_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(-)] >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=5
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 PUEL
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.1.38 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_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 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.1.38/VirtualBox-5.1.38-122592-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.1.38/VirtualBox-5.1.38-122592-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.1.38/Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.1.38/VirtualBoxSDK-5.1.38-122592.zip )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6040cbe2623647c024ca24a36c9701dc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.12.122591 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.12.122591
new file mode 100644
index 000000000000..f47e437c66c2
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.12.122591
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-arch/unzip python_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(-)] >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=5
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 PUEL
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.2.12 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_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 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.12/VirtualBox-5.2.12-122591-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.12/VirtualBox-5.2.12-122591-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.12/Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.12/VirtualBoxSDK-5.2.12-122591.zip )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6040cbe2623647c024ca24a36c9701dc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.8.121009 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.8.121009
deleted file mode 100644
index c346e882d5f0..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.8.121009
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-arch/unzip python_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(-)] >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=5
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.2.8 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_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 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.8/VirtualBox-5.2.8-121009-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.8/VirtualBox-5.2.8-121009-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.8/Oracle_VM_VirtualBox_Extension_Pack-5.2.8-121009.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.8-121009.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.8/VirtualBoxSDK-5.2.8-121009.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2f1bed5253a66641a958359159d6f9e2
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.32.120294 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.32.120294
deleted file mode 100644
index 90382df27830..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.32.120294
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64 x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-5.1.32
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.1.32/Oracle_VM_VirtualBox_Extension_Pack-5.1.32-120294.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.32-120294.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=56ac2b741b877335842940f5d0b0f2cc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.34.121010 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.34.121010
deleted file mode 100644
index adf7237c33d1..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.34.121010
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-5.1.34
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.1.34/Oracle_VM_VirtualBox_Extension_Pack-5.1.34-121010.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.34-121010.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=53ce8063968f6913ed36edc5034ac601
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.36.122089 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.36.122089
index 8ee4e115407a..c8b28153cc0e 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.36.122089
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.36.122089
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DESCRIPTION=PUEL extensions for VirtualBox
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=PUEL
 RDEPEND=~app-emulation/virtualbox-5.1.36
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.36/Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7f16ccef5b4a15c8674fc1a690f9a72f
+_md5_=56ac2b741b877335842940f5d0b0f2cc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.38.122592 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.38.122592
new file mode 100644
index 000000000000..bb7a754b7784
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.38.122592
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=PUEL
+RDEPEND=~app-emulation/virtualbox-5.1.38
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.1.38/Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=53ce8063968f6913ed36edc5034ac601
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.12.122591 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.12.122591
new file mode 100644
index 000000000000..ca0f7d52920c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.12.122591
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=PUEL
+RDEPEND=~app-emulation/virtualbox-5.2.12
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.12/Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=53ce8063968f6913ed36edc5034ac601
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.8.121009 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.8.121009
deleted file mode 100644
index a31731d9603e..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.8.121009
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-5.2.8
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.2.8/Oracle_VM_VirtualBox_Extension_Pack-5.2.8-121009.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.8-121009.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=53ce8063968f6913ed36edc5034ac601
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.32 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.32
deleted file mode 100644
index 1a27ca150728..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.32
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=X kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.1.32 )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.1.32/VirtualBox-5.1.32.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=065caf200910a92fcdf4fc774f3a67ed
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.34 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.34
deleted file mode 100644
index 7ad7c485a7f4..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.34
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=X kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.1.34 )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.1.34/VirtualBox-5.1.34.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1798e3815715f86de668caf1b34e68c4
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36
index 42f91c5dc4b2..5a094c009d2f 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36
@@ -4,11 +4,11 @@ DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=X kernel_linux
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.1.36 )
 RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.36/VirtualBox-5.1.36.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=176cc2db6d6fe728a0b6e1db1a6b46b2
+_md5_=065caf200910a92fcdf4fc774f3a67ed
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.38 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.38
new file mode 100644
index 000000000000..8b7405c16204
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.38
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=X kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.1.38 )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.1.38/VirtualBox-5.1.38.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1798e3815715f86de668caf1b34e68c4
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.12 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.12
new file mode 100644
index 000000000000..45e2c4599bc1
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=X kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.12/VirtualBox-5.2.12.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=eba0892a4e461a1cefc70d496c4b7adc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.8 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.8
deleted file mode 100644
index c923a6365b47..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=X kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.2.8/VirtualBox-5.2.8.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=eba0892a4e461a1cefc70d496c4b7adc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.32 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.32
deleted file mode 100644
index 24b68de63c8b..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.32
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=pax_kernel kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.1.32.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e84caa6d3b23c86dc9494b1b5dcbde68
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.34 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.34
deleted file mode 100644
index 651b235c27b4..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.34
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=pax_kernel kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.1.34.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d2ff1ec69aa7cf936dd117d626faed0b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.36 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.36
index 1137cc81250c..74f424fc9d3e 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.36
@@ -4,10 +4,10 @@ DESCRIPTION=Kernel Modules for Virtualbox
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=pax_kernel kernel_linux
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.1.36.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=16acb1d7f2e41cb9213d35bf1531f784
+_md5_=092ed3811d7173296ffd18fe11072256
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.38 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.38
new file mode 100644
index 000000000000..055fb44e803a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.38
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=pax_kernel kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.1.38.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ab5f806e303c5e41086eded326594630
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.10 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.10
index c55fba639262..bc3a3c7c4fd5 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.10
@@ -10,4 +10,4 @@ RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.2.10.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=04256aeb30e5abdf4a1e966fe45edab9
+_md5_=957f9194e88099ba8c30324c39cdb075
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.12 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.12
new file mode 100644
index 000000000000..eba9e4981632
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=pax_kernel kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.2.12.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=957f9194e88099ba8c30324c39cdb075
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.8 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.8
deleted file mode 100644
index d7cb17011768..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=pax_kernel kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.2.8.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=04256aeb30e5abdf4a1e966fe45edab9
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 1b5050ba1d64..a67c3bb40f4a 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-repository-2 b/metadata/md5-cache/app-eselect/eselect-repository-2
deleted file mode 100644
index 8e1649ab9158..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-repository-2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup
-DESCRIPTION=Manage repos.conf via eselect
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/eselect-repository
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 arm x86
-LICENSE=BSD-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-admin/eselect dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-misc/wget
-SLOT=0
-SRC_URI=https://github.com/mgorny/eselect-repository/archive/v2.tar.gz -> eselect-repository-2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=a63af21529e06f7fa7ed2ee051cc9fd3
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-3 b/metadata/md5-cache/app-eselect/eselect-repository-3
index 9e61233bd8b1..1d1fc1250a0e 100644
--- a/metadata/md5-cache/app-eselect/eselect-repository-3
+++ b/metadata/md5-cache/app-eselect/eselect-repository-3
@@ -6,7 +6,8 @@ IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 arm x86
 LICENSE=BSD-2
 RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-admin/eselect dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-misc/wget
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/eselect-repository/archive/v3.tar.gz -> eselect-repository-3.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=a63af21529e06f7fa7ed2ee051cc9fd3
+_md5_=e57a0e82818a750bc55465b332f7d49d
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-9999 b/metadata/md5-cache/app-eselect/eselect-repository-9999
index ba1154227ca2..cb4fffe2f36e 100644
--- a/metadata/md5-cache/app-eselect/eselect-repository-9999
+++ b/metadata/md5-cache/app-eselect/eselect-repository-9999
@@ -6,6 +6,7 @@ HOMEPAGE=https://github.com/mgorny/eselect-repository
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=BSD-2
 RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-admin/eselect dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-misc/wget
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=6151c6894c688ceda54ca40039e49f03
+_md5_=e600adcac646199c8f20a523e6f2e3ef
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index c52dc23c58c8..a72622a9d66c 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/fbterm-1.7-r4 b/metadata/md5-cache/app-i18n/fbterm-1.7-r4
index 0c95e6ea72ec..c8a17c99db15 100644
--- a/metadata/md5-cache/app-i18n/fbterm-1.7-r4
+++ b/metadata/md5-cache/app-i18n/fbterm-1.7-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig media-libs/freetype:2 gpm? ( sys-libs/gpm ) video_cards_vesa? ( dev-libs/libx86 ) !>=sys-libs/ncurses-6.1
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	fcaps	29a56915716950cd3d23630cede80d68	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=247459bce431d78b30f78de634fcf1de
diff --git a/metadata/md5-cache/app-i18n/fbterm-1.7-r5 b/metadata/md5-cache/app-i18n/fbterm-1.7-r5
index 1ce90385f22b..adb7000bc0a8 100644
--- a/metadata/md5-cache/app-i18n/fbterm-1.7-r5
+++ b/metadata/md5-cache/app-i18n/fbterm-1.7-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig media-libs/freetype:2 gpm? ( sys-libs/gpm ) video_cards_vesa? ( dev-libs/libx86 ) >=sys-libs/ncurses-6.1
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	fcaps	29a56915716950cd3d23630cede80d68	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=6554d367e3567f37383247d22ea9b2e4
diff --git a/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20130108-r2 b/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20130108-r2
index f621e431be79..4381111a1b64 100644
--- a/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20130108-r2
+++ b/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20130108-r2
@@ -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=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=afc67e92babde17612bb58c198760e56
diff --git a/metadata/md5-cache/app-i18n/man-pages-pl-0.7 b/metadata/md5-cache/app-i18n/man-pages-pl-0.7
new file mode 100644
index 000000000000..cd07c820df47
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/man-pages-pl-0.7
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=A collection of Polish translations of Linux manual pages
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/manpages-pl/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/manpages-pl/manpages-pl-0.7.tar.bz2
+_md5_=5fae68eaff82a62669e2f43b3648ea6e
diff --git a/metadata/md5-cache/app-i18n/scim-sunpinyin-2.0.3-r2 b/metadata/md5-cache/app-i18n/scim-sunpinyin-2.0.3-r2
index 3af825168b16..4782fc589ed6 100644
--- a/metadata/md5-cache/app-i18n/scim-sunpinyin-2.0.3-r2
+++ b/metadata/md5-cache/app-i18n/scim-sunpinyin-2.0.3-r2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=app-i18n/scim ~app-i18n/sunpinyin-2.0.3 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://sunpinyin.googlecode.com/files/scim-sunpinyin-2.0.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e945298f55a362947ecc1e049078457d
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-2.0.3-r2 b/metadata/md5-cache/app-i18n/sunpinyin-2.0.3-r2
index c00da013aa8f..2d56d7a9ab91 100644
--- a/metadata/md5-cache/app-i18n/sunpinyin-2.0.3-r2
+++ b/metadata/md5-cache/app-i18n/sunpinyin-2.0.3-r2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=dev-db/sqlite:3
 SLOT=0
 SRC_URI=https://sunpinyin.googlecode.com/files/sunpinyin-2.0.3.tar.gz https://open-gram.googlecode.com/files/dict.utf8.tar.bz2 https://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=2bc2feae2591f1a3d75b15a6557db977
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1 b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1
index a67d7b7e76b4..8d98e36192b5 100644
--- a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1
+++ b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1
@@ -9,5 +9,5 @@ PDEPEND=app-i18n/sunpinyin-data
 RDEPEND=dev-db/sqlite:3
 SLOT=0/3
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a7c3d933ec98bb16ed0f40a6ef77efa4
diff --git a/metadata/md5-cache/app-i18n/xsunpinyin-2.0.3-r3 b/metadata/md5-cache/app-i18n/xsunpinyin-2.0.3-r3
index 352cc05038d7..1681b2b9d51e 100644
--- a/metadata/md5-cache/app-i18n/xsunpinyin-2.0.3-r3
+++ b/metadata/md5-cache/app-i18n/xsunpinyin-2.0.3-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=~app-i18n/sunpinyin-2.0.3 x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://sunpinyin.googlecode.com/files/xsunpinyin-2.0.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=58a5ea7d5d7b1f420d560f4575c29ff4
diff --git a/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20130108 b/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20130108
index 37800fa1d272..e1a40ae65960 100644
--- a/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20130108
+++ b/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20130108
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=~app-i18n/sunpinyin-2.0.4_pre20130108:= x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ca7494a4ada0b6aeee83a522db218471
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 1a0acc046d72..702a1bf45a20 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0 b/metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0
index 968a813dde10..f6ef1685bb44 100644
--- a/metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0
+++ b/metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/blackbox_exporter/archive/v0.12.0.tar.gz -> blackbox_exporter-0.12.0.tar.gz
-_eclasses_=fcaps	29a56915716950cd3d23630cede80d68	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=ed749681acece233372e6f715a161b89
diff --git a/metadata/md5-cache/app-metrics/collectd-5.7.2-r3 b/metadata/md5-cache/app-metrics/collectd-5.7.2-r3
index d7b2c8c98768..2d68ef9dcdae 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.7.2-r3
+++ b/metadata/md5-cache/app-metrics/collectd-5.7.2-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithread
 REQUIRED_USE=collectd_plugins_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 ) ) collectd_plugins_smart? ( udev )
 SLOT=0
 SRC_URI=https://collectd.org/files/collectd-5.7.2.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=4f05cad3d00d4244ff56733c96645833
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index d9287ca35583..58e99aa744e8 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/dtach-0.9 b/metadata/md5-cache/app-misc/dtach-0.9
index 0a28a76481d5..0429583a4f14 100644
--- a/metadata/md5-cache/app-misc/dtach-0.9
+++ b/metadata/md5-cache/app-misc/dtach-0.9
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Emulates the detach feature of screen
 EAPI=6
 HOMEPAGE=http://dtach.sourceforge.net/ https://github.com/crigler/dtach
-KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/dtach/dtach-0.9.tar.gz
-_md5_=58ed2b13791d24f5d3ae52735642b5c8
+_md5_=23188ef49a29fbb5254851fb46a801e9
diff --git a/metadata/md5-cache/app-misc/mvcase-0.1-r2 b/metadata/md5-cache/app-misc/mvcase-0.1-r2
index 047180a71b94..987c9ab9bc41 100644
--- a/metadata/md5-cache/app-misc/mvcase-0.1-r2
+++ b/metadata/md5-cache/app-misc/mvcase-0.1-r2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/shhopt
 DESCRIPTION=A modified version of mv, used to convert filenames to lower/upper case
 EAPI=6
 HOMEPAGE=http://www.ibiblio.org/pub/Linux/utils/file
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/shhopt
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/utils/file/mvcase-0.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=37ccaecab8373596586063bada2ccadd
+_md5_=b59114958d95b84ec929e437953d1bb8
diff --git a/metadata/md5-cache/app-misc/neofetch-3.1.0 b/metadata/md5-cache/app-misc/neofetch-3.1.0
deleted file mode 100644
index f5d812e86d49..000000000000
--- a/metadata/md5-cache/app-misc/neofetch-3.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Simple information system script
-EAPI=6
-HOMEPAGE=https://github.com/dylanaraps/neofetch
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT-with-advertising
-RDEPEND=sys-apps/pciutils X? ( x11-apps/xprop x11-apps/xwininfo x11-apps/xrandr www-client/w3m[imlib] media-libs/imlib2 media-gfx/imagemagick )
-SLOT=0
-SRC_URI=https://github.com/dylanaraps/neofetch/archive/3.1.0/neofetch-3.1.0.tar.gz
-_md5_=b834e7c394326c1347616625d1690fac
diff --git a/metadata/md5-cache/app-misc/neofetch-3.2.0 b/metadata/md5-cache/app-misc/neofetch-3.2.0
deleted file mode 100644
index 65113cfc1cdd..000000000000
--- a/metadata/md5-cache/app-misc/neofetch-3.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Simple information system script
-EAPI=6
-HOMEPAGE=https://github.com/dylanaraps/neofetch
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT-with-advertising
-RDEPEND=sys-apps/pciutils X? ( x11-apps/xprop x11-apps/xwininfo x11-apps/xrandr www-client/w3m[imlib] media-libs/imlib2 media-gfx/imagemagick )
-SLOT=0
-SRC_URI=https://github.com/dylanaraps/neofetch/archive/3.2.0/neofetch-3.2.0.tar.gz
-_md5_=b834e7c394326c1347616625d1690fac
diff --git a/metadata/md5-cache/app-misc/neofetch-3.4.0 b/metadata/md5-cache/app-misc/neofetch-3.4.0
index 2341f9cafe17..9e63629ba78c 100644
--- a/metadata/md5-cache/app-misc/neofetch-3.4.0
+++ b/metadata/md5-cache/app-misc/neofetch-3.4.0
@@ -5,7 +5,7 @@ HOMEPAGE=https://github.com/dylanaraps/neofetch
 IUSE=X
 KEYWORDS=~amd64 ~x86 ~amd64-fbsd
 LICENSE=MIT-with-advertising
-RDEPEND=sys-apps/pciutils X? ( x11-apps/xprop x11-apps/xwininfo x11-apps/xrandr www-client/w3m[imlib] media-libs/imlib2 media-gfx/imagemagick )
+RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
 SLOT=0
 SRC_URI=https://github.com/dylanaraps/neofetch/archive/3.4.0/neofetch-3.4.0.tar.gz
-_md5_=2e1951ef8888fccc4e70173d4446c6d0
+_md5_=5157a44e41ea0925ad86152400af6c20
diff --git a/metadata/md5-cache/app-misc/neofetch-9999 b/metadata/md5-cache/app-misc/neofetch-9999
index 0cdbbb9eeb87..4de31b59a60c 100644
--- a/metadata/md5-cache/app-misc/neofetch-9999
+++ b/metadata/md5-cache/app-misc/neofetch-9999
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://github.com/dylanaraps/neofetch
 IUSE=X
 LICENSE=MIT-with-advertising
-RDEPEND=sys-apps/pciutils X? ( x11-apps/xprop x11-apps/xwininfo x11-apps/xrandr www-client/w3m[imlib] media-libs/imlib2 media-gfx/imagemagick )
+RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8
-_md5_=f48804f79c19de305678ea4ff1fb6cf0
+_md5_=9870fce2b9552f97a1d4d9b47d4e4fb3
diff --git a/metadata/md5-cache/app-misc/nnn-1.8 b/metadata/md5-cache/app-misc/nnn-1.8
new file mode 100644
index 000000000000..2c8e015eb04f
--- /dev/null
+++ b/metadata/md5-cache/app-misc/nnn-1.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
+DESCRIPTION=The missing terminal file browser for X
+EAPI=6
+HOMEPAGE=https://github.com/jarun/nnn
+IUSE=bash-completion fish-completion zsh-completion
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= fish-completion? ( app-shells/fish ) zsh-completion? ( app-shells/zsh )
+SLOT=0
+SRC_URI=https://github.com/jarun/nnn/archive/v1.8.tar.gz -> nnn-1.8.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=660a26bbd369ef9f621d69ade6af53b9
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.3-r1 b/metadata/md5-cache/app-misc/pax-utils-1.2.3-r1
index 97b996cdea78..9d75e99241b9 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.3-r1
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.2.3.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=69ca78bcbf56fe33d05c1079aa6a415c
+_md5_=aa49a3c5daed395637f1509478e4ea12
diff --git a/metadata/md5-cache/app-misc/screen-9999 b/metadata/md5-cache/app-misc/screen-9999
index 07192cb57e73..34e6c3c0de0e 100644
--- a/metadata/md5-cache/app-misc/screen-9999
+++ b/metadata/md5-cache/app-misc/screen-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/sel
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d4951401b9cd6bfe3ef6ec78019ed208
+_md5_=77057cf1353386ad4006f72343d4a532
diff --git a/metadata/md5-cache/app-misc/vcp-2.2-r1 b/metadata/md5-cache/app-misc/vcp-2.2-r1
deleted file mode 100644
index 985c47f47cf9..000000000000
--- a/metadata/md5-cache/app-misc/vcp-2.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses
-DESCRIPTION=copy files/directories in a curses interface
-EAPI=2
-HOMEPAGE=http://members.iinet.net.au/~lynx/vcp/
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=BSD
-RDEPEND=sys-libs/ncurses
-SLOT=0
-SRC_URI=http://members.iinet.net.au/~lynx/vcp/vcp-2.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=607e532fa69a0011885638567e58fd80
diff --git a/metadata/md5-cache/app-misc/vcp-2.2-r2 b/metadata/md5-cache/app-misc/vcp-2.2-r2
index d15a49974d14..1fc1c002e0a0 100644
--- a/metadata/md5-cache/app-misc/vcp-2.2-r2
+++ b/metadata/md5-cache/app-misc/vcp-2.2-r2
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Copy files/directories in a curses interface
 EAPI=6
 HOMEPAGE=http://members.iinet.net.au/~lynx/vcp/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~sparc x86
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://members.iinet.net.au/~lynx/vcp/vcp-2.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=63ead9ecf6dde0f51baa47422e45d603
+_md5_=50e60fff09504a600513aafd573b4f48
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index e4d8c693819e..c111d68f7253 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/kexi-3.0.2 b/metadata/md5-cache/app-office/kexi-3.0.2
deleted file mode 100644
index 7b0151d6fd47..000000000000
--- a/metadata/md5-cache/app-office/kexi-3.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.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 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Visual database applications creator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kexi/ http://www.kexi-project.org/
-IUSE=marble mdb mysql postgres sqlite webkit debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.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.43.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.43.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	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98421e59861e535bf7f403e246d76a4e
diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.1-r2 b/metadata/md5-cache/app-office/kmymoney-5.0.1-r2
index 3dd20655c3b1..305c7dc19b56 100644
--- a/metadata/md5-cache/app-office/kmymoney-5.0.1-r2
+++ b/metadata/md5-cache/app-office/kmymoney-5.0.1-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=weboob? ( python_targets_python2_7 )
 SLOT=5
 SRC_URI=mirror://kde/stable/kmymoney/5.0.1/src/kmymoney-5.0.1.tar.xz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ff23216bba5324ba17f432c1551400e4
+_md5_=9cdf06ea896ec55483f15c445cdcfc47
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.4.2 b/metadata/md5-cache/app-office/libreoffice-6.0.4.2
new file mode 100644
index 000000000000..cfe4da875218
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.4.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite
+EAPI=6
+HOMEPAGE=https://www.libreoffice.org
+IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-6.0*
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+SLOT=0
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.3.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.4//libreoffice-6.0.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.4//libreoffice-help-6.0.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.4.2/src/libreoffice-6.0.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.4.2/src/libreoffice-help-6.0.4.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5c7312c1a5c51ef17c5126803d57c27a
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.0.4.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.0.4.2
new file mode 100644
index 000000000000..ad9cf4a15ac4
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.0.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Translations for the Libreoffice suite
+EAPI=6
+HOMEPAGE=https://www.libreoffice.org
+IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+RDEPEND=app-text/hunspell
+RESTRICT=strip
+SLOT=0
+SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86/LibreOffice_6.0.4_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.4/rpm/x86/LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_zu.tar.gz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0d724f652b383a9e5ea19e984af7be96
diff --git a/metadata/md5-cache/app-office/scribus-9999 b/metadata/md5-cache/app-office/scribus-9999
index d2ee1d300d62..535ecb1a7d0e 100644
--- a/metadata/md5-cache/app-office/scribus-9999
+++ b/metadata/md5-cache/app-office/scribus-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-
 REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
 SLOT=0
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d332df84680ab13226f4a165af5bad11
+_md5_=02e8aeb1241a15e757975b7da693f1ff
diff --git a/metadata/md5-cache/app-office/skrooge-2.13.0 b/metadata/md5-cache/app-office/skrooge-2.13.0
new file mode 100644
index 000000000000..708f0355a412
--- /dev/null
+++ b/metadata/md5-cache/app-office/skrooge-2.13.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.43.0:5 ) kde? ( >=kde-frameworks/krunner-5.43.0:5 ) ofx? ( dev-libs/libofx ) >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 dev-libs/libxslt virtual/pkgconfig x11-misc/shared-mime-info designer? ( >=kde-frameworks/kdesignerplugin-5.43.0:5 >=dev-qt/designer-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Personal finances manager, aiming at being simple and intuitive
+EAPI=6
+HOMEPAGE=https://skrooge.org/
+IUSE=activities designer kde ofx test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.43.0:5 ) kde? ( >=kde-frameworks/krunner-5.43.0:5 ) ofx? ( dev-libs/libofx ) !app-office/skrooge:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=test? ( designer )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/skrooge/skrooge-2.13.0.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1f44b7ab8bd304a9ae314727aa9ba91c
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 72b78a386790..7e2af41aa423 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/elogviewer-0.6.2-r3 b/metadata/md5-cache/app-portage/elogviewer-0.6.2-r3
deleted file mode 100644
index d5ee2e5b00d8..000000000000
--- a/metadata/md5-cache/app-portage/elogviewer-0.6.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=GTK+ based utility to parse the contents of elogs created by Portage
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/elogviewer/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/portage-2.1 >=dev-python/pygtk-2.0
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/elogviewer/elogviewer-0.6.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3abf5875fd3a3d1f2dbd51c41281961
diff --git a/metadata/md5-cache/app-portage/elogviewer-2.1-r1 b/metadata/md5-cache/app-portage/elogviewer-2.1-r1
deleted file mode 100644
index 6ee77b431d13..000000000000
--- a/metadata/md5-cache/app-portage/elogviewer-2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare 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_python2_7(-)] || ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),X] dev-python/pyside[python_targets_python2_7(-)?,-python_single_target_python2_7(-),X] ) >=sys-apps/portage-2.1 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=Elog viewer for Gentoo
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/elogviewer
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),X] dev-python/pyside[python_targets_python2_7(-)?,-python_single_target_python2_7(-),X] ) >=sys-apps/portage-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_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/elogviewer/elogviewer-2.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91e7c4626bbdeed2ddc8df3bc1c0d019
diff --git a/metadata/md5-cache/app-portage/elogviewer-2.1-r2 b/metadata/md5-cache/app-portage/elogviewer-2.1-r2
deleted file mode 100644
index 5c0e233fb980..000000000000
--- a/metadata/md5-cache/app-portage/elogviewer-2.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] || ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),X] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),X] ) >=sys-apps/portage-2.1 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Elog viewer for Gentoo
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/elogviewer
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ppc ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] || ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),X] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),X] ) >=sys-apps/portage-2.1 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 ) || ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://sourceforge/elogviewer/elogviewer-2.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bef992067f3b853855ffd55c3ac1b1ce
diff --git a/metadata/md5-cache/app-portage/elogviewer-2.6 b/metadata/md5-cache/app-portage/elogviewer-2.6
deleted file mode 100644
index 84159d05262b..000000000000
--- a/metadata/md5-cache/app-portage/elogviewer-2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] || ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),X] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),X] ) >=sys-apps/portage-2.1 python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Elog viewer for Gentoo
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/elogviewer
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ppc ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] || ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),X] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),X] ) >=sys-apps/portage-2.1 python_targets_python2_7? ( dev-python/enum34[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 ) >=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 ) || ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://sourceforge/elogviewer/elogviewer-2.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4cfe8fe54674cd66b4f570b9f12551f9
diff --git a/metadata/md5-cache/app-portage/elogviewer-2.6-r1 b/metadata/md5-cache/app-portage/elogviewer-2.6-r1
deleted file mode 100644
index bba2490af42b..000000000000
--- a/metadata/md5-cache/app-portage/elogviewer-2.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] || ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),X] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),X] ) >=sys-apps/portage-2.1 python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/PyQt5[-gui] !dev-python/PyQt5[-widgets] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Elog viewer for Gentoo
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/elogviewer
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ppc ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] || ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),X] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),X] ) >=sys-apps/portage-2.1 python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/PyQt5[-gui] !dev-python/PyQt5[-widgets] 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 ) || ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://sourceforge/elogviewer/elogviewer-2.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0caf07c5f9f93680db72ca1760962af3
diff --git a/metadata/md5-cache/app-portage/elogviewer-2.6-r2 b/metadata/md5-cache/app-portage/elogviewer-2.6-r2
deleted file mode 100644
index 2577218a17f9..000000000000
--- a/metadata/md5-cache/app-portage/elogviewer-2.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] || ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,X] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,X] ) >=sys-apps/portage-2.1 python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) !dev-python/PyQt5[-gui] !dev-python/PyQt5[-widgets] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?]
-DESCRIPTION=Elog viewer for Gentoo
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/elogviewer
-IUSE=python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] || ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,X] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,X] ) >=sys-apps/portage-2.1 python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) !dev-python/PyQt5[-gui] !dev-python/PyQt5[-widgets]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://sourceforge/elogviewer/elogviewer-2.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=354cd0c5c058b962ca3baa8fc78a7167
diff --git a/metadata/md5-cache/app-portage/elogviewer-2.7-r2 b/metadata/md5-cache/app-portage/elogviewer-2.7-r2
new file mode 100644
index 000000000000..6f14aaf92e41
--- /dev/null
+++ b/metadata/md5-cache/app-portage/elogviewer-2.7-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=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(+)?] dev-python/PyQt5[gui,widgets,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(+)?] || ( >=sys-apps/portage-2.1[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(+)?] sys-apps/portage-mgorny[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_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) dev-python/setuptools[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(+)?]
+DESCRIPTION=Elog viewer for Gentoo
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/elogviewer
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=amd64 ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/PyQt5[gui,widgets,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(+)?] || ( >=sys-apps/portage-2.1[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(+)?] sys-apps/portage-mgorny[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_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
+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=0
+SRC_URI=https://github.com/Synss/elogviewer/archive/v2.7.tar.gz -> elogviewer-2.7.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ff2603738de51b3930b7e8bd25fa1df7
diff --git a/metadata/md5-cache/app-portage/elogviewer-2.9 b/metadata/md5-cache/app-portage/elogviewer-2.9
new file mode 100644
index 000000000000..9b263962b1e1
--- /dev/null
+++ b/metadata/md5-cache/app-portage/elogviewer-2.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=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(+)?] dev-python/PyQt5[gui,widgets,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(+)?] || ( >=sys-apps/portage-2.1[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(+)?] sys-apps/portage-mgorny[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_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) dev-python/setuptools[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(+)?]
+DESCRIPTION=Elog viewer for Gentoo
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/elogviewer
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/PyQt5[gui,widgets,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(+)?] || ( >=sys-apps/portage-2.1[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(+)?] sys-apps/portage-mgorny[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_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
+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=0
+SRC_URI=https://github.com/Synss/elogviewer/archive/v2.9.tar.gz -> elogviewer-2.9.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=32276f6ee06c41233ab353588a9e29e5
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.3.0 b/metadata/md5-cache/app-portage/gentoopm-0.3.0
new file mode 100644
index 000000000000..c7a8ba48de6a
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gentoopm-0.3.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A common interface to Gentoo package managers
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/gentoopm/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~mips ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=app-eselect/eselect-package-manager
+RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[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(-)] >=sys-apps/portage-2.1.10.3[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(-)] sys-apps/portage-mgorny[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(-)] >=sys-apps/paludis-3.0.0_pre20170219[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/gentoopm/archive/v0.3.0.tar.gz -> gentoopm-0.3.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7de23e312e8d793722434c4906ee5eab
diff --git a/metadata/md5-cache/app-portage/gentoopm-9999 b/metadata/md5-cache/app-portage/gentoopm-9999
index f31b95f48ae9..3f8dda6ba9c7 100644
--- a/metadata/md5-cache/app-portage/gentoopm-9999
+++ b/metadata/md5-cache/app-portage/gentoopm-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=doc? ( dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=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(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A common interface to Gentoo package managers
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/gentoopm/
-IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=BSD-2
 PDEPEND=app-eselect/eselect-package-manager
 RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[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(-)] >=sys-apps/portage-2.1.10.3[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(-)] sys-apps/portage-mgorny[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(-)] >=sys-apps/paludis-3.0.0_pre20170219[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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=doc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_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
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b62a61b521ef0917b291184e33147303
+_md5_=66f8f62ac268b3ba79ad5c54471a650b
diff --git a/metadata/md5-cache/app-portage/unsandbox-2 b/metadata/md5-cache/app-portage/unsandbox-2
deleted file mode 100644
index 0fc13f9ac71d..000000000000
--- a/metadata/md5-cache/app-portage/unsandbox-2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=The Sandbox escapist tool
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/unsandbox
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/mgorny/unsandbox/archive/v2.tar.gz -> unsandbox-2.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=657b01b2c8a8646761d57fac4ea4de32
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 05cb128c751d..7c3013f27d9a 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-completion-2.7-r3 b/metadata/md5-cache/app-shells/bash-completion-2.7-r3
index 500f5a2f754e..526e5135b776 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.7-r3
+++ b/metadata/md5-cache/app-shells/bash-completion-2.7-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Programmable Completion for bash
 EAPI=6
 HOMEPAGE=https://github.com/scop/bash-completion
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 PDEPEND=>=app-shells/gentoo-bashcomp-20140911
 RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/scop/bash-completion/releases/download/2.7/bash-completion-2.7.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f20f4deb217e43d9daa07a0b0c8a77a9
+_md5_=d88b101a900f6d3e2af1457d396f68fd
diff --git a/metadata/md5-cache/app-shells/dash-0.5.10 b/metadata/md5-cache/app-shells/dash-0.5.10
deleted file mode 100644
index 1cb818942c1d..000000000000
--- a/metadata/md5-cache/app-shells/dash-0.5.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( libedit? ( dev-libs/libedit ) ) virtual/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) )
-DESCRIPTION=Debian Almquist Shell
-EAPI=6
-HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
-IUSE=libedit static vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
-SLOT=0
-SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=88b9916156e7ae6d70502e9ad29b9a23
diff --git a/metadata/md5-cache/app-shells/dash-0.5.10-r1 b/metadata/md5-cache/app-shells/dash-0.5.10-r1
new file mode 100644
index 000000000000..9b3ae9d7029e
--- /dev/null
+++ b/metadata/md5-cache/app-shells/dash-0.5.10-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!static? ( libedit? ( dev-libs/libedit ) ) virtual/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) )
+DESCRIPTION=Debian Almquist Shell
+EAPI=6
+HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
+IUSE=libedit static vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
+SLOT=0
+SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.10.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=efd9987bfa194dd6ef5ea62c64cb368c
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index d5a131856b11..71a3a6184428 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/qpdfview-0.4.16 b/metadata/md5-cache/app-text/qpdfview-0.4.16
index 6be2aa3e1e4e..e8996d9fee29 100644
--- a/metadata/md5-cache/app-text/qpdfview-0.4.16
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.16
@@ -4,11 +4,11 @@ DESCRIPTION=A tabbed document viewer
 EAPI=6
 HOMEPAGE=https://launchpad.net/qpdfview
 IUSE=cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 cups? ( net-print/cups ) dbus? ( dev-qt/qtdbus:5 ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) postscript? ( app-text/libspectre ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core )
 REQUIRED_USE=?? ( fitz pdf )
 SLOT=0
 SRC_URI=https://launchpad.net/qpdfview/trunk/0.4.16/+download/qpdfview-0.4.16.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=a2720ea29f80ca98f48ac119162a630e
+_md5_=fa78ec2ada0d50b996b4696bc47b4560
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r3 b/metadata/md5-cache/app-text/texlive-core-2017-r3
index 1d73be25de7b..cbc12d0c544f 100644
--- a/metadata/md5-cache/app-text/texlive-core-2017-r3
+++ b/metadata/md5-cache/app-text/texlive-core-2017-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.58.0:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) virtual/pkgconfig sys-apps/ed sys-devel/flex app-arch/xz-utils >=app-portage/elt-patches-20170422
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.58.0:= <app-text/poppler-0.64.0 >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) <media-libs/freetype-2.9.1 virtual/pkgconfig sys-apps/ed sys-devel/flex app-arch/xz-utils >=app-portage/elt-patches-20170422
 DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=http://tug.org/texlive/
 IUSE=cjk X doc source tk +luajittex xetex
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3c TeX
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.58.0:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.58.0:= <app-text/poppler-0.64.0 >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/texlive-core-patches-70.tar.xz mirror://gentoo/texlive-module-tetex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-base-2017.tar.xz mirror://gentoo/texlive-module-texconfig-2017.tar.xz mirror://gentoo/texlive-module-gsftopk-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra-2017.tar.xz mirror://gentoo/texlive-module-a2ping-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2017.tar.xz mirror://gentoo/texlive-module-arara-2017.tar.xz mirror://gentoo/texlive-module-asymptote-2017.tar.xz mirror://gentoo/texlive-module-bundledoc-2017.tar.xz mirror://gentoo/texlive-module-checklistings-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk-2017.tar.xz mirror://gentoo/texlive-module-ctanify-2017.tar.xz mirror://gentoo/texlive-module-ctanupload-2017.tar.xz mirror://gentoo/texlive-module-ctie-2017.tar.xz mirror://gentoo/texlive-module-cweb-2017.tar.xz mirror://gentoo/texlive-module-de-macro-2017.tar.xz mirror://gentoo/texlive-module-dtl-2017.tar.xz mirror://gentoo/texlive-module-dtxgen-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty-2017.tar.xz mirror://gentoo/texlive-module-dviasm-2017.tar.xz mirror://gentoo/texlive-module-dvicopy-2017.tar.xz mirror://gentoo/texlive-module-dvidvi-2017.tar.xz mirror://gentoo/texlive-module-dviljk-2017.tar.xz mirror://gentoo/texlive-module-dvipos-2017.tar.xz mirror://gentoo/texlive-module-findhyph-2017.tar.xz mirror://gentoo/texlive-module-fragmaster-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2017.tar.xz mirror://gentoo/texlive-module-hyphenex-2017.tar.xz mirror://gentoo/texlive-module-installfont-2017.tar.xz mirror://gentoo/texlive-module-lacheck-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize-2017.tar.xz mirror://gentoo/texlive-module-latex2man-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion-2017.tar.xz mirror://gentoo/texlive-module-latexpand-2017.tar.xz mirror://gentoo/texlive-module-latexindent-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2017.tar.xz mirror://gentoo/texlive-module-ltximg-2017.tar.xz mirror://gentoo/texlive-module-listings-ext-2017.tar.xz mirror://gentoo/texlive-module-make4ht-2017.tar.xz mirror://gentoo/texlive-module-match_parens-2017.tar.xz mirror://gentoo/texlive-module-mflua-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2017.tar.xz mirror://gentoo/texlive-module-patgen-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2017.tar.xz mirror://gentoo/texlive-module-pdftools-2017.tar.xz mirror://gentoo/texlive-module-pdfxup-2017.tar.xz mirror://gentoo/texlive-module-pfarrei-2017.tar.xz mirror://gentoo/texlive-module-pkfix-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2017.tar.xz mirror://gentoo/texlive-module-purifyeps-2017.tar.xz mirror://gentoo/texlive-module-seetexk-2017.tar.xz mirror://gentoo/texlive-module-srcredact-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx-2017.tar.xz mirror://gentoo/texlive-module-synctex-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook-2017.tar.xz mirror://gentoo/texlive-module-texcount-2017.tar.xz mirror://gentoo/texlive-module-texdef-2017.tar.xz mirror://gentoo/texlive-module-texdiff-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten-2017.tar.xz mirror://gentoo/texlive-module-texdoc-2017.tar.xz mirror://gentoo/texlive-module-texfot-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser-2017.tar.xz mirror://gentoo/texlive-module-texosquery-2017.tar.xz mirror://gentoo/texlive-module-texware-2017.tar.xz mirror://gentoo/texlive-module-tie-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2017.tar.xz mirror://gentoo/texlive-module-web-2017.tar.xz mirror://gentoo/texlive-module-collection-binextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2017.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2017.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2017.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-arara.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2017.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2017.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2017.tar.xz mirror://gentoo/texlive-module-ctie.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb.doc-2017.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2017.tar.xz mirror://gentoo/texlive-module-dtl.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2017.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2017.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2017.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2017.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2017.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2017.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-installfont.doc-2017.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2017.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2017.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2017.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2017.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2017.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2017.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2017.tar.xz mirror://gentoo/texlive-module-synctex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-texcount.doc-2017.tar.xz mirror://gentoo/texlive-module-texdef.doc-2017.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2017.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-texfot.doc-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2017.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2017.tar.xz mirror://gentoo/texlive-module-texware.doc-2017.tar.xz mirror://gentoo/texlive-module-tie.doc-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-web.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2017.tar.xz mirror://gentoo/texlive-module-arara.source-2017.tar.xz mirror://gentoo/texlive-module-checklistings.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2017.tar.xz mirror://gentoo/texlive-module-pythontex.source-2017.tar.xz mirror://gentoo/texlive-module-texdef.source-2017.tar.xz mirror://gentoo/texlive-module-texosquery.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8c9ddb9a038fcc6cedc99917e16fe7f
+_md5_=cce72dd8e58656a5cefa790516db28cf
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 705e1cee018e..7046b589c590 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/waylandpp-0.1.0 b/metadata/md5-cache/dev-cpp/waylandpp-0.1.0
index 0f81a44e08a2..6c622d4efbf6 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-0.1.0
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland]
 SLOT=0/0
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.1.0.tar.gz -> waylandpp-0.1.0.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=53c59310b1a93e0200afa17e8c34e97f
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.1.2 b/metadata/md5-cache/dev-cpp/waylandpp-0.1.2
index a3ac06cce29c..7e61f0a55bc4 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-0.1.2
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland]
 SLOT=0/0
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.1.2.tar.gz -> waylandpp-0.1.2.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=445a6e2eddbfd5d3fc872c049fc6b393
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 8c46a13bd71c..0069ee8d1f49 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/cockroach-2.0.1 b/metadata/md5-cache/dev-db/cockroach-2.0.1
new file mode 100644
index 000000000000..bc5b378eab51
--- /dev/null
+++ b/metadata/md5-cache/dev-db/cockroach-2.0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install pretend setup
+DEPEND=>=app-arch/xz-utils-5.2.3 >=dev-lang/go-1.8.3 >=dev-util/cmake-3.8.1
+DESCRIPTION=open source database for building cloud services
+EAPI=6
+HOMEPAGE=https://www.cockroachlabs.com
+KEYWORDS=~amd64
+LICENSE=Cockroach Apache-2.0
+SLOT=0
+SRC_URI=https://binaries.cockroachdb.com/cockroach-v2.0.1.src.tgz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=bdd2ab2d768c42287bda4d4d1d9ddfee
diff --git a/metadata/md5-cache/dev-db/kdb-3.0.2 b/metadata/md5-cache/dev-db/kdb-3.0.2
deleted file mode 100644
index 1e6dbdd9bb00..000000000000
--- a/metadata/md5-cache/dev-db/kdb-3.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.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 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Database connectivity and creation framework for various vendors
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=mysql postgres sqlite debug
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.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.43.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	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f4d4f724454c549225f608876121ecc7
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.35 b/metadata/md5-cache/dev-db/mariadb-10.0.35
new file mode 100644
index 000000000000..c439e254abe6
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.35
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1: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(-)?] openssl? ( !>=dev-libs/openssl-1.1 ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=6
+HOMEPAGE=http://mariadb.org/
+IUSE=bindist jdbc odbc oqgraph pam sphinx tokudb xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
+RDEPEND=!bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1: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(-)?] openssl? ( !>=dev-libs/openssl-1.1 ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.35/source/mariadb-10.0.35.tar.gz mirror://gentoo/mysql-extras-20170926-1321Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170926-1321Z.tar.bz2
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	368a82829ca6a14a902e66193206e3e5	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2829aaa83c8bd2e7b00ecdb31ec62adf
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.24-r1 b/metadata/md5-cache/dev-db/mariadb-10.1.24-r1
index 6d9d16cd77f3..06cc80f2bc3c 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.24-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.24-r1
@@ -6,11 +6,11 @@ HOMEPAGE=http://mariadb.org/
 IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
+PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
 REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
 RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.24/source/mariadb-10.1.24.tar.gz mirror://gentoo/mysql-extras-20170316-1355Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170316-1355Z.tar.bz2
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	368a82829ca6a14a902e66193206e3e5	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ae8f0bf53d50193ae4e7dacde82dd0ca
+_md5_=63d7d4c43524b8c58837579027cb00a3
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.29 b/metadata/md5-cache/dev-db/mariadb-10.1.29
index 56345bc2967d..f894412a58b5 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.29
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.29
@@ -6,11 +6,11 @@ HOMEPAGE=http://mariadb.org/
 IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
+PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
 REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
 RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.29/source/mariadb-10.1.29.tar.gz mirror://gentoo/mysql-extras-20170926-1321Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170926-1321Z.tar.bz2
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	368a82829ca6a14a902e66193206e3e5	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e50c02aff352666f749425533fb219fc
+_md5_=d9fab8a73d14e75a12aa4176fc2dedbe
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.31-r1 b/metadata/md5-cache/dev-db/mariadb-10.1.31-r1
index 3af8e43f9dd4..62c3e97640b3 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.31-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.31-r1
@@ -6,11 +6,11 @@ HOMEPAGE=http://mariadb.org/
 IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga numa odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
+PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
 REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
 RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.31/source/mariadb-10.1.31.tar.gz mirror://gentoo/mysql-extras-20180308-1938Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180308-1938Z.tar.bz2
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	368a82829ca6a14a902e66193206e3e5	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=491d2dd653774608f2eaf3862b221497
+_md5_=2ba6a6f1250350cec1d3d20992ae62e5
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.32 b/metadata/md5-cache/dev-db/mariadb-10.1.32
index 7074bbecf8b7..af10af6c65fb 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.32
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.32
@@ -6,11 +6,11 @@ HOMEPAGE=http://mariadb.org/
 IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga numa odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
+PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
 REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
 RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.32/source/mariadb-10.1.32.tar.gz mirror://gentoo/mysql-extras-20180308-1938Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180308-1938Z.tar.bz2
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	368a82829ca6a14a902e66193206e3e5	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b7b563e8a537afba39f3e8b0361bf87a
+_md5_=caea388b297f6bdf65f14494764722c9
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.33 b/metadata/md5-cache/dev-db/mariadb-10.1.33
new file mode 100644
index 000000000000..ddec33e2b996
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.33
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= openssl? ( !>=dev-libs/openssl-1.1.0 ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=6
+HOMEPAGE=http://mariadb.org/
+IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga numa odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
+RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= openssl? ( !>=dev-libs/openssl-1.1.0 ) galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.33/source/mariadb-10.1.33.tar.gz mirror://gentoo/mysql-extras-20180308-1938Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180308-1938Z.tar.bz2
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	368a82829ca6a14a902e66193206e3e5	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6c33a936f0493780e677c551cdce37d9
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.14 b/metadata/md5-cache/dev-db/mariadb-10.2.14
index 6388eb7b82af..12c28c4596c9 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.14
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.14
@@ -6,11 +6,11 @@ HOMEPAGE=http://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_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 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) !client-libs? ( dev-db/mariadb-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) server? ( ~virtual/mysql-5.6[static=] galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) !client-libs? ( dev-db/mariadb-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) server? ( ~virtual/mysql-5.6[static=] galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r9 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) !server? ( !extraengine ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.14/source/mariadb-10.2.14.tar.gz mirror://gentoo/mysql-extras-20180308-1938Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180308-1938Z.tar.bz2
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a890a0ecfa547e14d59bf248ff7cf6eb
+_md5_=db41009477690322ac0685e9256ce71a
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.6_rc b/metadata/md5-cache/dev-db/mariadb-10.3.6_rc
index 69b7f6574db0..fe5f3c558c55 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.6_rc
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.6_rc
@@ -6,11 +6,11 @@ HOMEPAGE=http://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_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 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) !client-libs? ( dev-db/mariadb-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) server? ( ~virtual/mysql-5.6[static=] galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) !client-libs? ( dev-db/mariadb-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) server? ( ~virtual/mysql-5.6[static=] galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) !server? ( !extraengine ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.6/source/mariadb-10.3.6.tar.gz mirror://gentoo/mysql-extras-20180308-1938Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180308-1938Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180308-1938Z.tar.bz2
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ee04ea818bd24e6fbbf996e3fc1576df
+_md5_=218b2120ad57eb49ab793136b9372f47
diff --git a/metadata/md5-cache/dev-db/mariadb-galera-10.0.34 b/metadata/md5-cache/dev-db/mariadb-galera-10.0.34
index 4902aa139eb9..e92f4a256c61 100644
--- a/metadata/md5-cache/dev-db/mariadb-galera-10.0.34
+++ b/metadata/md5-cache/dev-db/mariadb-galera-10.0.34
@@ -6,11 +6,11 @@ HOMEPAGE=http://mariadb.org/
 IUSE=bindist jdbc odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-PDEPEND=sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
+PDEPEND=sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=!bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( net-misc/socat[ssl] ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
 REQUIRED_USE=server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
 RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-galera-10.0.34/source/mariadb-galera-10.0.34.tar.gz mirror://gentoo/mysql-extras-20170926-1321Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170926-1321Z.tar.bz2
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	368a82829ca6a14a902e66193206e3e5	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7391b2fd51c6a8b21166e78e8577eb92
+_md5_=4bb32ca938f1a24e91058eed4308c401
diff --git a/metadata/md5-cache/dev-db/mongodb-3.0.14 b/metadata/md5-cache/dev-db/mongodb-3.0.14
index f539583b5ddc..2ed1c6fdedc6 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.0.14
+++ b/metadata/md5-cache/dev-db/mongodb-3.0.14
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.0.14 )
 RDEPEND=app-arch/snappy >=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 mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://downloads.mongodb.org/src/mongodb-src-r3.0.14.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=c3dc23a16603633f83356d5e5bf7ffd3
diff --git a/metadata/md5-cache/dev-db/mongodb-3.0.15 b/metadata/md5-cache/dev-db/mongodb-3.0.15
index bd7ba713e38e..39a6293827c3 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.0.15
+++ b/metadata/md5-cache/dev-db/mongodb-3.0.15
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.0.15 )
 RDEPEND=app-arch/snappy >=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 mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://downloads.mongodb.org/src/mongodb-src-r3.0.15.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=c1f83b405175aa40d8e8aa94633c279d
diff --git a/metadata/md5-cache/dev-db/mongodb-3.2.17 b/metadata/md5-cache/dev-db/mongodb-3.2.17
index 609f5872464a..215e5d4dc250 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.2.17
+++ b/metadata/md5-cache/dev-db/mongodb-3.2.17
@@ -10,5 +10,5 @@ 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	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=05db0b017fcb81d63bf3d078d8d364ce
diff --git a/metadata/md5-cache/dev-db/mongodb-3.4.10 b/metadata/md5-cache/dev-db/mongodb-3.4.10
index 50c034d71263..1be9376a9b8d 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.4.10
+++ b/metadata/md5-cache/dev-db/mongodb-3.4.10
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.4.10 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.4.10.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=22a06b7ab80265d981020d4007964bec
diff --git a/metadata/md5-cache/dev-db/mongodb-3.4.13 b/metadata/md5-cache/dev-db/mongodb-3.4.13
index e3f7f0facd35..a68cd1343fa4 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.4.13
+++ b/metadata/md5-cache/dev-db/mongodb-3.4.13
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.4.13 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.4.13.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=86110a70daadf078c2773bfc57b63f82
diff --git a/metadata/md5-cache/dev-db/mongodb-3.4.14 b/metadata/md5-cache/dev-db/mongodb-3.4.14
index f8b729e46415..006c28f74549 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.4.14
+++ b/metadata/md5-cache/dev-db/mongodb-3.4.14
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.4.14 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.4.14.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=86110a70daadf078c2773bfc57b63f82
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.2 b/metadata/md5-cache/dev-db/mongodb-3.6.2
index 4a0af0b458a5..3162c7a47c0d 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.2
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.2
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.2 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.2.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=55e5412a6d10705dfdf5b7c671b1b9f1
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.3 b/metadata/md5-cache/dev-db/mongodb-3.6.3
index 0d2310af9117..de89b8473187 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.3
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.3
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.3 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.3.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=55e5412a6d10705dfdf5b7c671b1b9f1
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.4 b/metadata/md5-cache/dev-db/mongodb-3.6.4
index cac58aad05c9..da2eb7c21de4 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.4
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.4
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.4 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.4.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=55e5412a6d10705dfdf5b7c671b1b9f1
diff --git a/metadata/md5-cache/dev-db/postgresql-10.4 b/metadata/md5-cache/dev-db/postgresql-10.4
new file mode 100644
index 000000000000..b80cc792c82f
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-10.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=6
+HOMEPAGE=http://www.postgresql.org/
+IUSE=doc kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:10 !dev-db/postgresql-base:10 !dev-db/postgresql-server:10 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=10
+SRC_URI=mirror://postgresql/source/v10.4/postgresql-10.4.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=687cf47f09e901100a6336efa76fb122
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.23 b/metadata/md5-cache/dev-db/postgresql-9.3.23
new file mode 100644
index 000000000000..9fd9404a866d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.23
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=6
+HOMEPAGE=http://www.postgresql.org/
+IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=9.3
+SRC_URI=mirror://postgresql/source/v9.3.23/postgresql-9.3.23.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a4d018e9ad44a8a315a13c970a9116ae
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.18 b/metadata/md5-cache/dev-db/postgresql-9.4.18
new file mode 100644
index 000000000000..7f2282a858a1
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=6
+HOMEPAGE=http://www.postgresql.org/
+IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=9.4
+SRC_URI=mirror://postgresql/source/v9.4.18/postgresql-9.4.18.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b0f4e9040eefad58e401c8b974b80d24
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.13 b/metadata/md5-cache/dev-db/postgresql-9.5.13
new file mode 100644
index 000000000000..eabb531d395c
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=6
+HOMEPAGE=http://www.postgresql.org/
+IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=9.5
+SRC_URI=mirror://postgresql/source/v9.5.13/postgresql-9.5.13.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f514610e9418fe50b6ca6b4118607b5d
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.9 b/metadata/md5-cache/dev-db/postgresql-9.6.9
new file mode 100644
index 000000000000..232b35ce2d01
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=6
+HOMEPAGE=http://www.postgresql.org/
+IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=9.6
+SRC_URI=mirror://postgresql/source/v9.6.9/postgresql-9.6.9.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ec15587ac0be7f42f3fe99d8b364dd35
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index e5920e370cc5..7564eda5c622 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/sdcc-2.5.0_p20060502 b/metadata/md5-cache/dev-embedded/sdcc-2.5.0_p20060502
deleted file mode 100644
index 4ff8656344e7..000000000000
--- a/metadata/md5-cache/dev-embedded/sdcc-2.5.0_p20060502
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-embedded/gputils-0.13.2 dev-libs/boehm-gc
-DESCRIPTION=Small device C compiler (for various microprocessors)
-EAPI=0
-HOMEPAGE=http://sdcc.sourceforge.net/
-IUSE=doc
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!dev-embedded/sdcc-svn !dev-embedded/sdcc-svn
-SLOT=0
-SRC_URI=http://sdcc.sourceforge.net/snapshots/sdcc-src/sdcc-src-20060502.tar.gz doc? ( http://sdcc.sourceforge.net/snapshots/docs/sdcc-doc-20060502.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3508444ca47e88541019f48c2c78c8fb
diff --git a/metadata/md5-cache/dev-embedded/sdcc-2.6.0 b/metadata/md5-cache/dev-embedded/sdcc-2.6.0
deleted file mode 100644
index b1bedaacefba..000000000000
--- a/metadata/md5-cache/dev-embedded/sdcc-2.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-embedded/gputils-0.13.2 dev-libs/boehm-gc
-DESCRIPTION=Small device C compiler (for various microprocessors)
-EAPI=0
-HOMEPAGE=http://sdcc.sourceforge.net/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!dev-embedded/sdcc-svn
-SLOT=0
-SRC_URI=mirror://sourceforge/sdcc/sdcc-src-2.6.0.tar.gz doc? ( mirror://sourceforge/sdcc/sdcc-doc-2.6.0.tar.gz )
-_md5_=ef032955e91ffbea93479e9ddb8967d6
diff --git a/metadata/md5-cache/dev-embedded/sdcc-2.7.0 b/metadata/md5-cache/dev-embedded/sdcc-2.7.0
deleted file mode 100644
index a2dc9ceb3cba..000000000000
--- a/metadata/md5-cache/dev-embedded/sdcc-2.7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-embedded/gputils-0.13.2 dev-libs/boehm-gc
-DESCRIPTION=Small device C compiler (for various microprocessors)
-EAPI=0
-HOMEPAGE=http://sdcc.sourceforge.net/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!dev-embedded/sdcc-svn
-SLOT=0
-SRC_URI=mirror://sourceforge/sdcc/sdcc-src-2.7.0.tar.bz2 doc? ( mirror://sourceforge/sdcc/sdcc-doc-2.7.0.tar.bz2 )
-_md5_=f33d468e349791fbe7b610da76809496
diff --git a/metadata/md5-cache/dev-embedded/sdcc-2.8.0 b/metadata/md5-cache/dev-embedded/sdcc-2.8.0
deleted file mode 100644
index f2cc2483248f..000000000000
--- a/metadata/md5-cache/dev-embedded/sdcc-2.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-embedded/gputils-0.13.2 boehm-gc? ( dev-libs/boehm-gc ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Small device C compiler (for various microprocessors)
-EAPI=0
-HOMEPAGE=http://sdcc.sourceforge.net/
-IUSE=boehm-gc doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!dev-embedded/sdcc-svn
-SLOT=0
-SRC_URI=mirror://sourceforge/sdcc/sdcc-src-2.8.0.tar.bz2 doc? ( mirror://sourceforge/sdcc/sdcc-doc-2.8.0.tar.bz2 )
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2dac56dfd9ba17bd60f001f2c1da5b0c
diff --git a/metadata/md5-cache/dev-embedded/sdcc-2.9.0 b/metadata/md5-cache/dev-embedded/sdcc-2.9.0
deleted file mode 100644
index 17ecfe96d4f7..000000000000
--- a/metadata/md5-cache/dev-embedded/sdcc-2.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses sys-libs/readline >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc ) !dev-embedded/sdcc-svn
-DESCRIPTION=Small device C compiler (for various microprocessors)
-EAPI=2
-HOMEPAGE=http://sdcc.sourceforge.net/
-IUSE=+boehm-gc doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sys-libs/readline >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc ) !dev-embedded/sdcc-svn
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://sourceforge/sdcc/sdcc-src-2.9.0.tar.bz2 doc? ( mirror://sourceforge/sdcc/sdcc-doc-2.9.0.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d88dd35240d9e6b73c07b79bf82fe71f
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 68de1dcb7ce7..57f0a1683465 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/bff-1.0.5 b/metadata/md5-cache/dev-lang/bff-1.0.5
index a1860520b5ab..aa84808c8e4f 100644
--- a/metadata/md5-cache/dev-lang/bff-1.0.5
+++ b/metadata/md5-cache/dev-lang/bff-1.0.5
@@ -3,9 +3,9 @@ DESCRIPTION=A brainfuck interpreter
 EAPI=6
 HOMEPAGE=https://github.com/apankrat/bff
 IUSE=test
-KEYWORDS=amd64 arm ia64 m68k ~ppc ppc64 s390 sh x86
+KEYWORDS=amd64 arm ia64 m68k ppc ppc64 s390 sh x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/apankrat/bff/archive/v1.0.5.tar.gz -> bff-1.0.5.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=acb1a1c0ddadc17d8e43360f455979fd
+_md5_=68d4b698e6631d934b70aea5253fec43
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.2 b/metadata/md5-cache/dev-lang/ghc-8.4.2
new file mode 100644
index 000000000000..6832b3e09eaf
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ghc-8.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The Glasgow Haskell Compiler
+EAPI=6
+HOMEPAGE=http://www.haskell.org/ghc/
+IUSE=doc ghcbootstrap ghcmakebinary +gmp profile binary
+LICENSE=BSD
+PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
+RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
+REQUIRED_USE=?? ( ghcbootstrap binary )
+SLOT=0/8.4.2
+SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.4.2/ghc-8.4.2-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.2-i686-pc-linux-gnu.tbz2 ) )
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c14c73c7eeba58f9c214263a127d42b6
diff --git a/metadata/md5-cache/dev-lang/nasm-2.13.03-r1 b/metadata/md5-cache/dev-lang/nasm-2.13.03-r1
new file mode 100644
index 000000000000..85f509972f70
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nasm-2.13.03-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=dev-lang/perl doc? ( app-text/ghostscript-gpl dev-perl/Font-TTF dev-perl/Sort-Versions media-fonts/source-pro virtual/perl-File-Spec )
+DESCRIPTION=groovy little assembler
+EAPI=6
+HOMEPAGE=http://www.nasm.us/
+IUSE=doc
+KEYWORDS=~amd64 ~ia64 ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=158587b0e5e3d69e15c582d89ac3054a
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 037eba8ecf25..297b1ba6f0d3 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/OpenSRF-1.2.0 b/metadata/md5-cache/dev-libs/OpenSRF-1.2.0
deleted file mode 100644
index 881df3f5287b..000000000000
--- a/metadata/md5-cache/dev-libs/OpenSRF-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcache dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/Net-Server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Framework for the high-level development of the Evergreen ILS software
-EAPI=5
-HOMEPAGE=http://open-ils.org/
-IUSE=postgres +sqlite
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcache dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/Net-Server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://open-ils.org/downloads/OpenSRF-1.2.0.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	4842e626555a9a4344f34cef2e190b67	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56c7b03ec6d6f24369f67cdba29de147
diff --git a/metadata/md5-cache/dev-libs/OpenSRF-2.1.1 b/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
index 911e013ae6ed..a8e2b539efbc 100644
--- a/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
+++ b/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcache dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/Net-Server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:=[-build(-)]
+DEPEND=>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcached dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/Net-Server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:=[-build(-)]
 DESCRIPTION=Framework for the high-level development of the Evergreen ILS software
 EAPI=5
-HOMEPAGE=http://open-ils.org/
+HOMEPAGE=https://open-ils.org/
 IUSE=postgres +sqlite
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcache dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/Net-Server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* dev-lang/perl:=[-build(-)]
+RDEPEND=>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcached dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/Net-Server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* dev-lang/perl:=[-build(-)]
 SLOT=0
-SRC_URI=http://open-ils.org/downloads/opensrf-2.1.1.tar.gz
+SRC_URI=https://open-ils.org/downloads/opensrf-2.1.1.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	4842e626555a9a4344f34cef2e190b67	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fda1cb8e2f460e96a6805b8a4889941f
+_md5_=21dd445bed12c33c282be8402a74bc34
diff --git a/metadata/md5-cache/dev-libs/double-conversion-2.0.1 b/metadata/md5-cache/dev-libs/double-conversion-2.0.1
index 94d69aa181fb..d5a4993cc425 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-2.0.1
+++ b/metadata/md5-cache/dev-libs/double-conversion-2.0.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0/1
 SRC_URI=https://github.com/google/double-conversion/archive/v2.0.1.tar.gz -> double-conversion-2.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ce1472d3a1e69531fbc2a4d93a2492a8
diff --git a/metadata/md5-cache/dev-libs/ffcall-2.1 b/metadata/md5-cache/dev-libs/ffcall-2.1
index 25a6aff23b7c..e2f5ec6429a7 100644
--- a/metadata/md5-cache/dev-libs/ffcall-2.1
+++ b/metadata/md5-cache/dev-libs/ffcall-2.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Build foreign function call interfaces in embedded interpreter
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libffcall/
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/libffcall/libffcall-2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0d598c986509aff67dadd3c94b1d11d1
+_md5_=4d92f8b2853c6692e69aef68dbaa18a5
diff --git a/metadata/md5-cache/dev-libs/fribidi-0.19.5-r1 b/metadata/md5-cache/dev-libs/fribidi-0.19.5-r1
index c4bf15ce1fee..2efbe7a7a558 100644
--- a/metadata/md5-cache/dev-libs/fribidi-0.19.5-r1
+++ b/metadata/md5-cache/dev-libs/fribidi-0.19.5-r1
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2
 RESTRICT=test
 SLOT=0
-SRC_URI=https://fribidi.org/download/fribidi-0.19.5.tar.bz2
+SRC_URI=https://github.com/fribidi/fribidi/releases/download/0.19.5/fribidi-0.19.5.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=71d59c0be21b60473291b09bfa632f67
+_md5_=213e76009b75ca3da043434c5218b3ec
diff --git a/metadata/md5-cache/dev-libs/fribidi-0.19.6 b/metadata/md5-cache/dev-libs/fribidi-0.19.6
index b72f8201397d..8e43de0eecd5 100644
--- a/metadata/md5-cache/dev-libs/fribidi-0.19.6
+++ b/metadata/md5-cache/dev-libs/fribidi-0.19.6
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1
 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(-)?]
 RESTRICT=test
 SLOT=0
-SRC_URI=https://fribidi.org/download/fribidi-0.19.6.tar.bz2
+SRC_URI=https://github.com/fribidi/fribidi/releases/download/0.19.6/fribidi-0.19.6.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5d82de65786b5c6175b2fb8e765dfa19
+_md5_=75de3d1f9f23bbad597268936f133682
diff --git a/metadata/md5-cache/dev-libs/fribidi-0.19.7 b/metadata/md5-cache/dev-libs/fribidi-0.19.7
index 30e9fc1353c9..eac2a7b22d52 100644
--- a/metadata/md5-cache/dev-libs/fribidi-0.19.7
+++ b/metadata/md5-cache/dev-libs/fribidi-0.19.7
@@ -4,10 +4,10 @@ DESCRIPTION=A free implementation of the unicode bidirectional algorithm
 EAPI=5
 HOMEPAGE=https://fribidi.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 ~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.1
 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(-)?]
 SLOT=0
-SRC_URI=https://fribidi.org/download/fribidi-0.19.7.tar.bz2
+SRC_URI=https://github.com/fribidi/fribidi/releases/download/0.19.7/fribidi-0.19.7.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8ef7225f8badbb5e4c3b05c1906edc09
+_md5_=653b1938c8f7d6274956c36834708caa
diff --git a/metadata/md5-cache/dev-libs/injeqt-1.2.0 b/metadata/md5-cache/dev-libs/injeqt-1.2.0
index 6cda8593dcfc..7a857e3f5f50 100644
--- a/metadata/md5-cache/dev-libs/injeqt-1.2.0
+++ b/metadata/md5-cache/dev-libs/injeqt-1.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Dependency injection framework for Qt5
 EAPI=6
 HOMEPAGE=https://github.com/vogel/injeqt
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vogel/injeqt/archive/1.2.0.tar.gz -> injeqt-1.2.0.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e4115ba8ca1d06efba69b0c4235f7d4
+_md5_=dd6e6c75db7877341ae0e442ae95718d
diff --git a/metadata/md5-cache/dev-libs/kproperty-3.0.2 b/metadata/md5-cache/dev-libs/kproperty-3.0.2
deleted file mode 100644
index 2f9fc3dbc328..000000000000
--- a/metadata/md5-cache/dev-libs/kproperty-3.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Property editing framework with editor widget similar to Qt Designer
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.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.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/kproperty/src/kproperty-3.0.2.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fc10440f45c1c3e043a274fa8e5deea9
diff --git a/metadata/md5-cache/dev-libs/kreport-3.0.2 b/metadata/md5-cache/dev-libs/kreport-3.0.2
deleted file mode 100644
index 11cdb0dc1c5c..000000000000
--- a/metadata/md5-cache/dev-libs/kreport-3.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.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/qtxml-5.7.1:5 dev-libs/kproperty marble? ( >=kde-apps/marble-14.12.0:5= ) scripting? ( >=dev-qt/qtdeclarative-5.7.1:5 ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for creation and generation of reports in multiple formats
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=marble +scripting webkit test debug test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.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/qtxml-5.7.1:5 dev-libs/kproperty marble? ( >=kde-apps/marble-14.12.0:5= ) scripting? ( >=dev-qt/qtdeclarative-5.7.1:5 ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/kreport/src/kreport-3.0.2.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8d5682c4a2fff9377bf240fe7f30be1e
diff --git a/metadata/md5-cache/dev-libs/libebml-1.3.5 b/metadata/md5-cache/dev-libs/libebml-1.3.5
index 1be9153c5585..32c93336dd14 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.3.5
+++ b/metadata/md5-cache/dev-libs/libebml-1.3.5
@@ -4,9 +4,9 @@ DESCRIPTION=Extensible binary format library (kinda like XML)
 EAPI=6
 HOMEPAGE=https://www.matroska.org/ https://github.com/Matroska-Org/libebml/
 IUSE=debug static-libs
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 SLOT=0/4
 SRC_URI=https://dl.matroska.org/downloads/libebml/libebml-1.3.5.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=632f30d0247643041fca991a676837a6
+_md5_=d4852c8872d64beeecf79356e46810d0
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.12.2 b/metadata/md5-cache/dev-libs/libfilezilla-0.12.2
new file mode 100644
index 000000000000..23ec74249bb7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.12.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=pretend
+DEPEND=test? ( dev-util/cppunit )
+DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
+EAPI=6
+HOMEPAGE=https://lib.filezilla-project.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://sourceforge/filezilla/libfilezilla-0.12.2.tar.bz2 http://download.filezilla-project.org/libfilezilla/libfilezilla-0.12.2.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=79d8a1ab093723ebc83b3f2f04ebd692
diff --git a/metadata/md5-cache/dev-libs/libinput-1.10.6 b/metadata/md5-cache/dev-libs/libinput-1.10.6
index 58bf6200552d..ddefddf93588 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.10.6
+++ b/metadata/md5-cache/dev-libs/libinput-1.10.6
@@ -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 ~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=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.10.6.tar.xz
 _eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=7329264fd707404caa6e93db05dfde52
+_md5_=e821696182af378d9151d52160517727
diff --git a/metadata/md5-cache/dev-libs/libnl-3.4.0 b/metadata/md5-cache/dev-libs/libnl-3.4.0
index d4cb6bcbdfef..5f5d662c0f9f 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.4.0
+++ b/metadata/md5-cache/dev-libs/libnl-3.4.0
@@ -3,7 +3,7 @@ DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) py
 DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=6
 HOMEPAGE=http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
-IUSE=static-libs python utils 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
+IUSE=+debug static-libs python +threads utils python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 utils? ( GPL-2 )
 RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 py
 SLOT=3
 SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_4_0/libnl-3.4.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8e5bf9ca2a9b9c7a026f10e9a89997e2
+_md5_=be8b0a2ba96645580f48f20e93a16ad8
diff --git a/metadata/md5-cache/dev-libs/libnl-99999999 b/metadata/md5-cache/dev-libs/libnl-99999999
index a456073cb282..a53df8ffdda7 100644
--- a/metadata/md5-cache/dev-libs/libnl-99999999
+++ b/metadata/md5-cache/dev-libs/libnl-99999999
@@ -3,10 +3,10 @@ DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) py
 DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=6
 HOMEPAGE=http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
-IUSE=static-libs python utils 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
+IUSE=+debug static-libs python +threads utils 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
 LICENSE=LGPL-2.1 utils? ( GPL-2 )
 RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=3
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c65a8704f5ed2071537e388804adb5af
+_md5_=0a2c3c28c8d32d1b77896929e55e9f35
diff --git a/metadata/md5-cache/dev-libs/libuv-1.20.3 b/metadata/md5-cache/dev-libs/libuv-1.20.3
new file mode 100644
index 000000000000..8014524fda38
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libuv-1.20.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/libtool 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.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Cross-platform asychronous I/O
+EAPI=6
+HOMEPAGE=https://github.com/libuv/libuv
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD BSD-2 ISC MIT
+RESTRICT=test
+SLOT=0/1
+SRC_URI=https://github.com/libuv/libuv/archive/v1.20.3.tar.gz -> libuv-1.20.3.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=8cfa3b5c69c7d6a18b7b3c80b498561f
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.32 b/metadata/md5-cache/dev-libs/libxslt-1.1.32
index abe0551ff78e..b49ce67fb59c 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.32
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.32
@@ -4,11 +4,11 @@ DESCRIPTION=XSLT libraries and tools
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=crypt debug examples python static-libs elibc_Darwin 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 ~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=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.1-r5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.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(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.32.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=062da7db0b7a2fe1a93d84b507a344c9
+_md5_=e99f72bed40f462ed5c2688211cadc39
diff --git a/metadata/md5-cache/dev-libs/mongo-cxx-driver-0.0.2.6.7-r1 b/metadata/md5-cache/dev-libs/mongo-cxx-driver-0.0.2.6.7-r1
index 7687aab53f76..80f0363b9784 100644
--- a/metadata/md5-cache/dev-libs/mongo-cxx-driver-0.0.2.6.7-r1
+++ b/metadata/md5-cache/dev-libs/mongo-cxx-driver-0.0.2.6.7-r1
@@ -9,5 +9,5 @@ LICENSE=AGPL-3 Apache-2.0
 RDEPEND=app-arch/snappy >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.50[threads(+)] >=dev-libs/libpcre-8.30[cxx] dev-util/google-perftools[-minimal] ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-cxx-driver/archive/legacy-0.0-26compat-2.6.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=821ef338ee6c9f14b097ad1962b64eee
diff --git a/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.0 b/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.0
index 603c43478a70..0e9b417aecd3 100644
--- a/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.0
+++ b/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/tokumx >=dev-libs/boost-1.50[threads(+)] sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-cxx-driver/archive/legacy-1.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f9c8df53f29c7d67193c174851a0de3
diff --git a/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.5 b/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.5
index c5d2766d05ec..ccdb9d8133ba 100644
--- a/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.5
+++ b/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/tokumx >=dev-libs/boost-1.50[threads(+)] sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-cxx-driver/archive/legacy-1.0.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f9c8df53f29c7d67193c174851a0de3
diff --git a/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.1.2-r1 b/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.1.2-r1
index 731c8733b914..0fe02e5267c8 100644
--- a/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.1.2-r1
+++ b/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/tokumx dev-libs/boost:=[threads(+)] sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-cxx-driver/archive/legacy-1.1.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=12901b900e98df17a03976566fe8954b
diff --git a/metadata/md5-cache/dev-libs/nettle-3.4 b/metadata/md5-cache/dev-libs/nettle-3.4
index 11c383701483..c612fbc47a67 100644
--- a/metadata/md5-cache/dev-libs/nettle-3.4
+++ b/metadata/md5-cache/dev-libs/nettle-3.4
@@ -4,10 +4,10 @@ DESCRIPTION=Low-level cryptographic library
 EAPI=6
 HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
 IUSE=doc +gmp neon static-libs test cpu_flags_x86_aes abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~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 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~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=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( >=dev-libs/gmp-5.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/6.2
 SRC_URI=mirror://gnu/nettle/nettle-3.4.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=9bb6e5b155103cf154302e4cfd46f950
+_md5_=32460cb830156f0792016c69d766baa6
diff --git a/metadata/md5-cache/dev-libs/pslib-0.4.5 b/metadata/md5-cache/dev-libs/pslib-0.4.5
index 4f5110e69061..44ff1dd1d708 100644
--- a/metadata/md5-cache/dev-libs/pslib-0.4.5
+++ b/metadata/md5-cache/dev-libs/pslib-0.4.5
@@ -4,10 +4,10 @@ DESCRIPTION=pslib is a C-library to create PostScript files on the fly
 EAPI=6
 HOMEPAGE=http://pslib.sourceforge.net/
 IUSE=debug jpeg png static-libs tiff
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/pslib/pslib-0.4.5.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=23a9427b1949529304211cbf29ccc4ba
+_md5_=826396099657e4ee285f360c6ddaaa26
diff --git a/metadata/md5-cache/dev-libs/quazip-0.7.3-r1 b/metadata/md5-cache/dev-libs/quazip-0.7.3-r1
index 7d62d12ae951..89f4ae054dc2 100644
--- a/metadata/md5-cache/dev-libs/quazip-0.7.3-r1
+++ b/metadata/md5-cache/dev-libs/quazip-0.7.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
 EAPI=6
 HOMEPAGE=http://quazip.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=amd64 arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 sys-libs/zlib[minizip]
 SLOT=0
 SRC_URI=mirror://sourceforge/quazip/quazip-0.7.3.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a355052cf463a3823047f049c4d07539
+_md5_=6f5d21b1543485919570bccc35dd49e0
diff --git a/metadata/md5-cache/dev-libs/softhsm-2.4.0 b/metadata/md5-cache/dev-libs/softhsm-2.4.0
new file mode 100644
index 000000000000..c842628386ee
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/softhsm-2.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-devel/gcc:=[cxx] migration-tool? ( dev-db/sqlite:3 ) !libressl? ( dev-libs/openssl:=[bindist=] ) libressl? ( dev-libs/libressl ) !=dev-libs/softhsm-2.0.0:0 virtual/pkgconfig test? ( dev-util/cppunit )
+DESCRIPTION=A software PKCS#11 implementation
+EAPI=6
+HOMEPAGE=https://www.opendnssec.org/
+IUSE=bindist libressl migration-tool test
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=sys-devel/gcc:=[cxx] migration-tool? ( dev-db/sqlite:3 ) !libressl? ( dev-libs/openssl:=[bindist=] ) libressl? ( dev-libs/libressl ) !=dev-libs/softhsm-2.0.0:0
+SLOT=2
+SRC_URI=https://www.opendnssec.org/files/source/softhsm-2.4.0.tar.gz
+_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=c34c0f70caad77e7084765bf5dc56758
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 54ae94212a4d..44f32e70d796 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.11 b/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.11
deleted file mode 100644
index 298ec917853d..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=PHP class to communicate with IRC networks
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_SmartIRC
-IUSE=doc examples
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_SmartIRC-1.1.11.tgz
-_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
-_md5_=b97ff69dcd71444938a8d66b74707fc3
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.12 b/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.12
new file mode 100644
index 000000000000..d3c95ceba317
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=PHP class to communicate with IRC networks
+EAPI=6
+HOMEPAGE=https://pear.php.net/package/Net_SmartIRC
+IUSE=doc examples
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/Net_SmartIRC-1.1.12.tgz
+_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
+_md5_=61687342b758415517841896efb688a7
diff --git a/metadata/md5-cache/dev-php/pecl-propro-2.0.1-r2 b/metadata/md5-cache/dev-php/pecl-propro-2.0.1-r2
deleted file mode 100644
index de27419107cf..000000000000
--- a/metadata/md5-cache/dev-php/pecl-propro-2.0.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=A reusable property proxy API for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/propro
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=php_targets_php5-6? ( dev-php/pecl-propro:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/propro-2.0.1.tgz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=c7bbd0263a130bb62b44b25e331f905c
diff --git a/metadata/md5-cache/dev-php/pecl-propro-2.1.0 b/metadata/md5-cache/dev-php/pecl-propro-2.1.0
new file mode 100644
index 000000000000..70d670d5c003
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-propro-2.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+DESCRIPTION=A reusable property proxy API for PHP
+EAPI=6
+HOMEPAGE=https://pecl.php.net/propro
+IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=php_targets_php5-6? ( dev-php/pecl-propro:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
+SLOT=7
+SRC_URI=https://pecl.php.net/get/propro-2.1.0.tgz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=c7bbd0263a130bb62b44b25e331f905c
diff --git a/metadata/md5-cache/dev-php/pecl-redis-4.0.2 b/metadata/md5-cache/dev-php/pecl-redis-4.0.2
new file mode 100644
index 000000000000..d587fe2c838b
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-redis-4.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) ) php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) ) php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) ) php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+DESCRIPTION=PHP extension for interfacing with Redis
+EAPI=6
+HOMEPAGE=https://pecl.php.net/redis
+IUSE=igbinary +session php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
+KEYWORDS=~amd64 ~arm
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) ) php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) ) php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) ) php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) ) !dev-php/pecl-redis:7 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pecl.php.net/get/redis-4.0.2.tgz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=7ff160455c2e80ddd8f5ea370b85d1a4
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 5b4ac5a11db9..1ed2a4fb08f7 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/PyQt4-4.12.1 b/metadata/md5-cache/dev-python/PyQt4-4.12.1
index a99b935d6526..e56c7485acae 100644
--- a/metadata/md5-cache/dev-python/PyQt4-4.12.1
+++ b/metadata/md5-cache/dev-python/PyQt4-4.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Qt framework
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
 IUSE=X compat dbus debug declarative designer doc examples help multimedia opengl phonon script scripttools sql svg testlib webkit xmlpatterns python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sip-4.19.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-qt/qtcore-4.8.5:4 X? ( >=dev-qt/qtgui-4.8.5:4 ) 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(-)] >=dev-qt/qtdbus-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( >=media-libs/phonon-4.7[qt4] ) script? ( >=dev-qt/qtscript-4.8.5:4 ) scripttools? ( >=dev-qt/qtgui-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4 ) testlib? ( >=dev-qt/qttest-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) sql? ( X ) testlib? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/PyQt4_gpl_x11-4.12.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=a3c6c7dcd71cffdfd6e81e82ebd9e790
+_md5_=8e255e29ae02312532c66b9833f97e34
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.7.1 b/metadata/md5-cache/dev-python/PyQt5-5.7.1
deleted file mode 100644
index a264cbae4114..000000000000
--- a/metadata/md5-cache/dev-python/PyQt5-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sip-4.19:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-qt/qtcore-5.7.1 ~dev-qt/qtxml-5.7.1 bluetooth? ( ~dev-qt/qtbluetooth-5.7.1 ) 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(-)] ~dev-qt/qtdbus-5.7.1 ) declarative? ( ~dev-qt/qtdeclarative-5.7.1[widgets?] ) designer? ( ~dev-qt/designer-5.7.1 ) gui? ( ~dev-qt/qtgui-5.7.1[gles2=] ) help? ( ~dev-qt/qthelp-5.7.1 ) location? ( ~dev-qt/qtlocation-5.7.1 ) multimedia? ( ~dev-qt/qtmultimedia-5.7.1[widgets?] ) network? ( ~dev-qt/qtnetwork-5.7.1 ) opengl? ( ~dev-qt/qtopengl-5.7.1 ) positioning? ( ~dev-qt/qtpositioning-5.7.1 ) printsupport? ( ~dev-qt/qtprintsupport-5.7.1 ) sensors? ( ~dev-qt/qtsensors-5.7.1 ) serialport? ( ~dev-qt/qtserialport-5.7.1 ) sql? ( ~dev-qt/qtsql-5.7.1 ) svg? ( ~dev-qt/qtsvg-5.7.1 ) testlib? ( ~dev-qt/qttest-5.7.1 ) webchannel? ( ~dev-qt/qtwebchannel-5.7.1 ) webengine? ( ~dev-qt/qtwebengine-5.7.1[widgets?] ) webkit? ( ~dev-qt/qtwebkit-5.7.1[printsupport] ) websockets? ( ~dev-qt/qtwebsockets-5.7.1 ) widgets? ( ~dev-qt/qtwidgets-5.7.1 ) x11extras? ( ~dev-qt/qtx11extras-5.7.1 ) xmlpatterns? ( ~dev-qt/qtxmlpatterns-5.7.1 ) dbus? ( virtual/pkgconfig )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=6
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
-IUSE=bluetooth dbus debug declarative designer doc examples gles2 gui help location multimedia network opengl positioning printsupport sensors serialport sql svg testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sip-4.19:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-qt/qtcore-5.7.1 ~dev-qt/qtxml-5.7.1 bluetooth? ( ~dev-qt/qtbluetooth-5.7.1 ) 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(-)] ~dev-qt/qtdbus-5.7.1 ) declarative? ( ~dev-qt/qtdeclarative-5.7.1[widgets?] ) designer? ( ~dev-qt/designer-5.7.1 ) gui? ( ~dev-qt/qtgui-5.7.1[gles2=] ) help? ( ~dev-qt/qthelp-5.7.1 ) location? ( ~dev-qt/qtlocation-5.7.1 ) multimedia? ( ~dev-qt/qtmultimedia-5.7.1[widgets?] ) network? ( ~dev-qt/qtnetwork-5.7.1 ) opengl? ( ~dev-qt/qtopengl-5.7.1 ) positioning? ( ~dev-qt/qtpositioning-5.7.1 ) printsupport? ( ~dev-qt/qtprintsupport-5.7.1 ) sensors? ( ~dev-qt/qtsensors-5.7.1 ) serialport? ( ~dev-qt/qtserialport-5.7.1 ) sql? ( ~dev-qt/qtsql-5.7.1 ) svg? ( ~dev-qt/qtsvg-5.7.1 ) testlib? ( ~dev-qt/qttest-5.7.1 ) webchannel? ( ~dev-qt/qtwebchannel-5.7.1 ) webengine? ( ~dev-qt/qtwebengine-5.7.1[widgets?] ) webkit? ( ~dev-qt/qtwebkit-5.7.1[printsupport] ) websockets? ( ~dev-qt/qtwebsockets-5.7.1 ) widgets? ( ~dev-qt/qtwidgets-5.7.1 ) x11extras? ( ~dev-qt/qtx11extras-5.7.1 ) xmlpatterns? ( ~dev-qt/qtxmlpatterns-5.7.1 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( gui widgets ) webchannel? ( network ) webengine? ( network widgets? ( webchannel ) ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
-SLOT=0
-SRC_URI=mirror://sourceforge/pyqt/PyQt5_gpl-5.7.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=c7f493cb980b08482b14c8399e0e1c97
diff --git a/metadata/md5-cache/dev-python/PythonQt-3.1 b/metadata/md5-cache/dev-python/PythonQt-3.1
deleted file mode 100644
index 22d49e634f48..000000000000
--- a/metadata/md5-cache/dev-python/PythonQt-3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=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(+)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 extensions? ( dev-qt/designer:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 webkit? ( dev-qt/qtwebkit:5 ) ) dev-qt/qtxml:5 virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=A dynamic Python binding for the Qt framework
-EAPI=6
-HOMEPAGE=http://pythonqt.sourceforge.net/
-IUSE=doc +extensions webkit python_targets_python2_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 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 extensions? ( dev-qt/designer:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 webkit? ( dev-qt/qtwebkit:5 ) )
-REQUIRED_USE=webkit? ( extensions ) ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pythonqt/pythonqt/PythonQt-3.1/PythonQt3.1.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=436c7e63f5f25c6287d3835eb1c5b906
diff --git a/metadata/md5-cache/dev-python/PythonQt-3.1-r1 b/metadata/md5-cache/dev-python/PythonQt-3.1-r1
deleted file mode 100644
index 37d858890ca3..000000000000
--- a/metadata/md5-cache/dev-python/PythonQt-3.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] <dev-qt/qtcore-5.9:5 <dev-qt/qtgui-5.9:5 <dev-qt/qtwidgets-5.9:5 extensions? ( <dev-qt/designer-5.9:5 <dev-qt/qtdeclarative-5.9:5[widgets] <dev-qt/qtmultimedia-5.9:5[widgets] <dev-qt/qtnetwork-5.9:5 <dev-qt/qtopengl-5.9:5 <dev-qt/qtprintsupport-5.9:5 <dev-qt/qtsql-5.9:5 <dev-qt/qtsvg-5.9:5 <dev-qt/qtxml-5.9:5 <dev-qt/qtxmlpatterns-5.9:5 webkit? ( <dev-qt/qtwebkit-5.9:5 ) ) <dev-qt/qtxml-5.9:5 virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=A dynamic Python binding for the Qt framework
-EAPI=6
-HOMEPAGE=http://pythonqt.sourceforge.net/
-IUSE=doc +extensions webkit python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-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/qtcore-5.9:5 <dev-qt/qtgui-5.9:5 <dev-qt/qtwidgets-5.9:5 extensions? ( <dev-qt/designer-5.9:5 <dev-qt/qtdeclarative-5.9:5[widgets] <dev-qt/qtmultimedia-5.9:5[widgets] <dev-qt/qtnetwork-5.9:5 <dev-qt/qtopengl-5.9:5 <dev-qt/qtprintsupport-5.9:5 <dev-qt/qtsql-5.9:5 <dev-qt/qtsvg-5.9:5 <dev-qt/qtxml-5.9:5 <dev-qt/qtxmlpatterns-5.9:5 webkit? ( <dev-qt/qtwebkit-5.9:5 ) )
-REQUIRED_USE=webkit? ( extensions ) ^^ ( 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://sourceforge/pythonqt/pythonqt/PythonQt-3.1/PythonQt3.1.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=b65fd91f0857d6c674cc95170fe4a4c8
diff --git a/metadata/md5-cache/dev-python/QtPy-1.3.1 b/metadata/md5-cache/dev-python/QtPy-1.3.1
deleted file mode 100644
index a7a3c29b8bd0..000000000000
--- a/metadata/md5-cache/dev-python/QtPy-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Abstraction layer for PyQt5/PySide
-EAPI=6
-HOMEPAGE=https://github.com/spyder-ide/qtpy
-IUSE=designer gui opengl +pyqt5 pyside svg testlib webkit python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=pyqt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),designer?,opengl?,svg?,webkit?] gui? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),gui,widgets] ) testlib? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),testlib] ) ) pyside? ( dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),designer?,opengl?,svg?] gui? ( dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),X] ) testlib? ( dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),X] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=|| ( pyqt5 pyside ) webkit? ( pyqt5 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/Q/QtPy/QtPy-1.3.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c86537987b4de7b11cbb485b28941f50
diff --git a/metadata/md5-cache/dev-python/QtPy-1.3.1-r1 b/metadata/md5-cache/dev-python/QtPy-1.3.1-r1
new file mode 100644
index 000000000000..1b45dce8b712
--- /dev/null
+++ b/metadata/md5-cache/dev-python/QtPy-1.3.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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=Abstraction layer for PyQt5/PySide
+EAPI=6
+HOMEPAGE=https://github.com/spyder-ide/qtpy
+IUSE=designer gui opengl svg testlib webkit python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),designer?,opengl?,svg?,webkit?] gui? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),gui,widgets] ) testlib? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),testlib] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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/Q/QtPy/QtPy-1.3.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8b8f6fa9eccdcabb6699cb5f3f496461
diff --git a/metadata/md5-cache/dev-python/QtPy-1.4.0 b/metadata/md5-cache/dev-python/QtPy-1.4.0
deleted file mode 100644
index 0bc7be04acaa..000000000000
--- a/metadata/md5-cache/dev-python/QtPy-1.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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=Abstraction layer for PyQt5/PySide
-EAPI=6
-HOMEPAGE=https://github.com/spyder-ide/qtpy
-IUSE=designer gui opengl +pyqt5 pyside svg testlib webkit webengine python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=pyqt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),designer?,opengl?,svg?,webkit?,webengine?] gui? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),gui,widgets] ) testlib? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),testlib] ) ) pyside? ( dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),designer?,opengl?,svg?] gui? ( dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),X] ) testlib? ( dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),X] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=|| ( pyqt5 pyside ) webkit? ( pyqt5 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/Q/QtPy/QtPy-1.4.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=234eef9ff6931f8519a62b4fece78dc4
diff --git a/metadata/md5-cache/dev-python/QtPy-1.4.0-r1 b/metadata/md5-cache/dev-python/QtPy-1.4.0-r1
new file mode 100644
index 000000000000..ff4b50086c78
--- /dev/null
+++ b/metadata/md5-cache/dev-python/QtPy-1.4.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=Abstraction layer for PyQt5/PySide
+EAPI=6
+HOMEPAGE=https://github.com/spyder-ide/qtpy
+IUSE=designer gui opengl svg testlib webkit webengine python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),designer?,opengl?,svg?,webkit?,webengine?] gui? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),gui,widgets] ) testlib? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),testlib] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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/Q/QtPy/QtPy-1.4.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e2ec5c254557164c4de1295f928aa04a
diff --git a/metadata/md5-cache/dev-python/cgkit-2.0.0-r1 b/metadata/md5-cache/dev-python/cgkit-2.0.0-r1
index b260c4aacb5d..96789bd08ac6 100644
--- a/metadata/md5-cache/dev-python/cgkit-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/cgkit-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.48[python,python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=python_targets_python2_7? ( mirror://sourceforge/cgkit/cgkit/cgkit-2.0.0/cgkit-2.0.0-py2k.tar.gz ) python_targets_python3_4? ( mirror://sourceforge/cgkit/cgkit/cgkit-2.0.0/cgkit-2.0.0-py3k.tar.gz ) python_targets_python3_5? ( mirror://sourceforge/cgkit/cgkit/cgkit-2.0.0/cgkit-2.0.0-py3k.tar.gz )
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=392a2f389547a055c1aedc8ed8c2e8c9
diff --git a/metadata/md5-cache/dev-python/django_polymorphic-2.0.2 b/metadata/md5-cache/dev-python/django_polymorphic-2.0.2
new file mode 100644
index 000000000000..2104faa01b5d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django_polymorphic-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/django-1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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=Seamless Polymorphic Inheritance for Django Models
+EAPI=5
+HOMEPAGE=https://pypi.org/project/django-polymorphic/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/django-1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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/d/django_polymorphic/django-polymorphic-2.0.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=31705a056f49e76c8572d6f960dbc45c
diff --git a/metadata/md5-cache/dev-python/elasticsearch-curator-5.3.0 b/metadata/md5-cache/dev-python/elasticsearch-curator-5.3.0
deleted file mode 100644
index cdecdd510bbf..000000000000
--- a/metadata/md5-cache/dev-python/elasticsearch-curator-5.3.0
+++ /dev/null
@@ -1,15 +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(-)] 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/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/elasticsearch-py-5.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/elasticsearch-py-6.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/certifi-2017.4.17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/urllib3-1.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/voluptuous-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/jre:1.8 dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nosexcover[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=Tending time-series indices in Elasticsearch
-EAPI=6
-HOMEPAGE=https://github.com/elasticsearch/curator
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/elasticsearch-py-5.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/elasticsearch-py-6.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/certifi-2017.4.17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/urllib3-1.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/voluptuous-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elasticsearch/curator/archive/v5.3.0.tar.gz -> elasticsearch-curator-5.3.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.3.tar.gz )
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=acfc6ad88543ad21e8974ffe08b88016
diff --git a/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.1 b/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.1
new file mode 100644
index 000000000000..2b115835ed23
--- /dev/null
+++ b/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/elasticsearch-py-5.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/elasticsearch-py-7.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/certifi-2018.01.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/urllib3-1.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/voluptuous-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/jre:1.8 dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nosexcover[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=Tending time-series indices in Elasticsearch
+EAPI=6
+HOMEPAGE=https://github.com/elasticsearch/curator
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/elasticsearch-py-5.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/elasticsearch-py-7.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/certifi-2018.01.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/urllib3-1.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/voluptuous-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elasticsearch/curator/archive/v5.5.1.tar.gz -> elasticsearch-curator-5.5.1.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.2.4.tar.gz )
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aac520230d59433a7256dc30eeaf3014
diff --git a/metadata/md5-cache/dev-python/fs-2.0.21 b/metadata/md5-cache/dev-python/fs-2.0.21
new file mode 100644
index 000000000000..31481175ce76
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fs-2.0.21
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/dexml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mako[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Filesystem abstraction layer
+EAPI=6
+HOMEPAGE=https://pypi.org/project/fs/ https://docs.pyfilesystem.org https://www.willmcgugan.com/tag/fs/
+IUSE=test python_targets_pypy 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 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/dexml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/f/fs/fs-2.0.21.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d138e49aece6b178454ec44414468813
diff --git a/metadata/md5-cache/dev-python/gnuplot-py-1.8-r1 b/metadata/md5-cache/dev-python/gnuplot-py-1.8-r1
index 8ab81da0b60e..6d3d28070d7c 100644
--- a/metadata/md5-cache/dev-python/gnuplot-py-1.8-r1
+++ b/metadata/md5-cache/dev-python/gnuplot-py-1.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A python wrapper for Gnuplot
 EAPI=5
 HOMEPAGE=http://gnuplot-py.sourceforge.net/
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-visualization/gnuplot python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot-py/gnuplot-py-1.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e0e2512bf6d037d1b7ad5a8e7d613ba1
+_md5_=7302d8341a075b3920395668ba445d06
diff --git a/metadata/md5-cache/dev-python/ipython-3.2.1-r1 b/metadata/md5-cache/dev-python/ipython-3.2.1-r1
index 179bac134bd1..1b2432e504ee 100644
--- a/metadata/md5-cache/dev-python/ipython-3.2.1-r1
+++ b/metadata/md5-cache/dev-python/ipython-3.2.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced interactive shell for Python
 EAPI=5
 HOMEPAGE=http://ipython.org/
 IUSE=doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=amd64 arm ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( 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(-)] ) mongodb? ( <dev-python/pymongo-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(-)] ) octave? ( dev-python/oct2py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) smp? ( >=dev-python/pyzmq-13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) notebook? ( dev-libs/mathjax dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mistune-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/terminado-0.3.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(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) nbconvert? ( || ( >=net-libs/nodejs-0.9.12 >=app-text/pandoc-1.12.1 ) dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mistune-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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(-)] ) 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(-),svg] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),svg] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),svg] ) dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,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=test? ( doc matplotlib mongodb notebook nbconvert octave qt4 wxwidgets ) doc? ( mongodb ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-3.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f08e1e9a0c97231386c3d40aa9c4bc6
+_md5_=80d23dcf4689a30dfe1d51d8419e53d2
diff --git a/metadata/md5-cache/dev-python/jedi-0.12.0 b/metadata/md5-cache/dev-python/jedi-0.12.0
new file mode 100644
index 000000000000..edea198e9747
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jedi-0.12.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(-)] doc? ( dev-python/sphinx ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parso-0.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Autocompletion library for Python
+EAPI=6
+HOMEPAGE=https://github.com/davidhalter/jedi
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/parso-0.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/davidhalter/jedi/archive/v0.12.0.tar.gz -> jedi-0.12.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7644c27d033bfa69440bdd7bff870566
diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.4.0 b/metadata/md5-cache/dev-python/jupyter_core-4.4.0
index 2e669d1a480d..81a355235e72 100644
--- a/metadata/md5-cache/dev-python/jupyter_core-4.4.0
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.4.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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 )
+RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.4.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c44dd404b0b068f5234ecaab77d69a87
+_md5_=c339042d685a47f0f6af34461657e97d
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.0 b/metadata/md5-cache/dev-python/matplotlib-2.2.0
deleted file mode 100644
index 6edbf7187a99..000000000000
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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/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 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-gallery-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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=https://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 ~arm ~arm64 ~ppc ~ppc64 ~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/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 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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=mirror://pypi/m/matplotlib/matplotlib-2.2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1189b7781664e21d7b9c27619b77ef3f
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.2 b/metadata/md5-cache/dev-python/matplotlib-2.2.2
deleted file mode 100644
index 1ed60516dc95..000000000000
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-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/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 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-gallery-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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=https://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 ~ppc ~ppc64 ~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/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 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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=mirror://pypi/m/matplotlib/matplotlib-2.2.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98fe2c9dcda717758c309db348853726
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1 b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
new file mode 100644
index 000000000000..863283c7935b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
@@ -0,0 +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/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 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-gallery-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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=https://matplotlib.org/
+IUSE=cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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/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 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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 ) 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=mirror://pypi/m/matplotlib/matplotlib-2.2.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=964fd6c1c3b964bac8190961844d09a4
diff --git a/metadata/md5-cache/dev-python/matplotlib-9999 b/metadata/md5-cache/dev-python/matplotlib-9999
index 5f555c092819..4ec92e0abc8c 100644
--- a/metadata/md5-cache/dev-python/matplotlib-9999
+++ b/metadata/md5-cache/dev-python/matplotlib-9999
@@ -3,10 +3,10 @@ DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-
 DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=5
 HOMEPAGE=https://matplotlib.org/
-IUSE=cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+IUSE=cairo doc excel examples fltk gtk2 gtk3 latex qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
 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/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)] ) fltk? ( dev-python/pyfltk[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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(-)] ) qt4? ( dev-python/PyQt4[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 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex pyside qt5 qt4 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_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.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)] ) fltk? ( dev-python/pyfltk[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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 ) 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 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=61376ed9831f674b3ebc4b38e06f902d
+_md5_=5cbe15e059b0194826d7a3ad8d9a2ebc
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-3.25.1 b/metadata/md5-cache/dev-python/oslo-concurrency-3.25.1
new file mode 100644
index 000000000000..72ee5c6ef749
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-3.25.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/oslotest-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sphinx-1.6.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openstackdocstheme-1.18.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/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/eventlet-0.21.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/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=library for running multi-thread, multi-process applications
+EAPI=6
+HOMEPAGE=https://pypi.org/project/oslo.concurrency/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fasteners-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.concurrency/oslo.concurrency-3.25.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=43374bdd8467d18ed002cd984099d48d
diff --git a/metadata/md5-cache/dev-python/oslo-db-4.33.1 b/metadata/md5-cache/dev-python/oslo-db-4.33.1
new file mode 100644
index 000000000000..196f2ff8e21e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-db-4.33.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=OpenStack Common DB Code
+EAPI=6
+HOMEPAGE=https://launchpad.net/oslo
+IUSE=+sqlite mysql postgres python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( || ( dev-python/pymysql[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.db/oslo.db-4.33.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=14da5ce19727a4d1fc753f905b8215a4
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.3 b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.3
new file mode 100644
index 000000000000..c0495740c3d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.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_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A library that provides a generic versioned and RPC-friendly object model.
+EAPI=6
+HOMEPAGE=http://docs.openstack.org/developer/oslo.versionedobjects
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_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/o/oslo.versionedobjects/oslo.versionedobjects-1.31.3.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=93ba265fb926cc8cddc715c7baadc7b8
diff --git a/metadata/md5-cache/dev-python/pandas-0.16.2 b/metadata/md5-cache/dev-python/pandas-0.16.2
deleted file mode 100644
index f3c482879a90..000000000000
--- a/metadata/md5-cache/dev-python/pandas-0.16.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cython-0.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openpyxl-1.6.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/openpyxl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytables-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-misc/xclip ) test? ( >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/openpyxl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pymysql[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/statsmodels[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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(-)] x11-misc/xclip x11-misc/xsel ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Powerful data structures for data analysis and statistics
-EAPI=5
-HOMEPAGE=http://pandas.pydata.org/
-IUSE=doc excel html test R 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/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytables[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] excel? ( dev-python/xlrd[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openpyxl-1.6.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(-)] ) ) html? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) R? ( dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pandas/pandas-0.16.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=72f778d91e16720ec53dbda94c168bf4
diff --git a/metadata/md5-cache/dev-python/pandas-0.17.0 b/metadata/md5-cache/dev-python/pandas-0.17.0
deleted file mode 100644
index 20cb3bca50e0..000000000000
--- a/metadata/md5-cache/dev-python/pandas-0.17.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cython-0.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openpyxl-1.6.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/pytables-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] x11-misc/xclip ) test? ( >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/openpyxl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pymysql[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/statsmodels[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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(-)] x11-misc/xclip x11-misc/xsel ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Powerful data structures for data analysis and statistics
-EAPI=5
-HOMEPAGE=http://pandas.pydata.org/
-IUSE=doc excel html test R 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/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytables[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] excel? ( dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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-python/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openpyxl-1.6.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(-)] ) ) html? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) R? ( dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pandas/pandas-0.17.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c1e0d9586581441c26e73e6c153c896
diff --git a/metadata/md5-cache/dev-python/pandas-0.17.1 b/metadata/md5-cache/dev-python/pandas-0.17.1
deleted file mode 100644
index eab8a18d919d..000000000000
--- a/metadata/md5-cache/dev-python/pandas-0.17.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/cython-0.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openpyxl-1.6.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/pytables-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/openpyxl-1.6.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/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/statsmodels[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.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/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( 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/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pymysql[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psycopg: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(-)] x11-misc/xclip x11-misc/xsel ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Powerful data structures for data analysis and statistics
-EAPI=5
-HOMEPAGE=http://pandas.pydata.org/
-IUSE=doc -minimal full-support test X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !minimal? ( dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) full-support? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/openpyxl-1.6.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/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/statsmodels[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.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/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( 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/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pandas/pandas-0.17.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d14d098d08dc19574955c34a8a832643
diff --git a/metadata/md5-cache/dev-python/pandas-0.20.1 b/metadata/md5-cache/dev-python/pandas-0.20.1
deleted file mode 100644
index f9cb793ffbc0..000000000000
--- a/metadata/md5-cache/dev-python/pandas-0.20.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/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(-)] doc? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openpyxl-1.6.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/pytables-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/openpyxl-1.6.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/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/statsmodels[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.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/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( 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/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pymysql[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psycopg: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(-)] x11-misc/xclip x11-misc/xsel ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Powerful data structures for data analysis and statistics
-EAPI=6
-HOMEPAGE=http://pandas.pydata.org/
-IUSE=doc -minimal full-support test X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !minimal? ( dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) full-support? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/openpyxl-1.6.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/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/statsmodels[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.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/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( 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/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pandas/pandas-0.20.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6fe3a9dea92ec300c8972d6a4cd5f41c
diff --git a/metadata/md5-cache/dev-python/pandas-0.20.3 b/metadata/md5-cache/dev-python/pandas-0.20.3
deleted file mode 100644
index caccffc13fd4..000000000000
--- a/metadata/md5-cache/dev-python/pandas-0.20.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/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(-)] doc? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost app-text/pandoc dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openpyxl-1.6.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/pytables-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/openpyxl-1.6.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/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/statsmodels[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.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/xarray[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( 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/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pymysql[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psycopg: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(-)] x11-misc/xclip x11-misc/xsel ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Powerful data structures for data analysis and statistics
-EAPI=6
-HOMEPAGE=http://pandas.pydata.org/
-IUSE=doc -minimal full-support test X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !minimal? ( dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) full-support? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/openpyxl-1.6.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/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/statsmodels[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.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/xarray[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( 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/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pandas/pandas-0.20.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4c20226d62408308d6ad41594badce94
diff --git a/metadata/md5-cache/dev-python/pyqwt-5.2.0-r2 b/metadata/md5-cache/dev-python/pyqwt-5.2.0-r2
index b861d2be215e..391e3a2a90f7 100644
--- a/metadata/md5-cache/dev-python/pyqwt-5.2.0-r2
+++ b/metadata/md5-cache/dev-python/pyqwt-5.2.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Qwt library
 EAPI=5
 HOMEPAGE=http://pyqwt.sourceforge.net/
 IUSE=debug doc examples svg python_targets_python2_7
-KEYWORDS=amd64 arm ia64 x86
+KEYWORDS=amd64 ~arm ia64 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_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),compat(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/qwt:5[svg?]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=5
 SRC_URI=mirror://sourceforge/pyqwt/PyQwt-5.2.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bdb427268eaa9e21c90a73a966f8db0e
+_md5_=2ec68dc86a0cf6d74f2678a954ae7fc8
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-2.10.0 b/metadata/md5-cache/dev-python/python-glanceclient-2.10.0
index 88b10708d77f..90d59924b3a7 100644
--- a/metadata/md5-cache/dev-python/python-glanceclient-2.10.0
+++ b/metadata/md5-cache/dev-python/python-glanceclient-2.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=A client for the OpenStack Glance API
 EAPI=6
 HOMEPAGE=https://github.com/openstack/python-glanceclient
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/warlock-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/warlock-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wrapt-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-16.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-2.10.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0c2f25d1e23e7a5a52dc0da16ccf98b6
+_md5_=80623bb31594aca6008a9edf87c9b595
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-2.9.1 b/metadata/md5-cache/dev-python/python-glanceclient-2.9.1
deleted file mode 100644
index ef9727e2bcce..000000000000
--- a/metadata/md5-cache/dev-python/python-glanceclient-2.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 test? ( >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ordereddict-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/os-client-config-1.28.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/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-mock-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sphinx-1.6.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A client for the OpenStack Glance API
-EAPI=6
-HOMEPAGE=https://github.com/openstack/python-glanceclient
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/warlock-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/warlock-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wrapt-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-16.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-2.9.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b743de24a307dcf3173abb4f40ee931b
diff --git a/metadata/md5-cache/dev-python/pyudev-0.20.0 b/metadata/md5-cache/dev-python/pyudev-0.20.0
deleted file mode 100644
index 47d066f0d7d9..000000000000
--- a/metadata/md5-cache/dev-python/pyudev-0.20.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/udev 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(-)] pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(-)] ) pyside? ( dev-python/pyside[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_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/hypothesis[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.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(-)] ) python_targets_python2_7? ( >=dev-lang/python-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 binding to libudev
-EAPI=6
-HOMEPAGE=https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev
-IUSE=pygobject qt4 pyside test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/udev 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(-)] pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(-)] ) pyside? ( dev-python/pyside[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 ) >=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=pygobject? ( || ( python_targets_python2_7 ) ) pyside? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyudev/pyudev-0.20.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d33800ba41adbd31260c7b2eb03d7b63
diff --git a/metadata/md5-cache/dev-python/pyudev-0.20.0-r1 b/metadata/md5-cache/dev-python/pyudev-0.20.0-r1
new file mode 100644
index 000000000000..bd258a4a737a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyudev-0.20.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] virtual/udev pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/hypothesis[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.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(-)] ) python_targets_python2_7? ( >=dev-lang/python-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 binding to libudev
+EAPI=6
+HOMEPAGE=https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev
+IUSE=pygobject test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=amd64 arm ~arm64 x86
+LICENSE=LGPL-2.1
+RDEPEND=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(-)] virtual/udev pygobject? ( dev-python/pygobject:2[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=pygobject? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyudev/pyudev-0.20.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=93136cad7cca244d2ca56b83b5dabb3a
diff --git a/metadata/md5-cache/dev-python/pyudev-0.21.0 b/metadata/md5-cache/dev-python/pyudev-0.21.0
index 61d9553d7f6e..662d17d9dcae 100644
--- a/metadata/md5-cache/dev-python/pyudev-0.21.0
+++ b/metadata/md5-cache/dev-python/pyudev-0.21.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/udev 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(-)] pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pyside? ( dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/hypothesis[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=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(-)] virtual/udev pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/hypothesis[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python binding to libudev
 EAPI=6
 HOMEPAGE=https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev
-IUSE=pygobject qt5 pyside test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=pygobject qt5 test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 arm ~arm64 ~mips ~x86
 LICENSE=LGPL-2.1
-RDEPEND=virtual/udev 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(-)] pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pyside? ( dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/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(-)] virtual/udev pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=pygobject? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyudev/pyudev-0.21.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c9ce16278993c896261abc96af769c9
+_md5_=2d413ef3ff9ba974a387eac5e4f6e567
diff --git a/metadata/md5-cache/dev-python/restkit-4.2.2 b/metadata/md5-cache/dev-python/restkit-4.2.2
index 391611cede5f..d833946b756c 100644
--- a/metadata/md5-cache/dev-python/restkit-4.2.2
+++ b/metadata/md5-cache/dev-python/restkit-4.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=A HTTP ressource kit for Python
 EAPI=5
 HOMEPAGE=https://github.com/benoitc/restkit
 IUSE=+cli doc examples test python_targets_pypy python_targets_python2_7
-KEYWORDS=amd64 arm ~arm64 ppc64 ~s390 ~sh x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 ~s390 ~sh x86
 LICENSE=MIT
 RDEPEND=cli? ( dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/webob[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/socketpool-0.5.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/http-parser-0.8.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/restkit/restkit-4.2.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cac2e2d3c54fb15cbf0b8da50e5a4bcc
+_md5_=834e3e7fdc19d68ff011c835b28ef588
diff --git a/metadata/md5-cache/dev-python/sip-4.19.3 b/metadata/md5-cache/dev-python/sip-4.19.3
deleted file mode 100644
index 350ffa6b523c..000000000000
--- a/metadata/md5-cache/dev-python/sip-4.19.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python extension module generator for C and C++ libraries
-EAPI=6
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
-IUSE=debug doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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/12
-SRC_URI=mirror://sourceforge/pyqt/sip-4.19.3.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=b357674a84acc56ccc38a78299a96953
diff --git a/metadata/md5-cache/dev-python/sip-4.19.7 b/metadata/md5-cache/dev-python/sip-4.19.7
deleted file mode 100644
index b502c367cd57..000000000000
--- a/metadata/md5-cache/dev-python/sip-4.19.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python extension module generator for C and C++ libraries
-EAPI=6
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
-IUSE=debug doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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/12
-SRC_URI=mirror://sourceforge/pyqt/sip-4.19.7.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=d5ec3f36b0cc16388a043b4304f8832f
diff --git a/metadata/md5-cache/dev-python/tooz-1.60.1 b/metadata/md5-cache/dev-python/tooz-1.60.1
new file mode 100644
index 000000000000..d51306a734f4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tooz-1.60.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_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(-)] python_targets_python2_7? ( >=dev-lang/python-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=Library centralizing the most common distributed primitives
+EAPI=6
+HOMEPAGE=http://docs.openstack.org/developer/tooz/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/voluptuous-0.8.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fasteners-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/futurist-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/futurist-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-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/t/tooz/tooz-1.60.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=57a5d8d91ddd5c7199c9249281c80559
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 01b29678ed53..9539e163eb7e 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/assistant-5.11.0_beta4 b/metadata/md5-cache/dev-qt/assistant-5.11.0_beta4
deleted file mode 100644
index 2f6e47ac6a8a..000000000000
--- a/metadata/md5-cache/dev-qt/assistant-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qthelp-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtprintsupport-5.11.0_beta4 ~dev-qt/qtsql-5.11.0_beta4[sqlite] ~dev-qt/qtwidgets-5.11.0_beta4 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=webkit debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qthelp-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtprintsupport-5.11.0_beta4 ~dev-qt/qtsql-5.11.0_beta4[sqlite] ~dev-qt/qtwidgets-5.11.0_beta4 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qttools-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a806569a20446ff23f59a051b2aaec37
diff --git a/metadata/md5-cache/dev-qt/assistant-5.11.0_rc b/metadata/md5-cache/dev-qt/assistant-5.11.0_rc
new file mode 100644
index 000000000000..b04353572525
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/assistant-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qthelp-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtprintsupport-5.11.0_rc ~dev-qt/qtsql-5.11.0_rc[sqlite] ~dev-qt/qtwidgets-5.11.0_rc webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=webkit debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qthelp-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtprintsupport-5.11.0_rc ~dev-qt/qtsql-5.11.0_rc[sqlite] ~dev-qt/qtwidgets-5.11.0_rc webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qttools-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a806569a20446ff23f59a051b2aaec37
diff --git a/metadata/md5-cache/dev-qt/assistant-5.7.1 b/metadata/md5-cache/dev-qt/assistant-5.7.1
deleted file mode 100644
index 62d17cd0934b..000000000000
--- a/metadata/md5-cache/dev-qt/assistant-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qthelp-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtprintsupport-5.7.1 ~dev-qt/qtsql-5.7.1[sqlite] ~dev-qt/qtwidgets-5.7.1 webkit? ( ~dev-qt/qtwebkit-5.7.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=webkit debug test
-KEYWORDS=amd64 arm ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qthelp-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtprintsupport-5.7.1 ~dev-qt/qtsql-5.7.1[sqlite] ~dev-qt/qtwidgets-5.7.1 webkit? ( ~dev-qt/qtwebkit-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=de955874787a8d09b48d66997db7bf7e
diff --git a/metadata/md5-cache/dev-qt/designer-5.11.0_beta4 b/metadata/md5-cache/dev-qt/designer-5.11.0_beta4
deleted file mode 100644
index 08f3bcefb57c..000000000000
--- a/metadata/md5-cache/dev-qt/designer-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtprintsupport-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 ~dev-qt/qtxml-5.11.0_beta4 declarative? ( ~dev-qt/qtdeclarative-5.11.0_beta4[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=declarative webkit debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtprintsupport-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 ~dev-qt/qtxml-5.11.0_beta4 declarative? ( ~dev-qt/qtdeclarative-5.11.0_beta4[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qttools-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e457aa12152d0587b8e92634117361b
diff --git a/metadata/md5-cache/dev-qt/designer-5.11.0_rc b/metadata/md5-cache/dev-qt/designer-5.11.0_rc
new file mode 100644
index 000000000000..25136447b241
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/designer-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtprintsupport-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc ~dev-qt/qtxml-5.11.0_rc declarative? ( ~dev-qt/qtdeclarative-5.11.0_rc[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=declarative webkit debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtprintsupport-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc ~dev-qt/qtxml-5.11.0_rc declarative? ( ~dev-qt/qtdeclarative-5.11.0_rc[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qttools-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6e457aa12152d0587b8e92634117361b
diff --git a/metadata/md5-cache/dev-qt/designer-5.7.1 b/metadata/md5-cache/dev-qt/designer-5.7.1
deleted file mode 100644
index 4d393597cedf..000000000000
--- a/metadata/md5-cache/dev-qt/designer-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtprintsupport-5.7.1 ~dev-qt/qtwidgets-5.7.1 ~dev-qt/qtxml-5.7.1 declarative? ( ~dev-qt/qtdeclarative-5.7.1[widgets] ) webkit? ( ~dev-qt/qtwebkit-5.7.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=declarative webkit debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtprintsupport-5.7.1 ~dev-qt/qtwidgets-5.7.1 ~dev-qt/qtxml-5.7.1 declarative? ( ~dev-qt/qtdeclarative-5.7.1[widgets] ) webkit? ( ~dev-qt/qtwebkit-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=65e8725189331a3117b88194437a6f0d
diff --git a/metadata/md5-cache/dev-qt/linguist-5.11.0_beta4 b/metadata/md5-cache/dev-qt/linguist-5.11.0_beta4
deleted file mode 100644
index 7b63e3d24c21..000000000000
--- a/metadata/md5-cache/dev-qt/linguist-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/designer-5.11.0_beta4 ~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtprintsupport-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 ~dev-qt/qtxml-5.11.0_beta4 >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Graphical tool for translating Qt applications
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/designer-5.11.0_beta4 ~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtprintsupport-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 ~dev-qt/qtxml-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qttools-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1eab028f7652bdd056fd000f222db821
diff --git a/metadata/md5-cache/dev-qt/linguist-5.11.0_rc b/metadata/md5-cache/dev-qt/linguist-5.11.0_rc
new file mode 100644
index 000000000000..7bb824072505
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/linguist-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/designer-5.11.0_rc ~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtprintsupport-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc ~dev-qt/qtxml-5.11.0_rc >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Graphical tool for translating Qt applications
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/designer-5.11.0_rc ~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtprintsupport-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc ~dev-qt/qtxml-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qttools-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1eab028f7652bdd056fd000f222db821
diff --git a/metadata/md5-cache/dev-qt/linguist-5.7.1 b/metadata/md5-cache/dev-qt/linguist-5.7.1
deleted file mode 100644
index cd0592ba9f9e..000000000000
--- a/metadata/md5-cache/dev-qt/linguist-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/designer-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtprintsupport-5.7.1 ~dev-qt/qtwidgets-5.7.1 ~dev-qt/qtxml-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Graphical tool for translating Qt applications
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/designer-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtprintsupport-5.7.1 ~dev-qt/qtwidgets-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=a3ee70abae8cae0fb3fb0b5f636404be
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.11.0_beta4 b/metadata/md5-cache/dev-qt/linguist-tools-5.11.0_beta4
deleted file mode 100644
index 66ab281e494d..000000000000
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtxml-5.11.0_beta4 qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Tools for working with Qt translation data files
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtxml-5.11.0_beta4 qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qttools-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b2c6081cee5a28bad10428d856bfe6ad
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.11.0_rc b/metadata/md5-cache/dev-qt/linguist-tools-5.11.0_rc
new file mode 100644
index 000000000000..06ef37c2e588
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtxml-5.11.0_rc qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Tools for working with Qt translation data files
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtxml-5.11.0_rc qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qttools-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=b2c6081cee5a28bad10428d856bfe6ad
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.7.1 b/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
deleted file mode 100644
index 5ad62b975cab..000000000000
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtxml-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Tools for working with Qt translation data files
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtxml-5.7.1 qml? ( ~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/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=dbeed594e096764ff6642240bd1240cf
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.11.0_beta4 b/metadata/md5-cache/dev-qt/pixeltool-5.11.0_beta4
deleted file mode 100644
index 283f255cc52b..000000000000
--- a/metadata/md5-cache/dev-qt/pixeltool-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Qt screen magnifier
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qttools-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=aa9b9c5c415920bd5268209770a0eb97
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.11.0_rc b/metadata/md5-cache/dev-qt/pixeltool-5.11.0_rc
new file mode 100644
index 000000000000..3ff2c14cd83f
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Qt screen magnifier
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qttools-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=aa9b9c5c415920bd5268209770a0eb97
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.7.1 b/metadata/md5-cache/dev-qt/pixeltool-5.7.1
deleted file mode 100644
index 7b41a11d75d9..000000000000
--- a/metadata/md5-cache/dev-qt/pixeltool-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtwidgets-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Qt screen magnifier
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtwidgets-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=665ad50021991975ec683a46c3a3b72d
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qdbus-5.11.0_beta4
deleted file mode 100644
index 03bc6b804de6..000000000000
--- a/metadata/md5-cache/dev-qt/qdbus-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdbus-5.11.0_beta4 ~dev-qt/qtxml-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Interface to Qt applications communicating over D-Bus
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdbus-5.11.0_beta4 ~dev-qt/qtxml-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qttools-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=ae627c0d21e8b38a694f94526832d4cc
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.11.0_rc b/metadata/md5-cache/dev-qt/qdbus-5.11.0_rc
new file mode 100644
index 000000000000..cb80c44c97e4
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdbus-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdbus-5.11.0_rc ~dev-qt/qtxml-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Interface to Qt applications communicating over D-Bus
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdbus-5.11.0_rc ~dev-qt/qtxml-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qttools-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=ae627c0d21e8b38a694f94526832d4cc
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.7.1 b/metadata/md5-cache/dev-qt/qdbus-5.7.1
deleted file mode 100644
index 298bca48a056..000000000000
--- a/metadata/md5-cache/dev-qt/qdbus-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 ~dev-qt/qtxml-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Interface to Qt applications communicating over D-Bus
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=6dda8a2de2af7ed29b71cc6fdc914ed4
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qdbusviewer-5.11.0_beta4
deleted file mode 100644
index cd6dd77df594..000000000000
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdbus-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 ~dev-qt/qtxml-5.11.0_beta4 >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdbus-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 ~dev-qt/qtxml-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qttools-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=026d648fea2e2719dd01a222f402b634
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.11.0_rc b/metadata/md5-cache/dev-qt/qdbusviewer-5.11.0_rc
new file mode 100644
index 000000000000..e2d3ace76239
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdbus-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc ~dev-qt/qtxml-5.11.0_rc >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdbus-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc ~dev-qt/qtxml-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qttools-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=026d648fea2e2719dd01a222f402b634
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1 b/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
deleted file mode 100644
index e60e0d02610d..000000000000
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 ~dev-qt/qtxml-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f54c355e28463628eed095d295a48211
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qdoc-5.11.0_beta4
deleted file mode 100644
index 8a0a3fb1c507..000000000000
--- a/metadata/md5-cache/dev-qt/qdoc-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Qt documentation generator
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qttools-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=db4b33b5f5ac0c0dd6253ca9ff138949
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.11.0_rc b/metadata/md5-cache/dev-qt/qdoc-5.11.0_rc
new file mode 100644
index 000000000000..74354b0cb0a1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdoc-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Qt documentation generator
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qttools-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=e8c141f83b9b25d10cec09b484ca883f
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.7.1 b/metadata/md5-cache/dev-qt/qdoc-5.7.1
deleted file mode 100644
index 2037f0785a91..000000000000
--- a/metadata/md5-cache/dev-qt/qdoc-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtxml-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Qt documentation generator
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=9d7d023c64c918edf558c7ea703cf9e4
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.7.1_p0 b/metadata/md5-cache/dev-qt/qt-docs-5.7.1_p0
deleted file mode 100644
index 219e77395e83..000000000000
--- a/metadata/md5-cache/dev-qt/qt-docs-5.7.1_p0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/p7zip
-DESCRIPTION=Documentation for Qt5, for use with Qt Creator and other tools
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=FDL-1.3
-SLOT=5
-SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_57_src_doc_examples/qt.57.doc/5.7.1-0qt-everywhere-documentation-5.7.1.7z
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fef72821c41fc689d09566026f2fa150
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qt3d-5.11.0_beta4
deleted file mode 100644
index 21ea6f620bd5..000000000000
--- a/metadata/md5-cache/dev-qt/qt3d-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.11.0_beta4 ~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=The 3D module for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtconcurrent-5.11.0_beta4 ~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4[gles2=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qt3d-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b0f27108666b914c013a885990a9cdd1
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.11.0_rc b/metadata/md5-cache/dev-qt/qt3d-5.11.0_rc
new file mode 100644
index 000000000000..50bb8ecd21e5
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt3d-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtconcurrent-5.11.0_rc ~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.11.0_rc[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=The 3D module for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 qml debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtconcurrent-5.11.0_rc ~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.11.0_rc[gles2=] ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qt3d-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=b0f27108666b914c013a885990a9cdd1
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1 b/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
deleted file mode 100644
index 78487044be67..000000000000
--- a/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-5.7.1[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=The 3D module for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtconcurrent-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-5.7.1[gles2=] ) dev-qt/qtchooser
-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=a14cade7a74204bc44bc18e96f732f95
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtbluetooth-5.11.0_beta4
deleted file mode 100644
index 13a526aaca59..000000000000
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.11.0_beta4 ~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdbus-5.11.0_beta4 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) ~dev-qt/qtnetwork-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Bluetooth support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtconcurrent-5.11.0_beta4 ~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdbus-5.11.0_beta4 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtconnectivity-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=884eb2a940b9d9bdb48ff10e8cc7ef0c
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.11.0_rc b/metadata/md5-cache/dev-qt/qtbluetooth-5.11.0_rc
new file mode 100644
index 000000000000..43954c067fcd
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtconcurrent-5.11.0_rc ~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdbus-5.11.0_rc >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) ~dev-qt/qtnetwork-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Bluetooth support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtconcurrent-5.11.0_rc ~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdbus-5.11.0_rc >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtconnectivity-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=884eb2a940b9d9bdb48ff10e8cc7ef0c
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1 b/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
deleted file mode 100644
index 7e62112012e9..000000000000
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 >=net-wireless/bluez-5 qml? ( ~dev-qt/qtdeclarative-5.7.1 ) ~dev-qt/qtnetwork-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Bluetooth support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtconcurrent-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 >=net-wireless/bluez-5 qml? ( ~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/qtconnectivity-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=2b95f75a1c6c5d4586fe1c7eeb71342f
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtcharts-5.11.0_beta4
deleted file mode 100644
index a4b45539199a..000000000000
--- a/metadata/md5-cache/dev-qt/qtcharts-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Chart component library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtcharts-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=af69ac4f669ba6c4edd9b20ca84fbce7
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.11.0_rc b/metadata/md5-cache/dev-qt/qtcharts-5.11.0_rc
new file mode 100644
index 000000000000..c9654cdb51b4
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Chart component library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtcharts-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=af69ac4f669ba6c4edd9b20ca84fbce7
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.7.1 b/metadata/md5-cache/dev-qt/qtcharts-5.7.1
deleted file mode 100644
index 7a882db358cb..000000000000
--- a/metadata/md5-cache/dev-qt/qtcharts-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Chart component library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 qml? ( ~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/qtcharts-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=7a25fc03e96bb3ae33fa8569bebd2f4e
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtconcurrent-5.11.0_beta4
deleted file mode 100644
index d5c427ca322d..000000000000
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtbase-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=e0d21e9018ebde09f1d42f3997358bc6
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.11.0_rc b/metadata/md5-cache/dev-qt/qtconcurrent-5.11.0_rc
new file mode 100644
index 000000000000..e1b08dadbd64
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtbase-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=e0d21e9018ebde09f1d42f3997358bc6
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1 b/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
deleted file mode 100644
index 9582d3b0892b..000000000000
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=fe9e4778b359dcd21362dc37c1ce3b82
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtcore-5.11.0_beta4
deleted file mode 100644
index a11bfd700480..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Cross-platform application development framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=icu systemd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtbase-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=be768e528b0c0520beaa33cdd458470e
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.11.0_rc b/metadata/md5-cache/dev-qt/qtcore-5.11.0_rc
new file mode 100644
index 000000000000..03cb8b1eff33
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcore-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Cross-platform application development framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=icu systemd debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtbase-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=be768e528b0c0520beaa33cdd458470e
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.7.1-r4 b/metadata/md5-cache/dev-qt/qtcore-5.7.1-r4
deleted file mode 100644
index e81dcbb18d25..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.7.1-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 >=dev-libs/libpcre-8.38[pcre16,unicode] >=sys-libs/zlib-1.2.5 virtual/libiconv icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Cross-platform application development framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=icu systemd debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 >=dev-libs/libpcre-8.38[pcre16,unicode] >=sys-libs/zlib-1.2.5 virtual/libiconv icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=71c3bb666c93a94091cd2ad0de7fcda7
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.11.0_beta4
deleted file mode 100644
index 0924cc22dc75..000000000000
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[gles2=] qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=3D data visualization library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[gles2=] qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4[gles2=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtdatavis3d-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=4f21dea58f96d06896536007b6de8dae
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.11.0_rc b/metadata/md5-cache/dev-qt/qtdatavis3d-5.11.0_rc
new file mode 100644
index 000000000000..f62304e36d69
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[gles2=] qml? ( ~dev-qt/qtdeclarative-5.11.0_rc[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=3D data visualization library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 qml debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[gles2=] qml? ( ~dev-qt/qtdeclarative-5.11.0_rc[gles2=] ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtdatavis3d-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=4f21dea58f96d06896536007b6de8dae
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
deleted file mode 100644
index dbcb50733d2e..000000000000
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] qml? ( ~dev-qt/qtdeclarative-5.7.1[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=3D data visualization library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] qml? ( ~dev-qt/qtdeclarative-5.7.1[gles2=] ) dev-qt/qtchooser
-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=5efd699a913bf017c8ae7b2f715d37cb
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtdbus-5.11.0_beta4
deleted file mode 100644
index c9c17023497a..000000000000
--- a/metadata/md5-cache/dev-qt/qtdbus-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 >=sys-apps/dbus-1.4.20 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtbase-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=8b64ca343bce4d85931415fb5adba30b
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.11.0_rc b/metadata/md5-cache/dev-qt/qtdbus-5.11.0_rc
new file mode 100644
index 000000000000..9525aafaa9c2
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc >=sys-apps/dbus-1.4.20 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtbase-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=8b64ca343bce4d85931415fb5adba30b
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.7.1 b/metadata/md5-cache/dev-qt/qtdbus-5.7.1
deleted file mode 100644
index 73480f806c82..000000000000
--- a/metadata/md5-cache/dev-qt/qtdbus-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 >=sys-apps/dbus-1.4.20 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=300d9f5a3bb98682966d30148e5f7e0c
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtdeclarative-5.11.0_beta4
deleted file mode 100644
index 840ab742fe54..000000000000
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[gles2=] ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qttest-5.11.0_beta4 localstorage? ( ~dev-qt/qtsql-5.11.0_beta4 ) widgets? ( ~dev-qt/qtwidgets-5.11.0_beta4[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtxmlpatterns-5.11.0_beta4 ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=The QML and Quick modules for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 +jit localstorage +widgets xml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[gles2=] ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qttest-5.11.0_beta4 localstorage? ( ~dev-qt/qtsql-5.11.0_beta4 ) widgets? ( ~dev-qt/qtwidgets-5.11.0_beta4[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtxmlpatterns-5.11.0_beta4 ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtdeclarative-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f7e14083a7092837d217d585263d2e0c
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.11.0_rc b/metadata/md5-cache/dev-qt/qtdeclarative-5.11.0_rc
new file mode 100644
index 000000000000..ba41368a55ec
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[gles2=] ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qttest-5.11.0_rc localstorage? ( ~dev-qt/qtsql-5.11.0_rc ) widgets? ( ~dev-qt/qtwidgets-5.11.0_rc[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtxmlpatterns-5.11.0_rc ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=The QML and Quick modules for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 +jit localstorage +widgets xml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[gles2=] ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qttest-5.11.0_rc localstorage? ( ~dev-qt/qtsql-5.11.0_rc ) widgets? ( ~dev-qt/qtwidgets-5.11.0_rc[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtxmlpatterns-5.11.0_rc ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtdeclarative-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=f7e14083a7092837d217d585263d2e0c
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
deleted file mode 100644
index 1ebb0d2ac887..000000000000
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qttest-5.7.1 localstorage? ( ~dev-qt/qtsql-5.7.1 ) widgets? ( ~dev-qt/qtwidgets-5.7.1[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtxmlpatterns-5.7.1 ) || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=The QML and Quick modules for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 +jit localstorage +widgets xml debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qttest-5.7.1 localstorage? ( ~dev-qt/qtsql-5.7.1 ) widgets? ( ~dev-qt/qtwidgets-5.7.1[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtxmlpatterns-5.7.1 ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=a8af5249538078cea32ae862082c617c
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtdiag-5.11.0_beta4
deleted file mode 100644
index 30ca41c16424..000000000000
--- a/metadata/md5-cache/dev-qt/qtdiag-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 network? ( ~dev-qt/qtnetwork-5.11.0_beta4[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+network +widgets debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 network? ( ~dev-qt/qtnetwork-5.11.0_beta4[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.11.0_beta4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qttools-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=95acc32e2d3f5c899322d8c9bc1df214
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.11.0_rc b/metadata/md5-cache/dev-qt/qtdiag-5.11.0_rc
new file mode 100644
index 000000000000..22a5303c874b
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc network? ( ~dev-qt/qtnetwork-5.11.0_rc[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=+network +widgets debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc network? ( ~dev-qt/qtnetwork-5.11.0_rc[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.11.0_rc ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qttools-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=95acc32e2d3f5c899322d8c9bc1df214
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.7.1 b/metadata/md5-cache/dev-qt/qtdiag-5.7.1
deleted file mode 100644
index 988cec41b2f8..000000000000
--- a/metadata/md5-cache/dev-qt/qtdiag-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1[ssl=] dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+ssl debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1[ssl=] 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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=708fd8fee5f122532763ee938714342c
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.0_beta4
deleted file mode 100644
index f8b235c1d86e..000000000000
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Set of QML types for adding visual effects to user interfaces
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtgraphicaleffects-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=379988901174bbbe1ecd1dae36bb81f9
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.0_rc b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.0_rc
new file mode 100644
index 000000000000..ce888b67a8cb
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Set of QML types for adding visual effects to user interfaces
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtgraphicaleffects-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=379988901174bbbe1ecd1dae36bb81f9
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
deleted file mode 100644
index 37a3413af029..000000000000
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Set of QML types for adding visual effects to user interfaces
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-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/qtgraphicaleffects-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=9c6d36e0a8bba5a791b151bbafc83bf0
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtgui-5.11.0_beta4
deleted file mode 100644
index 47d7ac3c4043..000000000000
--- a/metadata/md5-cache/dev-qt/qtgui-5.11.0_beta4
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.11.0_beta4 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.11.0_beta4 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.11.0_beta4 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.11.0_beta4 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus )
-RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.11.0_beta4 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.11.0_beta4 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.11.0_beta4 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.11.0_beta4 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
-REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) xcb? ( gles2? ( egl ) )
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtbase-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=9664649dd54f89528ce47e28da9cfe71
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.11.0_rc b/metadata/md5-cache/dev-qt/qtgui-5.11.0_rc
new file mode 100644
index 000000000000..72b0baaaea89
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgui-5.11.0_rc
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.11.0_rc media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.11.0_rc ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.11.0_rc ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.11.0_rc ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc +xcb debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=ibus? ( app-i18n/ibus )
+RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.11.0_rc media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.11.0_rc ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.11.0_rc ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.11.0_rc ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
+REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) xcb? ( gles2? ( egl ) )
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtbase-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=9664649dd54f89528ce47e28da9cfe71
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
deleted file mode 100644
index 77a5744aa21d..000000000000
--- a/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.7.1 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.0.6:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.7.1 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango !!x11-libs/cairo[qt4] ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.7.1 ) udev? ( virtual/libudev:= ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.4 x11-libs/libXrender >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=accessibility dbus egl eglfs evdev +gif gles2 gtk ibus jpeg libinput +png tslib tuio +udev +xcb debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus )
-RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.7.1 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.0.6:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.7.1 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango !!x11-libs/cairo[qt4] ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.7.1 ) udev? ( virtual/libudev:= ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.4 x11-libs/libXrender >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
-REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) xcb? ( gles2? ( egl ) )
-RESTRICT=test
-SLOT=5/5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f3f7e257dfac151c52801eeae2bb30a3
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qthelp-5.11.0_beta4
deleted file mode 100644
index f5692830ebb7..000000000000
--- a/metadata/md5-cache/dev-qt/qthelp-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtsql-5.11.0_beta4[sqlite] ~dev-qt/qtwidgets-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Qt5 module for integrating online documentation into applications
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtsql-5.11.0_beta4[sqlite] ~dev-qt/qtwidgets-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qttools-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=e785501ca5cabe1d612a5aeda613dbac
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.11.0_rc b/metadata/md5-cache/dev-qt/qthelp-5.11.0_rc
new file mode 100644
index 000000000000..ae7e97f91cb6
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qthelp-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtsql-5.11.0_rc[sqlite] ~dev-qt/qtwidgets-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Qt5 module for integrating online documentation into applications
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtsql-5.11.0_rc[sqlite] ~dev-qt/qtwidgets-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qttools-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=e785501ca5cabe1d612a5aeda613dbac
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.7.1 b/metadata/md5-cache/dev-qt/qthelp-5.7.1
deleted file mode 100644
index 622498f2f71a..000000000000
--- a/metadata/md5-cache/dev-qt/qthelp-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtsql-5.7.1[sqlite] ~dev-qt/qtwidgets-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Qt5 module for integrating online documentation into applications
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtsql-5.7.1[sqlite] ~dev-qt/qtwidgets-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=fa55ec04300e0ca5a2486351482374c2
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtimageformats-5.11.0_beta4
deleted file mode 100644
index 09fc28031473..000000000000
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Additional format plugins for the Qt image I/O system
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=jpeg2k mng debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtimageformats-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=30de7f78795a3cf32bbc4e02a68add81
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.11.0_rc b/metadata/md5-cache/dev-qt/qtimageformats-5.11.0_rc
new file mode 100644
index 000000000000..e8d7e1338377
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Additional format plugins for the Qt image I/O system
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=jpeg2k mng debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtimageformats-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=30de7f78795a3cf32bbc4e02a68add81
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.7.1 b/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
deleted file mode 100644
index 47888d258454..000000000000
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 media-libs/jasper:= media-libs/libmng:= media-libs/libwebp:= media-libs/tiff:0 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Additional format plugins for the Qt image I/O system
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 media-libs/jasper:= media-libs/libmng:= media-libs/libwebp:= media-libs/tiff:0 dev-qt/qtchooser
-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=5b45684084405c2cb0a770ef1e1b39e5
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtlocation-5.11.0_beta4
deleted file mode 100644
index 4d7eb8bdb611..000000000000
--- a/metadata/md5-cache/dev-qt/qtlocation-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtpositioning-5.11.0_beta4 ~dev-qt/qtsql-5.11.0_beta4 sys-libs/zlib ~dev-qt/qtconcurrent-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=The Location module for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtpositioning-5.11.0_beta4 ~dev-qt/qtsql-5.11.0_beta4 sys-libs/zlib dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtlocation-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=c7083a2d84f0b31591195e3020bada06
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.11.0_rc b/metadata/md5-cache/dev-qt/qtlocation-5.11.0_rc
new file mode 100644
index 000000000000..d4bf2945cc3c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtpositioning-5.11.0_rc ~dev-qt/qtsql-5.11.0_rc sys-libs/zlib ~dev-qt/qtconcurrent-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=The Location module for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtpositioning-5.11.0_rc ~dev-qt/qtsql-5.11.0_rc sys-libs/zlib dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtlocation-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=c7083a2d84f0b31591195e3020bada06
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.7.1 b/metadata/md5-cache/dev-qt/qtlocation-5.7.1
deleted file mode 100644
index d39173e79ea6..000000000000
--- a/metadata/md5-cache/dev-qt/qtlocation-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtpositioning-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=The Location module for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtpositioning-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/qtlocation-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f16af598359c715ab69d2186912d6241
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtmultimedia-5.11.0_beta4
deleted file mode 100644
index 84bb8cd4f806..000000000000
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[gles2=] ~dev-qt/qtnetwork-5.11.0_beta4 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 gles2? ( ~dev-qt/qtgui-5.11.0_beta4[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4[gles2=] ) gstreamer? ( x11-base/xorg-proto ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[gles2=] ~dev-qt/qtnetwork-5.11.0_beta4 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 gles2? ( ~dev-qt/qtgui-5.11.0_beta4[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4[gles2=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtmultimedia-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=111db119313cc09d011437430a162f6d
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.11.0_rc b/metadata/md5-cache/dev-qt/qtmultimedia-5.11.0_rc
new file mode 100644
index 000000000000..9a3df79aa7cf
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[gles2=] ~dev-qt/qtnetwork-5.11.0_rc alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-5.11.0_rc gles2? ( ~dev-qt/qtgui-5.11.0_rc[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc[gles2=] ) gstreamer? ( x11-base/xorg-proto ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[gles2=] ~dev-qt/qtnetwork-5.11.0_rc alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-5.11.0_rc gles2? ( ~dev-qt/qtgui-5.11.0_rc[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc[gles2=] ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtmultimedia-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=111db119313cc09d011437430a162f6d
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1 b/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
deleted file mode 100644
index 7e9705570412..000000000000
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-5.7.1 gles2? ( ~dev-qt/qtgui-5.7.1[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.7.1 ~dev-qt/qtwidgets-5.7.1[gles2=] ) gstreamer? ( x11-base/xorg-proto ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-5.7.1 gles2? ( ~dev-qt/qtgui-5.7.1[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.7.1 ~dev-qt/qtwidgets-5.7.1[gles2=] ) dev-qt/qtchooser
-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=e5bd3e37c5e9480ac51cb000dd08d7cf
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtnetwork-5.11.0_beta4
deleted file mode 100644
index 327dc36f4589..000000000000
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.11.0_beta4 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.11.0_beta4 ) ssl? ( dev-libs/openssl:0=[bindist=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Network abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=bindist connman libproxy networkmanager +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.11.0_beta4 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.11.0_beta4 ) ssl? ( dev-libs/openssl:0=[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtbase-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=a7471e78cfd122496ffff0fe6a0e9482
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.11.0_rc b/metadata/md5-cache/dev-qt/qtnetwork-5.11.0_rc
new file mode 100644
index 000000000000..98f7cbfd6c29
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.11.0_rc ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.11.0_rc ) ssl? ( dev-libs/openssl:0=[bindist=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Network abstraction library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=bindist connman libproxy networkmanager +ssl debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.11.0_rc ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.11.0_rc ) ssl? ( dev-libs/openssl:0=[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtbase-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=a7471e78cfd122496ffff0fe6a0e9482
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.7.1 b/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
deleted file mode 100644
index 5df48e2fdaa1..000000000000
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.7.1 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.7.1 ) ssl? ( dev-libs/openssl:0[bindist=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Network abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=bindist connman libproxy networkmanager +ssl debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.7.1 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.7.1 ) ssl? ( dev-libs/openssl:0[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) 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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=cd3aab100c8c0dc80d1971f915f37739
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.11.0_beta4
deleted file mode 100644
index 8aa61defe17c..000000000000
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Network authorization library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtnetworkauth-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=c4663a10aeec8aeecbb3d294d2678729
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.11.0_rc b/metadata/md5-cache/dev-qt/qtnetworkauth-5.11.0_rc
new file mode 100644
index 000000000000..dc6e971011fa
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Network authorization library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtnetworkauth-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=c4663a10aeec8aeecbb3d294d2678729
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtopengl-5.11.0_beta4
deleted file mode 100644
index def5087aaec1..000000000000
--- a/metadata/md5-cache/dev-qt/qtopengl-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[gles2=] ~dev-qt/qtwidgets-5.11.0_beta4[gles2=] virtual/opengl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[gles2=] ~dev-qt/qtwidgets-5.11.0_beta4[gles2=] virtual/opengl dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtbase-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=ae3a0b8263c412443340c830b860e149
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.11.0_rc b/metadata/md5-cache/dev-qt/qtopengl-5.11.0_rc
new file mode 100644
index 000000000000..7a54dd9060c8
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[gles2=] ~dev-qt/qtwidgets-5.11.0_rc[gles2=] virtual/opengl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[gles2=] ~dev-qt/qtwidgets-5.11.0_rc[gles2=] virtual/opengl dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtbase-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=ae3a0b8263c412443340c830b860e149
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.7.1 b/metadata/md5-cache/dev-qt/qtopengl-5.7.1
deleted file mode 100644
index ffff25b10a96..000000000000
--- a/metadata/md5-cache/dev-qt/qtopengl-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtwidgets-5.7.1[gles2=] virtual/opengl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 test debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtwidgets-5.7.1[gles2=] virtual/opengl 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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=33702d61bc94ebe2ec41d4e571334f27
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtpaths-5.11.0_beta4
deleted file mode 100644
index 856c452e3ed1..000000000000
--- a/metadata/md5-cache/dev-qt/qtpaths-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Command line client to QStandardPaths
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qttools-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=23375c4eecad9165609c104837158e02
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.11.0_rc b/metadata/md5-cache/dev-qt/qtpaths-5.11.0_rc
new file mode 100644
index 000000000000..e8f119a19b23
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Command line client to QStandardPaths
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qttools-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=23375c4eecad9165609c104837158e02
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.7.1 b/metadata/md5-cache/dev-qt/qtpaths-5.7.1
deleted file mode 100644
index 2bc4e8c37058..000000000000
--- a/metadata/md5-cache/dev-qt/qtpaths-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Command line client to QStandardPaths
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=e7030b81bb1e1985ffae10ff05325f23
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtplugininfo-5.11.0_beta4
deleted file mode 100644
index 9c3d76ce7f29..000000000000
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Qt5 plugin metadata dumper
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qttools-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=a468c26cc030a4f2c3a0cf9b7788dcc4
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.11.0_rc b/metadata/md5-cache/dev-qt/qtplugininfo-5.11.0_rc
new file mode 100644
index 000000000000..8b73bd2cc35d
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Qt5 plugin metadata dumper
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qttools-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=a468c26cc030a4f2c3a0cf9b7788dcc4
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1 b/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
deleted file mode 100644
index 76d1ca984aa2..000000000000
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Qt5 plugin metadata dumper
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=0643ba650e59cc2fddf0bc18627ce522
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtpositioning-5.11.0_beta4
deleted file mode 100644
index 0bf602632724..000000000000
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.11.0_beta4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 geoclue? ( ~dev-qt/qtdbus-5.11.0_beta4 ) qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Physical position determination library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=geoclue qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=geoclue? ( app-misc/geoclue:0 )
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 geoclue? ( ~dev-qt/qtdbus-5.11.0_beta4 ) qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtlocation-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=8b644476058f63b2739199a96f6889bf
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.11.0_rc b/metadata/md5-cache/dev-qt/qtpositioning-5.11.0_rc
new file mode 100644
index 000000000000..de8ba1dfd8db
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.11.0_rc
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc geoclue? ( ~dev-qt/qtdbus-5.11.0_rc ) qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Physical position determination library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=geoclue qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=geoclue? ( app-misc/geoclue:0 )
+RDEPEND=~dev-qt/qtcore-5.11.0_rc geoclue? ( ~dev-qt/qtdbus-5.11.0_rc ) qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtlocation-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=8b644476058f63b2739199a96f6889bf
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.7.1 b/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
deleted file mode 100644
index 083637e561b6..000000000000
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 geoclue? ( ~dev-qt/qtdbus-5.7.1 ) qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Physical position determination library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=geoclue qml debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=geoclue? ( app-misc/geoclue:0 )
-RDEPEND=~dev-qt/qtcore-5.7.1 geoclue? ( ~dev-qt/qtdbus-5.7.1 ) qml? ( ~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/qtlocation-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b31f28eda98b13c7fad47cd84b0d34e9
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtprintsupport-5.11.0_beta4
deleted file mode 100644
index 4a362f5ca7c3..000000000000
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[gles2=] ~dev-qt/qtwidgets-5.11.0_beta4[gles2=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.11.0_beta4 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Printing support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=cups gles2 test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[gles2=] ~dev-qt/qtwidgets-5.11.0_beta4[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtbase-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=058d99d4e9c66b97dfb3d770c44c5f24
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.11.0_rc b/metadata/md5-cache/dev-qt/qtprintsupport-5.11.0_rc
new file mode 100644
index 000000000000..836638a32d52
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[gles2=] ~dev-qt/qtwidgets-5.11.0_rc[gles2=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.11.0_rc ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Printing support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=cups gles2 test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[gles2=] ~dev-qt/qtwidgets-5.11.0_rc[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtbase-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=058d99d4e9c66b97dfb3d770c44c5f24
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
deleted file mode 100644
index 18d0f1d837a5..000000000000
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtwidgets-5.7.1[gles2=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.7.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Printing support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=cups gles2 test debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtwidgets-5.7.1[gles2=] cups? ( >=net-print/cups-1.4 ) 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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f5562e8a887725d43355c80fe98d6160
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.0_beta4
deleted file mode 100644
index b6fc59088d0a..000000000000
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 widgets? ( ~dev-qt/qtwidgets-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Set of controls used in conjunction with Qt Quick to build complete interfaces
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 widgets? ( ~dev-qt/qtwidgets-5.11.0_beta4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtquickcontrols-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=06cac9e9f94c9abfa93ddd7c99a5870d
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.0_rc b/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.0_rc
new file mode 100644
index 000000000000..44a206370933
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc widgets? ( ~dev-qt/qtwidgets-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Set of controls used in conjunction with Qt Quick to build complete interfaces
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=+widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc widgets? ( ~dev-qt/qtwidgets-5.11.0_rc ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtquickcontrols-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=06cac9e9f94c9abfa93ddd7c99a5870d
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
deleted file mode 100644
index d3b7646e7a5c..000000000000
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 widgets? ( ~dev-qt/qtwidgets-5.7.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Set of controls used in conjunction with Qt Quick to build complete interfaces
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+widgets debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 widgets? ( ~dev-qt/qtwidgets-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/qtquickcontrols-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=d373fd8804095291aca0e9d045cbdff6
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.0_beta4
deleted file mode 100644
index 1acdb9f726e2..000000000000
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 widgets? ( ~dev-qt/qtwidgets-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 widgets? ( ~dev-qt/qtwidgets-5.11.0_beta4 ) ~dev-qt/qtgraphicaleffects-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtquickcontrols2-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=d78d95cfdc208b9988ce7cb49267f1b0
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.0_rc b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.0_rc
new file mode 100644
index 000000000000..40639e8c6d1c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc widgets? ( ~dev-qt/qtwidgets-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc widgets? ( ~dev-qt/qtwidgets-5.11.0_rc ) ~dev-qt/qtgraphicaleffects-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtquickcontrols2-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=d78d95cfdc208b9988ce7cb49267f1b0
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
deleted file mode 100644
index 2e92bf2a4d2e..000000000000
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgraphicaleffects-5.7.1 ~dev-qt/qtgui-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgraphicaleffects-5.7.1 ~dev-qt/qtgui-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/qtquickcontrols2-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=76a8075e6e58ad1696f5c0890c901074
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtscript-5.11.0_beta4
deleted file mode 100644
index d5b003c17f2a..000000000000
--- a/metadata/md5-cache/dev-qt/qtscript-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 scripttools? ( ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+jit scripttools debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 scripttools? ( ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtscript-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=c2630124b5963ae28c707b6ecec292d4
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.11.0_rc b/metadata/md5-cache/dev-qt/qtscript-5.11.0_rc
new file mode 100644
index 000000000000..cefe26606423
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtscript-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc scripttools? ( ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=+jit scripttools debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc scripttools? ( ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtscript-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=c2630124b5963ae28c707b6ecec292d4
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.7.1 b/metadata/md5-cache/dev-qt/qtscript-5.7.1
deleted file mode 100644
index 876381e41a6e..000000000000
--- a/metadata/md5-cache/dev-qt/qtscript-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 scripttools? ( ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+jit scripttools debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 scripttools? ( ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-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/qtscript-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=6736b2476fc9c5189625b2e941b40dac
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtscxml-5.11.0_beta4
deleted file mode 100644
index 2813275306da..000000000000
--- a/metadata/md5-cache/dev-qt/qtscxml-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtscxml-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=931899ecf2935db1b1545f4395bf26e6
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.11.0_rc b/metadata/md5-cache/dev-qt/qtscxml-5.11.0_rc
new file mode 100644
index 000000000000..b69e1782d253
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtscxml-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=931899ecf2935db1b1545f4395bf26e6
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.7.1 b/metadata/md5-cache/dev-qt/qtscxml-5.7.1
deleted file mode 100644
index 70a543a5aca2..000000000000
--- a/metadata/md5-cache/dev-qt/qtscxml-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=04055beb06fbfb7fc86acdffb7b666e8
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtsensors-5.11.0_beta4
deleted file mode 100644
index fcb6f04c0aad..000000000000
--- a/metadata/md5-cache/dev-qt/qtsensors-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdbus-5.11.0_beta4 qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Hardware sensor access library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdbus-5.11.0_beta4 qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtsensors-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=146be5b8fa4ac5bdc1202ffcc8846e7a
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.11.0_rc b/metadata/md5-cache/dev-qt/qtsensors-5.11.0_rc
new file mode 100644
index 000000000000..b52b1895b17d
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdbus-5.11.0_rc qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Hardware sensor access library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdbus-5.11.0_rc qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtsensors-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=146be5b8fa4ac5bdc1202ffcc8846e7a
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.7.1 b/metadata/md5-cache/dev-qt/qtsensors-5.7.1
deleted file mode 100644
index 98a93b8faa74..000000000000
--- a/metadata/md5-cache/dev-qt/qtsensors-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Hardware sensor access library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 qml? ( ~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/qtsensors-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=c1fd72b820f83b02661f11d402a9ef3e
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtserialbus-5.11.0_beta4
deleted file mode 100644
index f45dc5aafc8e..000000000000
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtserialport-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Support for CAN and other serial buses
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtserialport-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtserialbus-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=fb20edd5e4970b927693f51fe6d0307a
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.11.0_rc b/metadata/md5-cache/dev-qt/qtserialbus-5.11.0_rc
new file mode 100644
index 000000000000..f7eb26101412
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtserialport-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Support for CAN and other serial buses
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtserialport-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtserialbus-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=fb20edd5e4970b927693f51fe6d0307a
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtserialport-5.11.0_beta4
deleted file mode 100644
index 91e8acddea34..000000000000
--- a/metadata/md5-cache/dev-qt/qtserialport-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 virtual/libudev:= dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Serial port abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 virtual/libudev:= dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtserialport-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=28799061d0de088a508254da213c4048
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.11.0_rc b/metadata/md5-cache/dev-qt/qtserialport-5.11.0_rc
new file mode 100644
index 000000000000..eead3ad42929
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc virtual/libudev:= dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Serial port abstraction library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc virtual/libudev:= dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtserialport-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=28799061d0de088a508254da213c4048
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.7.1 b/metadata/md5-cache/dev-qt/qtserialport-5.7.1
deleted file mode 100644
index 88b1bba10f16..000000000000
--- a/metadata/md5-cache/dev-qt/qtserialport-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 virtual/libudev:= dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Serial port abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=49ce7180d4115c76818f44cba7912401
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtspeech-5.11.0_beta4
deleted file mode 100644
index 5e83ac2abc2c..000000000000
--- a/metadata/md5-cache/dev-qt/qtspeech-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Text-to-speech library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtspeech-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=41b54d0a49e3b7726e1fdabb1cc165b9
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.11.0_rc b/metadata/md5-cache/dev-qt/qtspeech-5.11.0_rc
new file mode 100644
index 000000000000..0384d2f6c71f
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Text-to-speech library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtspeech-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=41b54d0a49e3b7726e1fdabb1cc165b9
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtsql-5.11.0_beta4
deleted file mode 100644
index 45797d826f20..000000000000
--- a/metadata/md5-cache/dev-qt/qtsql-5.11.0_beta4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=SQL abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-qt/qtchooser
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtbase-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=7edee319658c3b3ab981d44b06c952bc
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.11.0_rc b/metadata/md5-cache/dev-qt/qtsql-5.11.0_rc
new file mode 100644
index 000000000000..f171c8ec0814
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsql-5.11.0_rc
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=SQL abstraction library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-qt/qtchooser
+REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtbase-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=7edee319658c3b3ab981d44b06c952bc
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
deleted file mode 100644
index 66d84b733ab0..000000000000
--- a/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=SQL abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-qt/qtchooser
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-RESTRICT=test
-SLOT=5/5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=7ecd0247ff405156a5eb037f9ad10438
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtsvg-5.11.0_beta4
deleted file mode 100644
index 271a69129c37..000000000000
--- a/metadata/md5-cache/dev-qt/qtsvg-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 >=sys-libs/zlib-1.2.5 test? ( ~dev-qt/qtxml-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=SVG rendering library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtwidgets-5.11.0_beta4 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtsvg-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=14ee4aef44678546a8b106e7a23391a0
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.11.0_rc b/metadata/md5-cache/dev-qt/qtsvg-5.11.0_rc
new file mode 100644
index 000000000000..b33d016d20ad
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc >=sys-libs/zlib-1.2.5 test? ( ~dev-qt/qtxml-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=SVG rendering library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtwidgets-5.11.0_rc >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtsvg-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=14ee4aef44678546a8b106e7a23391a0
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.7.1 b/metadata/md5-cache/dev-qt/qtsvg-5.7.1
deleted file mode 100644
index a80942413919..000000000000
--- a/metadata/md5-cache/dev-qt/qtsvg-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 >=sys-libs/zlib-1.2.5 test? ( ~dev-qt/qtxml-5.7.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=SVG rendering library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=fbcd165e7e76f2890e625ef87af67018
diff --git a/metadata/md5-cache/dev-qt/qttest-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qttest-5.11.0_beta4
deleted file mode 100644
index 0125f342ee14..000000000000
--- a/metadata/md5-cache/dev-qt/qttest-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 test? ( ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtxml-5.11.0_beta4 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DESCRIPTION=Unit testing library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtbase-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=2e81e792910e9a899673dc7685400b8a
diff --git a/metadata/md5-cache/dev-qt/qttest-5.11.0_rc b/metadata/md5-cache/dev-qt/qttest-5.11.0_rc
new file mode 100644
index 000000000000..2b7d148db798
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qttest-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc test? ( ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtxml-5.11.0_rc ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DESCRIPTION=Unit testing library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtbase-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=2e81e792910e9a899673dc7685400b8a
diff --git a/metadata/md5-cache/dev-qt/qttest-5.7.1 b/metadata/md5-cache/dev-qt/qttest-5.7.1
deleted file mode 100644
index 4e23671c2389..000000000000
--- a/metadata/md5-cache/dev-qt/qttest-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 test? ( ~dev-qt/qtgui-5.7.1 ~dev-qt/qtxml-5.7.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DESCRIPTION=Unit testing library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=aebe413ac76c08a586128816d0313a81
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qttranslations-5.11.0_beta4
deleted file mode 100644
index 25ad0821456b..000000000000
--- a/metadata/md5-cache/dev-qt/qttranslations-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/linguist-tools-5.11.0_beta4 ~dev-qt/qtcore-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Translation files for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qttranslations-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=858222fbe161b7533a8b336a10464ee4
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.11.0_rc b/metadata/md5-cache/dev-qt/qttranslations-5.11.0_rc
new file mode 100644
index 000000000000..66e7020eb3a8
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/linguist-tools-5.11.0_rc ~dev-qt/qtcore-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Translation files for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qttranslations-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=858222fbe161b7533a8b336a10464ee4
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.7.1 b/metadata/md5-cache/dev-qt/qttranslations-5.7.1
deleted file mode 100644
index 255cf032e9c3..000000000000
--- a/metadata/md5-cache/dev-qt/qttranslations-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/linguist-tools-5.7.1 ~dev-qt/qtcore-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Translation files for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=0c557233df3820f27212a7aab0264ef6
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.0_beta4
deleted file mode 100644
index 03362362c983..000000000000
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtsvg-5.11.0_beta4 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Virtual keyboard plugin for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=handwriting +spell +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtsvg-5.11.0_beta4 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtvirtualkeyboard-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=1b9964e67e1af6c4c9ba75ce140ca939
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.0_rc b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.0_rc
new file mode 100644
index 000000000000..41de9b6eb6e1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtsvg-5.11.0_rc spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Virtual keyboard plugin for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=handwriting +spell +xcb debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtsvg-5.11.0_rc spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtvirtualkeyboard-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=1b9964e67e1af6c4c9ba75ce140ca939
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
deleted file mode 100644
index 5ee43b0e32ba..000000000000
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtsvg-5.7.1 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Virtual keyboard plugin for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=handwriting +spell +xcb debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtsvg-5.7.1 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=d995579aae877ac4a5619a1850d7ff36
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtwayland-5.11.0_beta4
deleted file mode 100644
index 49a8001f02c5..000000000000
--- a/metadata/md5-cache/dev-qt/qtwayland-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Wayland platform plugin for Qt
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+libinput xcomposite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtwayland-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f8203b85ce0071070b9ba8613f5fe48c
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.11.0_rc b/metadata/md5-cache/dev-qt/qtwayland-5.11.0_rc
new file mode 100644
index 000000000000..fa2c2163af97
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Wayland platform plugin for Qt
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=+libinput xcomposite debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtwayland-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=f8203b85ce0071070b9ba8613f5fe48c
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.7.1 b/metadata/md5-cache/dev-qt/qtwayland-5.7.1
deleted file mode 100644
index ecebff398a94..000000000000
--- a/metadata/md5-cache/dev-qt/qtwayland-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/wayland-1.4.0 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1[egl] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Wayland platform plugin for Qt
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=xcomposite debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-libs/wayland-1.4.0 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1[egl] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=9d7394a0dc477a8ba16c9719632e18e3
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtwebchannel-5.11.0_beta4
deleted file mode 100644
index 631f51a1133b..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtwebchannel-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=bbad63d1fb759b60dc37e081887099aa
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.11.0_rc b/metadata/md5-cache/dev-qt/qtwebchannel-5.11.0_rc
new file mode 100644
index 000000000000..4ee3b2777efb
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtwebchannel-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=bbad63d1fb759b60dc37e081887099aa
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1 b/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
deleted file mode 100644
index 04e11db73175..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 arm ~arm64 ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 qml? ( ~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/qtwebchannel-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=e8a26835419fd5a3c1421c024f273e4b
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtwebengine-5.11.0_beta4
deleted file mode 100644
index e699b177beb5..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-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.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtprintsupport-5.11.0_beta4 ~dev-qt/qtwebchannel-5.11.0_beta4[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/libjpeg-turbo:= 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/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.11.0_beta4 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.0_beta4[widgets] ~dev-qt/qtwidgets-5.11.0_beta4 ) || ( >=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.11.0_beta4 )
-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.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 ~dev-qt/qtprintsupport-5.11.0_beta4 ~dev-qt/qtwebchannel-5.11.0_beta4[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/libjpeg-turbo:= 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/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.11.0_beta4 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.0_beta4[widgets] ~dev-qt/qtwidgets-5.11.0_beta4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtwebengine-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=701ed3828ac8594a8f643b1df7dd7a39
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.11.0_rc b/metadata/md5-cache/dev-qt/qtwebengine-5.11.0_rc
new file mode 100644
index 000000000000..6fe2f3684cd4
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtprintsupport-5.11.0_rc ~dev-qt/qtwebchannel-5.11.0_rc[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/libjpeg-turbo:= 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/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.11.0_rc ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.0_rc[widgets] ~dev-qt/qtwidgets-5.11.0_rc ) || ( >=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.11.0_rc )
+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.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc ~dev-qt/qtprintsupport-5.11.0_rc ~dev-qt/qtwebchannel-5.11.0_rc[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/libjpeg-turbo:= 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/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.11.0_rc ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.0_rc[widgets] ~dev-qt/qtwidgets-5.11.0_rc ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtwebengine-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=ba1e30c094d7d141f7978b650bd583e3
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2 b/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
deleted file mode 100644
index e645dbd8ee27..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-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.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtwebchannel-5.7.1[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2 dev-libs/libxslt dev-libs/protobuf:= 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.7.1 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( <dev-libs/icu-59:= ) widgets? ( ~dev-qt/qtwidgets-5.7.1 ) || ( >=dev-lang/python-2.7.5-r2:2.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.7.1 )
-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.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtwebchannel-5.7.1[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2 dev-libs/libxslt dev-libs/protobuf:= 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.7.1 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( <dev-libs/icu-59:= ) widgets? ( ~dev-qt/qtwidgets-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/qtwebengine-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=bdde4f1bce6bead538f7ddc4e00c8263
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.7.1 b/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
deleted file mode 100644
index 9abeb8cacea2..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-db/sqlite:3 dev-libs/icu:= >=dev-libs/leveldb-1.18-r1 dev-libs/libxml2:2 dev-libs/libxslt ~dev-qt/qtcore-5.7.1[icu] ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtsql-5.7.1 ~dev-qt/qtwidgets-5.7.1 media-libs/fontconfig:1.0 media-libs/libpng:0= >=sys-libs/zlib-1.2.5 virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender geolocation? ( ~dev-qt/qtpositioning-5.7.1 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gstreamer010? ( dev-libs/glib:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) multimedia? ( ~dev-qt/qtmultimedia-5.7.1[widgets] ) opengl? ( ~dev-qt/qtopengl-5.7.1 ) orientation? ( ~dev-qt/qtsensors-5.7.1 ) printsupport? ( ~dev-qt/qtprintsupport-5.7.1 ) qml? ( ~dev-qt/qtdeclarative-5.7.1 ) webchannel? ( ~dev-qt/qtwebchannel-5.7.1 ) webp? ( media-libs/libwebp:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/ruby dev-util/gperf sys-devel/bison sys-devel/flex virtual/rubygems dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=WebKit rendering library for the Qt5 framework (deprecated)
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp debug test
-KEYWORDS=amd64 arm ~arm64 ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-db/sqlite:3 dev-libs/icu:= >=dev-libs/leveldb-1.18-r1 dev-libs/libxml2:2 dev-libs/libxslt ~dev-qt/qtcore-5.7.1[icu] ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtsql-5.7.1 ~dev-qt/qtwidgets-5.7.1 media-libs/fontconfig:1.0 media-libs/libpng:0= >=sys-libs/zlib-1.2.5 virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender geolocation? ( ~dev-qt/qtpositioning-5.7.1 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gstreamer010? ( dev-libs/glib:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) multimedia? ( ~dev-qt/qtmultimedia-5.7.1[widgets] ) opengl? ( ~dev-qt/qtopengl-5.7.1 ) orientation? ( ~dev-qt/qtsensors-5.7.1 ) printsupport? ( ~dev-qt/qtprintsupport-5.7.1 ) qml? ( ~dev-qt/qtdeclarative-5.7.1 ) webchannel? ( ~dev-qt/qtwebchannel-5.7.1 ) webp? ( media-libs/libwebp:0= ) dev-qt/qtchooser
-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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=e9e52d8f9b3c33300a1761c12b5eee6a
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtwebsockets-5.11.0_beta4
deleted file mode 100644
index e096ece7ebbc..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4[ssl=] qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4[ssl=] qml? ( ~dev-qt/qtdeclarative-5.11.0_beta4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtwebsockets-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=7d6ebe1b2d442aac1eb3d7881f0a3518
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.11.0_rc b/metadata/md5-cache/dev-qt/qtwebsockets-5.11.0_rc
new file mode 100644
index 000000000000..66a69d9f9896
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc[ssl=] qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml +ssl debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc[ssl=] qml? ( ~dev-qt/qtdeclarative-5.11.0_rc ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtwebsockets-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=7d6ebe1b2d442aac1eb3d7881f0a3518
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1 b/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
deleted file mode 100644
index 8c7ceb5e7720..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtnetwork-5.7.1[ssl=] qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml +ssl debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtnetwork-5.7.1[ssl=] qml? ( ~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/qtwebsockets-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=9eb13718d8a7d4e451684d275bf2c83e
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtwebview-5.11.0_beta4
deleted file mode 100644
index ea1a7301a2eb..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebview-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtwebengine-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Module for displaying web content in a QML application using the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtdeclarative-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4 ~dev-qt/qtwebengine-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtwebview-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=78a32f1358129eac1a3540c0893f209d
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.11.0_rc b/metadata/md5-cache/dev-qt/qtwebview-5.11.0_rc
new file mode 100644
index 000000000000..ab259d4924e1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtwebengine-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Module for displaying web content in a QML application using the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtdeclarative-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc ~dev-qt/qtwebengine-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtwebview-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=78a32f1358129eac1a3540c0893f209d
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.7.1 b/metadata/md5-cache/dev-qt/qtwebview-5.7.1
deleted file mode 100644
index ab5b07b48530..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebview-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwebengine-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Module for displaying web content in a QML application using the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwebengine-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/qtwebview-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=82697778ea3ac492e122861147c788ad
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtwidgets-5.11.0_beta4
deleted file mode 100644
index 3656cc2d8774..000000000000
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.11.0_beta4[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 gtk +png +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.11.0_beta4[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtbase-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b069c13688588f35e6d0e06074c046ce
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.11.0_rc b/metadata/md5-cache/dev-qt/qtwidgets-5.11.0_rc
new file mode 100644
index 000000000000..91d8caf37497
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.11.0_rc[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 gtk +png +xcb debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.11.0_rc[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtbase-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=b069c13688588f35e6d0e06074c046ce
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.7.1 b/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
deleted file mode 100644
index 4f963c55d597..000000000000
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=,png=,xcb?] dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 +png +xcb debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=,png=,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/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=6495bb5330a8f0e1ed3035e301a3178a
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtx11extras-5.11.0_beta4
deleted file mode 100644
index adeae008e131..000000000000
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[xcb] test? ( ~dev-qt/qtwidgets-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtgui-5.11.0_beta4[xcb] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtx11extras-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=3a93fa1972be2dc77eec7df5c2d53d8e
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.11.0_rc b/metadata/md5-cache/dev-qt/qtx11extras-5.11.0_rc
new file mode 100644
index 000000000000..4934964257fb
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[xcb] test? ( ~dev-qt/qtwidgets-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtgui-5.11.0_rc[xcb] dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtx11extras-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=3a93fa1972be2dc77eec7df5c2d53d8e
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.7.1 b/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
deleted file mode 100644
index 01bcd1fbb905..000000000000
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[xcb] test? ( ~dev-qt/qtwidgets-5.7.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=ea23adca57db425b64a512f8402662a5
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtxml-5.11.0_beta4
deleted file mode 100644
index e001f2205d5f..000000000000
--- a/metadata/md5-cache/dev-qt/qtxml-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 test? ( ~dev-qt/qtnetwork-5.11.0_beta4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtbase-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=49622f34c897470a089d8ceb201b7844
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.11.0_rc b/metadata/md5-cache/dev-qt/qtxml-5.11.0_rc
new file mode 100644
index 000000000000..0502b10584bf
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtxml-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc test? ( ~dev-qt/qtnetwork-5.11.0_rc ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtbase-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=49622f34c897470a089d8ceb201b7844
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.7.1 b/metadata/md5-cache/dev-qt/qtxml-5.7.1
deleted file mode 100644
index acae97a89222..000000000000
--- a/metadata/md5-cache/dev-qt/qtxml-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 test? ( ~dev-qt/qtnetwork-5.7.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=e6a031338a2cdc2ecba1dffe406860e7
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.0_beta4 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.0_beta4
deleted file mode 100644
index 974694aff433..000000000000
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.0_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_beta4 )
-DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.0_beta4 ~dev-qt/qtnetwork-5.11.0_beta4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-beta4/submodules/qtxmlpatterns-everywhere-src-5.11.0-beta4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=991338605294f2d1bf266dc05d247307
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.0_rc b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.0_rc
new file mode 100644
index 000000000000..77bb3a5d2bc7
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.0_rc
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc )
+DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.0_rc ~dev-qt/qtnetwork-5.11.0_rc dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc/submodules/qtxmlpatterns-everywhere-src-5.11.0-rc.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=991338605294f2d1bf266dc05d247307
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
deleted file mode 100644
index 1275376d59e1..000000000000
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtnetwork-5.7.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
-DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.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	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=a31e531e8991eb6f6300a579ffe9de6a
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 0e3baca2af9c..606687a12e38 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/audio_capture-0.3.2 b/metadata/md5-cache/dev-ros/audio_capture-0.3.2
new file mode 100644
index 000000000000..a7db4165fcaf
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Transports audio from a source to a destination
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/audio_capture
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.3.2.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dc96ebfa250557a8f8d859e0c7d89272
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.2 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.2
new file mode 100644
index 000000000000..6eced7cd6bb5
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_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=Messages for transmitting audio via ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/audio_common_msgs
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.3.2.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=12ffaab703d68a90bf5e477e6d30b18c
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.2 b/metadata/md5-cache/dev-ros/audio_play-0.3.2
new file mode 100644
index 000000000000..3dbebe8e5ae6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Outputs audio to a speaker from a source node
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/audio_play
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.3.2.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6f23119a0cdb129965afc487214835dc
diff --git a/metadata/md5-cache/dev-ros/cpp_common-0.6.10 b/metadata/md5-cache/dev-ros/cpp_common-0.6.10
new file mode 100644
index 000000000000..6c1cb66c7507
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.6.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=C++ code for doing things that are not necessarily ROS related
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/cpp_common
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.10.tar.gz -> roscpp_core-0.6.10.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=05049828660b89a2bf45cdcbc3700c10
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.3 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.3
new file mode 100644
index 000000000000..9dadca3263bb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Aggregates ROS diagnostics
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/diagnostic_aggregator
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7dbefa3ad9f423d68e55ba9f6b66acfd
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.3 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.3
new file mode 100644
index 000000000000..8c453d577727
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Converts diagnostics data into a series of CSV files
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/diagnostic_analysis
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=68bf80af2df174153335c697354f5ba7
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.3 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.3
new file mode 100644
index 000000000000..83d811853eb0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Generic nodes for monitoring a linux host
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/diagnostic_common_diagnostics
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/hddtemp python_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/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=599bd6af28c78bec2f36603135068fb2
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.3 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.3
new file mode 100644
index 000000000000..8b4c6179d177
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Tools for updating diagnostics
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/diagnostic_updater
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=73017135f87e6dea58f3fbeee7484878
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.11 b/metadata/md5-cache/dev-ros/genmsg-0.5.11
new file mode 100644
index 000000000000..af7f73bda4c8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/genmsg-0.5.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Python library for generating ROS message and service data structures for various languages
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/genmsg
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/genmsg/archive/0.5.11.tar.gz -> genmsg-0.5.11.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3acf5c3dc6e21586d8d04d5521bf1ebf
diff --git a/metadata/md5-cache/dev-ros/mk-1.14.4 b/metadata/md5-cache/dev-ros/mk-1.14.4
new file mode 100644
index 000000000000..dda62ee0fb0c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mk-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A collection of .mk include files for building ROS architectural elements
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/mk
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e3ec9e810c389fb45e9817c608fd627e
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-1.6.1 b/metadata/md5-cache/dev-ros/pcl_conversions-1.6.1
new file mode 100644
index 000000000000..8c06fafdf68f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-1.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Provides conversions from PCL data types and ROS message types
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/pcl_conversions
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.6.1.tar.gz -> perception_pcl-1.6.1.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7443d51432724b4b3f37e412f3d44164
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-9999 b/metadata/md5-cache/dev-ros/pcl_conversions-9999
index f4f0a8c2284b..c4252eafe1a4 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db72db226a56ebd4674efeec02a267d3
+_md5_=7443d51432724b4b3f37e412f3d44164
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-1.5.3-r1 b/metadata/md5-cache/dev-ros/pcl_ros-1.5.3-r1
deleted file mode 100644
index 2a468b1a167f..000000000000
--- a/metadata/md5-cache/dev-ros/pcl_ros-1.5.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/pcl_ros
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.5.3.tar.gz -> perception_pcl-1.5.3.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36cc26eb9b9c3b83da5db686d98b7631
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-1.6.1 b/metadata/md5-cache/dev-ros/pcl_ros-1.6.1
new file mode 100644
index 000000000000..6c8cd7739e63
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pcl_ros-1.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/pcl_ros
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.6.1.tar.gz -> perception_pcl-1.6.1.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b30dd79e662c01c35378c6cb819baf8
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-9999 b/metadata/md5-cache/dev-ros/pcl_ros-9999
index d4139e812595..f850a223d341 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-9999
+++ b/metadata/md5-cache/dev-ros/pcl_ros-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pcl_ros
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_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/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_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	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36cc26eb9b9c3b83da5db686d98b7631
+_md5_=0b30dd79e662c01c35378c6cb819baf8
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.14.4 b/metadata/md5-cache/dev-ros/rosbash-1.14.4
new file mode 100644
index 000000000000..cac3a89e8326
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbash-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Assorted shell commands for using ros with bash
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosbash
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f3c8501247738c87993a58e083f71677
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.4 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.4
new file mode 100644
index 000000000000..33423e67313b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosboost_cfg
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=586566f613589dd889ee2187745f4391
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.14.4 b/metadata/md5-cache/dev-ros/rosbuild-1.14.4
new file mode 100644
index 000000000000..8bcda18fc0a0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Scripts for managing the CMake-based build system for ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosbuild
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a51a314e10bc6934d98b131d0b9de66b
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.14.4 b/metadata/md5-cache/dev-ros/rosclean-1.14.4
new file mode 100644
index 000000000000..25a79532f453
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosclean-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Cleanup filesystem resources (e.g. log files)
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosclean
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=70b661883271d3a21f140afcf7423e39
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.10 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.10
new file mode 100644
index 000000000000..c7c69b2c18a4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Code for serialization
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/roscpp_serialization
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_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/roscpp_core/archive/0.6.10.tar.gz -> roscpp_core-0.6.10.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=753ec8ada57cb481f5f22e8885cc2744
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.10 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.10
new file mode 100644
index 000000000000..f3c8a7f02274
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cpp_common dev-ros/rostime sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Message traits code
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/roscpp_traits
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_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/roscpp_core/archive/0.6.10.tar.gz -> roscpp_core-0.6.10.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0fffe56e11432b15f1edccb94479829a
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.14.4 b/metadata/md5-cache/dev-ros/roscreate-1.14.4
new file mode 100644
index 000000000000..5c238a04f2e8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roscreate-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/roscreate
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0317a57a62e7b0f9e882358c90524029
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.3 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.3
new file mode 100644
index 000000000000..fb2d6ae2dcdf
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Command to print aggregated diagnostic contents to the command line
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosdiagnostic
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9360ba558027c848671838ca372b75fd
diff --git a/metadata/md5-cache/dev-ros/roslang-1.14.4 b/metadata/md5-cache/dev-ros/roslang-1.14.4
new file mode 100644
index 000000000000..c39cfd83c261
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslang-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Common package for all ROS client libraries
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/roslang
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b252c6f126036ba26be6fb7aeaaf8137
diff --git a/metadata/md5-cache/dev-ros/roslib-1.14.4 b/metadata/md5-cache/dev-ros/roslib-1.14.4
new file mode 100644
index 000000000000..0d6bde79087a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslib-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Base dependencies and support libraries for ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/roslib
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b37cf7f7cfeec3e05a475711241b806f
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.14.4 b/metadata/md5-cache/dev-ros/rosmake-1.14.4
new file mode 100644
index 000000000000..89d25ca106fc
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosmake-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS dependency aware build tool
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosmake
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=688c85bade86bf9142eec0a8ddc644eb
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.10 b/metadata/md5-cache/dev-ros/rostime-0.6.10
new file mode 100644
index 000000000000..d5844456901b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Time and Duration implementations for C++ libraries
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rostime
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_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/roscpp_core/archive/0.6.10.tar.gz -> roscpp_core-0.6.10.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1e1b240bb48c3a338606a47948d6ec7
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.14.4 b/metadata/md5-cache/dev-ros/rosunit-1.14.4
new file mode 100644
index 000000000000..3fadb4d5e566
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosunit-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Unit-testing package for ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosunit
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f83b6a52718dab05ca14e2d99490cecd
diff --git a/metadata/md5-cache/dev-ros/self_test-1.9.3 b/metadata/md5-cache/dev-ros/self_test-1.9.3
new file mode 100644
index 000000000000..2b3b12565caa
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/self_test-1.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Robot self-test node
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/self_test
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fce78dba65802e29841b9a7eee34248c
diff --git a/metadata/md5-cache/dev-ros/sound_play-0.3.2 b/metadata/md5-cache/dev-ros/sound_play-0.3.2
new file mode 100644
index 000000000000..038bd7d28799
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/sound_play-0.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=ROS node that translates commands on a ROS topic (robotsound) into sounds
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/sound_play
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gst-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-accessibility/festival media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.3.2.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80d5a2b1b5327767b427a3b517f2ec1c
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.8.10 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.8.10
deleted file mode 100644
index 0a68041e46bb..000000000000
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.8.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=diagnostic_aggregator tests
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/test_diagnostic_aggregator
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_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/diagnostics/archive/1.8.10.tar.gz -> diagnostics-1.8.10.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b021b3cd321814689321d591a77686ec
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.0 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.0
deleted file mode 100644
index d61531191478..000000000000
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=diagnostic_aggregator tests
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/test_diagnostic_aggregator
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_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/diagnostics/archive/1.9.0.tar.gz -> diagnostics-1.9.0.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=37973044617badbce00db0d8400a3a70
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.2 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.2
deleted file mode 100644
index 873df4632488..000000000000
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=diagnostic_aggregator tests
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/test_diagnostic_aggregator
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_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/diagnostics/archive/1.9.2.tar.gz -> diagnostics-1.9.2.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=37973044617badbce00db0d8400a3a70
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.3 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.3
new file mode 100644
index 000000000000..7f84ad8e8e33
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=diagnostic_aggregator tests
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/test_diagnostic_aggregator
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_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/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=025f758edc71fe08e6d99d6f540a4bce
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
index f6e40414a418..a7da31aa1990 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e642f59613e88e9aced04d0c275ae638
+_md5_=025f758edc71fe08e6d99d6f540a4bce
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index ef58c929fa2b..df03031ca6f3 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/activeldap-5.2.0 b/metadata/md5-cache/dev-ruby/activeldap-5.2.0
new file mode 100644
index 000000000000..c9b09be3382b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activeldap-5.2.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby23] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby24] dev-ruby/builder[ruby_targets_ruby24] dev-ruby/locale[ruby_targets_ruby24] dev-ruby/ruby-gettext[ruby_targets_ruby24] dev-ruby/gettext_i18n_rails[ruby_targets_ruby24] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby24] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby24] ) ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=ActiveLDAP provides an activerecord inspired object oriented interface to LDAP
+EAPI=6
+HOMEPAGE=https://github.com/activeldap/activeldap
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby23] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby24] dev-ruby/builder[ruby_targets_ruby24] dev-ruby/locale[ruby_targets_ruby24] dev-ruby/ruby-gettext[ruby_targets_ruby24] dev-ruby/gettext_i18n_rails[ruby_targets_ruby24] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby24] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://rubygems/activeldap-5.2.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=87b7394b0c89ee71da241923787ed722
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11-r1 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11-r1
index 91d9c6c21b8f..aba922a08ce8 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11-r1
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=An easy way to keep your users' passwords secure
 EAPI=5
 HOMEPAGE=https://github.com/codahale/bcrypt-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcrypt-3.1.11.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=064c8cd2073e85ceb874d5090fcba14a
+_md5_=acf07bdc18e908f2243869c6e9cbfed1
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.4 b/metadata/md5-cache/dev-ruby/exifr-1.3.4
new file mode 100644
index 000000000000..aded7a1c46da
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/exifr-1.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A library to read EXIF info from JPEG and TIFF images
+EAPI=6
+HOMEPAGE=https://github.com/remvee/exifr/
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/exifr-1.3.4.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e5e91206539744148aa03460fea4fe2e
diff --git a/metadata/md5-cache/dev-ruby/rest-client-2.0.2 b/metadata/md5-cache/dev-ruby/rest-client-2.0.2
index c58f388971da..f1a194bd02a4 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-2.0.2
+++ b/metadata/md5-cache/dev-ruby/rest-client-2.0.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/rest-client-2.0.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=93ec6aa696be7e7dee62c0fda7ea01db
+_md5_=afccc8bc19390ee8eeaa83e080710152
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 955e75cc7ee2..7aa8b631d5b6 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/catkin-0.7.12 b/metadata/md5-cache/dev-util/catkin-0.7.12
new file mode 100644
index 000000000000..e21acb64f41f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/catkin-0.7.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=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(-)] 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/empy[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-util/cmake 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(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/catkin
+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=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(-)] 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/empy[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-util/cmake
+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/catkin/archive/0.7.12.tar.gz -> catkin-0.7.12.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9092ed0f891c341db3e1626caf150c03
diff --git a/metadata/md5-cache/dev-util/catkin-0.7.8 b/metadata/md5-cache/dev-util/catkin-0.7.8
deleted file mode 100644
index dc9a7c9ec13b..000000000000
--- a/metadata/md5-cache/dev-util/catkin-0.7.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=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(-)] 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/empy[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-util/cmake 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(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/catkin
-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=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(-)] 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/empy[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-util/cmake
-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/catkin/archive/0.7.8.tar.gz -> catkin-0.7.8.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0920d7ba5b2d7d34396ca828fbe5fd0f
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 2cbad918f9cb..8ae0039db3ab 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.2.1
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.2.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.2.1/src/kdev-python-5.2.1.tar.xz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f4a6cdd4ae0cc3c0f1e60dfdcd0dff4f
+_md5_=0b94e0099dad3c546399f31327c1c5d4
diff --git a/metadata/md5-cache/dev-util/scons-3.0.1 b/metadata/md5-cache/dev-util/scons-3.0.1
new file mode 100644
index 000000000000..926b0a0b86d8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/scons-3.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Extensible Python-based build utility
+EAPI=6
+HOMEPAGE=http://www.scons.org/
+IUSE=doc test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/scons/scons-3.0.1.tar.gz doc? ( http://www.scons.org/doc/3.0.1/PDF/scons-user.pdf -> scons-3.0.1-user.pdf http://www.scons.org/doc/3.0.1/HTML/scons-user.html -> scons-3.0.1-user.html ) test? ( https://github.com/scons/scons/archive/3.0.1.tar.gz -> scons-3.0.1.gh.tar.gz )
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e8408b739863b92190737b5155cf8fe5
diff --git a/metadata/md5-cache/dev-util/scons-3.0.1-r1 b/metadata/md5-cache/dev-util/scons-3.0.1-r1
new file mode 100644
index 000000000000..620b4f14ea12
--- /dev/null
+++ b/metadata/md5-cache/dev-util/scons-3.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Extensible Python-based build utility
+EAPI=6
+HOMEPAGE=http://www.scons.org/
+IUSE=doc test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/scons/scons-3.0.1.tar.gz doc? ( http://www.scons.org/doc/3.0.1/PDF/scons-user.pdf -> scons-3.0.1-user.pdf http://www.scons.org/doc/3.0.1/HTML/scons-user.html -> scons-3.0.1-user.html ) test? ( https://github.com/scons/scons/archive/3.0.1.tar.gz -> scons-3.0.1.gh.tar.gz )
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=02662da0458bd7771654955587aa347e
diff --git a/metadata/md5-cache/dev-util/scons-3.0.1-r2 b/metadata/md5-cache/dev-util/scons-3.0.1-r2
new file mode 100644
index 000000000000..2baf07e480c7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/scons-3.0.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Extensible Python-based build utility
+EAPI=6
+HOMEPAGE=http://www.scons.org/
+IUSE=doc test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/scons/scons-3.0.1.tar.gz doc? ( http://www.scons.org/doc/3.0.1/PDF/scons-user.pdf -> scons-3.0.1-user.pdf http://www.scons.org/doc/3.0.1/HTML/scons-user.html -> scons-3.0.1-user.html ) test? ( https://github.com/scons/scons/archive/3.0.1.tar.gz -> scons-3.0.1.gh.tar.gz )
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=305d1bdc8bd0de262daa4ef40ffbc19d
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 4772885314df..48739e4e53e9 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/kdesvn-2.0.0 b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
index 0f103d22317a..00ed1d3de9be 100644
--- a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
+++ b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
@@ -10,4 +10,4 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >
 SLOT=5
 SRC_URI=mirror://kde/stable/kdesvn/2.0.0/kdesvn-2.0.0.tar.xz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71372ba01a13475bfeca4fb1d08ca4f1
+_md5_=fa68c1865ae469db6efb3c7a90da5a02
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 560e126e549e..ce4fc7a07f81 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/btanks-0.9.8083 b/metadata/md5-cache/games-action/btanks-0.9.8083
index a9066fedbc66..d3fd40feb294 100644
--- a/metadata/md5-cache/games-action/btanks-0.9.8083
+++ b/metadata/md5-cache/games-action/btanks-0.9.8083
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1:0 media-libs/libsdl[joystick,video] media-libs/libvorbis virtual/opengl dev-libs/expat media-libs/smpeg media-libs/sdl-image[jpeg,png] media-libs/sdl-gfx games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/btanks/btanks-0.9.8083.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0be0face3b53169c6094bc47fb7f3e87
diff --git a/metadata/md5-cache/games-action/d1x-rebirth-0.58.1 b/metadata/md5-cache/games-action/d1x-rebirth-0.58.1
index 915a72ad4403..91905ce6c1a4 100644
--- a/metadata/md5-cache/games-action/d1x-rebirth-0.58.1
+++ b/metadata/md5-cache/games-action/d1x-rebirth-0.58.1
@@ -12,5 +12,5 @@ RDEPEND=dev-games/physfs[hog,zip] media-libs/libsdl[X,sound,joystick,opengl?,vid
 REQUIRED_USE=?? ( cdinstall demo ) ?? ( opl3-musicpack sc55-musicpack ) opl3-musicpack? ( music ) sc55-musicpack? ( music )
 SLOT=0
 SRC_URI=https://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.58.1-src.tar.gz https://www.dxx-rebirth.com/download/dxx/res/d1xrdata.zip https://www.dxx-rebirth.com/download/dxx/res/dxx-rebirth_icons.zip opl3-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.zip ) sc55-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.zip ) cdinstall? ( https://www.dxx-rebirth.com/download/dxx/res/d1datapt.zip ) l10n_de? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.zip )
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0309c659cee14354d79ae02e80b43a4a
diff --git a/metadata/md5-cache/games-action/dxx-rebirth-0.59.100 b/metadata/md5-cache/games-action/dxx-rebirth-0.59.100
index 6024bd8840a5..7b131b464c99 100644
--- a/metadata/md5-cache/games-action/dxx-rebirth-0.59.100
+++ b/metadata/md5-cache/games-action/dxx-rebirth-0.59.100
@@ -10,5 +10,5 @@ RDEPEND=dev-games/physfs:0=[hog,mvl,zip] media-libs/libsdl:0=[joystick,opengl?,s
 REQUIRED_USE=|| ( descent1 descent2 ) ?? ( opl3-musicpack sc55-musicpack ) opl3-musicpack? ( music ) sc55-musicpack? ( music )
 SLOT=0
 SRC_URI=https://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v0.59.100-src.tar.gz opl3-musicpack? ( descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa ) descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) ) sc55-musicpack? ( descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa ) descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) ) l10n_de? ( descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa ) descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) ) textures? ( descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c0865e5009077d1ec4befbe1d87d85c1
diff --git a/metadata/md5-cache/games-action/rafkill-1.2.3-r1 b/metadata/md5-cache/games-action/rafkill-1.2.3-r1
index efac0fd0974b..10e40662fda0 100644
--- a/metadata/md5-cache/games-action/rafkill-1.2.3-r1
+++ b/metadata/md5-cache/games-action/rafkill-1.2.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=<media-libs/allegro-5 media-libs/aldumb
 SLOT=0
 SRC_URI=mirror://sourceforge/raptorv2/rafkill-1.2.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=33374d8c475a2bb5806623a1ca842579
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 0556c6b8ab23..5d0776f41336 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/pouetchess-0.2.0-r2 b/metadata/md5-cache/games-board/pouetchess-0.2.0-r2
index a143922155f6..87d7f32ad0cb 100644
--- a/metadata/md5-cache/games-board/pouetchess-0.2.0-r2
+++ b/metadata/md5-cache/games-board/pouetchess-0.2.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl:0[opengl,video] media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/pouetchess/pouetchess_src_0.2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c28ed0e218f1b1094f20bb9462fbd46b
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 1dbfc7b0f5cd..f7d14229dec2 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/advancemame-3.7 b/metadata/md5-cache/games-emulation/advancemame-3.7
index 006964c01f4a..b87a37c466c0 100644
--- a/metadata/md5-cache/games-emulation/advancemame-3.7
+++ b/metadata/md5-cache/games-emulation/advancemame-3.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip app-arch/zip dev-libs/expat media-libs/libsdl2 sys-libs/zlib alsa? ( media-libs/alsa-lib ) truetype? ( media-libs/freetype:2 ) virtual/os-headers x86? ( >=dev-lang/nasm-0.98 )
+DEPEND=app-arch/unzip app-arch/zip dev-libs/expat media-libs/libsdl2 sys-libs/zlib alsa? ( media-libs/alsa-lib ) truetype? ( media-libs/freetype:2 ) virtual/os-headers virtual/pkgconfig x86? ( >=dev-lang/nasm-0.98 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GNU/Linux port of the MAME emulator with GUI menu
 EAPI=6
 HOMEPAGE=http://www.advancemame.it/
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 XMAME
 RDEPEND=app-arch/unzip app-arch/zip dev-libs/expat media-libs/libsdl2 sys-libs/zlib alsa? ( media-libs/alsa-lib ) truetype? ( media-libs/freetype:2 )
 SLOT=0
-SRC_URI=https://github.com/amadvance/advancemame/releases/download/v3.7/advancemame-3.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c64f146385cf9f1b01144dc6247f1a2d
+SRC_URI=https://github.com/amadvance/advancemame/releases/download/v3.7/advancemame-3.7.tar.gz https://github.com/amadvance/advancemame/commit/70f099ac49786a287ebd3949ce8f8670a5731abd.patch -> advancemame-3.7-use_pkgconfig_for_freetype_and_sdl.patch
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=21f8a0a36ec5c2a9e6ed1cab916ce5b4
diff --git a/metadata/md5-cache/games-emulation/fceux-2.2.3 b/metadata/md5-cache/games-emulation/fceux-2.2.3
index f402f519e70c..f9e0182c2bb2 100644
--- a/metadata/md5-cache/games-emulation/fceux-2.2.3
+++ b/metadata/md5-cache/games-emulation/fceux-2.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=lua? ( dev-lang/lua:0 ) media-libs/libsdl[opengl?,video] logo? ( media-libs/gd[png] ) opengl? ( virtual/opengl ) gtk? ( x11-libs/gtk+:3 ) sys-libs/zlib[minizip]
 SLOT=0
 SRC_URI=mirror://sourceforge/fceultra/fceux-2.2.3.src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	3790b47674a03f79525a1a517bd2191f
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d
 _md5_=25c7f2802fd46a71d1acdca0754a8f7f
diff --git a/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102-r2 b/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102-r2
index 6f16143bd1d1..4e6143cdf120 100644
--- a/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102-r2
+++ b/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,sound,joystick,video] sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/gambatte-0.5.0_p20131102.tar.xz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	3790b47674a03f79525a1a517bd2191f
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d
 _md5_=12675c7e7c10deaeff9a28623a866254
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 865a3591d77f..fb996fd6542a 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/urbanterror-4.3.3_p20180410 b/metadata/md5-cache/games-fps/urbanterror-4.3.3_p20180410
new file mode 100644
index 000000000000..66ede6a30089
--- /dev/null
+++ b/metadata/md5-cache/games-fps/urbanterror-4.3.3_p20180410
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm pretend
+DEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.3 sys-libs/zlib:=[minizip] virtual/jpeg:0
+DESCRIPTION=Hollywood tactical shooter based on the ioquake3 engine
+EAPI=6
+HOMEPAGE=https://urbanterror.info https://github.com/mickael9/ioq3
+IUSE=+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.3 sys-libs/zlib:=[minizip] virtual/jpeg:0
+REQUIRED_USE=|| ( client server ) voip? ( opus )
+SLOT=0
+SRC_URI=https://github.com/mickael9/ioq3/archive/d6db4589efd1ff2b7a4fa2983e58993d06098327.tar.gz -> urbanterror-4.3.3_p20180410.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7171fcba95b708c4fea0bdac9644b439
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 4e293c339729..4fe21febda44 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/pingus-0.7.6-r1 b/metadata/md5-cache/games-puzzle/pingus-0.7.6-r1
index 9b48b2e454bb..e9eb23771892 100644
--- a/metadata/md5-cache/games-puzzle/pingus-0.7.6-r1
+++ b/metadata/md5-cache/games-puzzle/pingus-0.7.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl[joystick,opengl?,video] media-libs/sdl-image[png] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) opengl? ( virtual/opengl ) media-libs/libpng:0= dev-libs/boost:=
 SLOT=0
 SRC_URI=https://pingus.googlecode.com/files/pingus-0.7.6.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e5d84ac106e9ce59d607a50b27443c28
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 58ac73fb2e7f..bdfc4b114523 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/dangerdeep-0.3.0 b/metadata/md5-cache/games-simulation/dangerdeep-0.3.0
index abe963edcfb9..3b6dae58e395 100644
--- a/metadata/md5-cache/games-simulation/dangerdeep-0.3.0
+++ b/metadata/md5-cache/games-simulation/dangerdeep-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 CC-BY-NC-ND-2.0
 RDEPEND=virtual/opengl virtual/glu sci-libs/fftw:3.0 media-libs/libsdl[joystick,opengl,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[jpeg,png] media-libs/sdl-net games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/dangerdeep/dangerdeep-0.3.0.tar.gz mirror://sourceforge/dangerdeep/dangerdeep-data-0.3.0.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=970ef0bb5c86bd8edfd4f055ee9f7ea4
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.1.1 b/metadata/md5-cache/games-simulation/openrct2-0.1.1
deleted file mode 100644
index fcb16784c9f9..000000000000
--- a/metadata/md5-cache/games-simulation/openrct2-0.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 >=media-libs/speex-1.2.0 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] ) test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=An open source re-implementation of RollerCoaster Tycoon 2
-EAPI=6
-HOMEPAGE=https://openrct2.website/
-IUSE=libressl +multiplayer opengl test truetype +twitch
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 >=media-libs/speex-1.2.0 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] )
-REQUIRED_USE=multiplayer? ( twitch )
-SLOT=0
-SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.1.1.tar.gz -> openrct2-0.1.1.tar.gz https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.0/title-sequence-v0.1.0.zip -> openrct2-title-sequence-v0.1.0.zip
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f167a0bcf0f6ce8aa8ba22b6510502fc
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.1.2 b/metadata/md5-cache/games-simulation/openrct2-0.1.2
new file mode 100644
index 000000000000..3f7fc268be94
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/openrct2-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] ) app-arch/unzip test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=An open source re-implementation of RollerCoaster Tycoon 2
+EAPI=6
+HOMEPAGE=https://openrct2.website/
+IUSE=libressl +multiplayer opengl test truetype +twitch
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] )
+SLOT=0
+SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.1.2.tar.gz -> openrct2-0.1.2.tar.gz https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2/title-sequence-v0.1.2.zip -> openrct2-title-sequence-v0.1.2.zip
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=685e7bd51588298d881c66ad05b04203
diff --git a/metadata/md5-cache/games-simulation/openrct2-9999 b/metadata/md5-cache/games-simulation/openrct2-9999
index d2f93d0769bd..7ee7991afac9 100644
--- a/metadata/md5-cache/games-simulation/openrct2-9999
+++ b/metadata/md5-cache/games-simulation/openrct2-9999
@@ -1,13 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 >=media-libs/speex-1.2.0 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] ) test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] ) app-arch/unzip test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=An open source re-implementation of RollerCoaster Tycoon 2
 EAPI=6
 HOMEPAGE=https://openrct2.website/
 IUSE=libressl +multiplayer opengl test truetype +twitch
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 >=media-libs/speex-1.2.0 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] )
-REQUIRED_USE=multiplayer? ( twitch )
+RDEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] )
 SLOT=0
-SRC_URI=https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.0/title-sequence-v0.1.0.zip -> openrct2-title-sequence-v0.1.0.zip
+SRC_URI=https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2/title-sequence-v0.1.2.zip -> openrct2-title-sequence-v0.1.2.zip https://github.com/OpenRCT2/objects/releases/download/v1.0/objects.zip -> openrct2-objects-v1.0.zip
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f167a0bcf0f6ce8aa8ba22b6510502fc
+_md5_=ebdfdebd0fdd55c1e37ea79eaf8a9192
diff --git a/metadata/md5-cache/games-sports/Manifest.gz b/metadata/md5-cache/games-sports/Manifest.gz
index aef95a7e02a2..8232eb0d99dd 100644
--- a/metadata/md5-cache/games-sports/Manifest.gz
+++ b/metadata/md5-cache/games-sports/Manifest.gz
diff --git a/metadata/md5-cache/games-sports/vdrift-20120722 b/metadata/md5-cache/games-sports/vdrift-20120722
index c12db8fb69f5..82c393026651 100644
--- a/metadata/md5-cache/games-sports/vdrift-20120722
+++ b/metadata/md5-cache/games-sports/vdrift-20120722
@@ -8,5 +8,5 @@ LICENSE=GPL-3 ZLIB LGPL-2.1+
 RDEPEND=app-arch/libarchive media-libs/glew media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/libvorbis net-misc/curl sci-physics/bullet[-double-precision] virtual/opengl virtual/glu games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/vdrift/vdrift-2012-07-22.tar.bz2 mirror://sourceforge/vdrift/vdrift-2012-07-22c_patch.diff
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e6038213dfb8ff5feea4c4fd3015815d
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 3d638feaacc8..06a14c17a8f4 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/boswars-2.7-r2 b/metadata/md5-cache/games-strategy/boswars-2.7-r2
index 22113334f1b9..787e5e374e14 100644
--- a/metadata/md5-cache/games-strategy/boswars-2.7-r2
+++ b/metadata/md5-cache/games-strategy/boswars-2.7-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/lua:0 media-libs/libogg media-libs/libpng:0 media-libs/libsdl[opengl,sound,video] media-libs/libtheora media-libs/libvorbis virtual/opengl x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.boswars.org/dist/releases/boswars-2.7-src.tar.gz https://dev.gentoo.org/~hasufell/distfiles/boswars-2.7-fixed-images-for-libpng-1.6.tar.xz mirror://gentoo/bos.png
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3394567a4abde13c0ec49aa8c80099f9
diff --git a/metadata/md5-cache/games-strategy/endless-sky-0.9.6 b/metadata/md5-cache/games-strategy/endless-sky-0.9.6
index 7c5cdca575e9..7bcb926a5de3 100644
--- a/metadata/md5-cache/games-strategy/endless-sky-0.9.6
+++ b/metadata/md5-cache/games-strategy/endless-sky-0.9.6
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain
 RDEPEND=media-libs/glew:0 media-libs/libsdl2 media-libs/libjpeg-turbo media-libs/libpng:= media-libs/openal virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/endless-sky/endless-sky/archive/v0.9.6.tar.gz -> endless-sky-0.9.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9cbc46f41e551853f1f792f26da8c1a5
diff --git a/metadata/md5-cache/games-strategy/glob2-0.9.4.4-r2 b/metadata/md5-cache/games-strategy/glob2-0.9.4.4-r2
index abdb284420a8..5ee16ea59df4 100644
--- a/metadata/md5-cache/games-strategy/glob2-0.9.4.4-r2
+++ b/metadata/md5-cache/games-strategy/glob2-0.9.4.4-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.34[threads] dev-libs/fribidi media-libs/libsdl[opengl] media-libs/libvorbis media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf media-libs/speex virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://nongnu/glob2/0.9.4/glob2-0.9.4.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8505071d77f09a50d453605a933e3376
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.1 b/metadata/md5-cache/games-strategy/wesnoth-1.14.1
new file mode 100644
index 000000000000..4f3b99a4b164
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) ) sys-devel/gettext virtual/pkgconfig x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
+EAPI=6
+HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
+IUSE=dbus dedicated doc fribidi nls openmp server
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
+SLOT=0
+SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.1.tar.gz -> wesnoth-1.14.1.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=231c73645220c55d5a040e07e54d235c
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 2ce40386e074..48650333b46d 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/nml-0.4.4-r1 b/metadata/md5-cache/games-util/nml-0.4.4-r1
index 2ddcf29c7e11..34956ba606f7 100644
--- a/metadata/md5-cache/games-util/nml-0.4.4-r1
+++ b/metadata/md5-cache/games-util/nml-0.4.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pillow[zlib,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ply[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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(-)]
+DEPEND=dev-python/pillow[zlib,python_targets_python3_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/ply[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Compiler of NML files into grf/nfo files
 EAPI=6
 HOMEPAGE=http://dev.openttdcoop.org/projects/nml
-IUSE=python_targets_python3_4 python_targets_python3_5
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
-RDEPEND=dev-python/pillow[zlib,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ply[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 )
+RDEPEND=dev-python/pillow[zlib,python_targets_python3_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/ply[python_targets_python3_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=http://bundles.openttdcoop.org/nml/releases/0.4.4/nml-0.4.4.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5fdaf518aa392220296d9ccae3ec4c3f
+_md5_=a41a443d5f8515ac809c43a4a96776ed
diff --git a/metadata/md5-cache/games-util/xboxdrv-0.8.8 b/metadata/md5-cache/games-util/xboxdrv-0.8.8
index 7a7011dae7e3..9e715cd1bb59 100644
--- a/metadata/md5-cache/games-util/xboxdrv-0.8.8
+++ b/metadata/md5-cache/games-util/xboxdrv-0.8.8
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost:= dev-libs/dbus-glib:= virtual/libudev:= sys-apps/dbus:= dev-libs/glib:2= virtual/libusb:1= x11-libs/libX11:=
 SLOT=0
 SRC_URI=http://pingus.seul.org/~grumbel/xboxdrv/xboxdrv-linux-0.8.8.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	3790b47674a03f79525a1a517bd2191f	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=87821eb484231b7269b7f0a377d21ad2
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index da209e1ec91a..b6a67a06a301 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/gnome-keyring-3.20.0 b/metadata/md5-cache/gnome-base/gnome-keyring-3.20.0
index 177ace07110e..82b77b25ba45 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.20.0
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.20.0
@@ -10,5 +10,5 @@ PDEPEND=app-crypt/pinentry[gnome-keyring]
 RDEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f69fee6b902ff70f716edc7fd6690dd6
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.20.1 b/metadata/md5-cache/gnome-base/gnome-keyring-3.20.1
index 4f78aaae6bc3..f1f29fc2f218 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.20.1
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.20.1
@@ -10,5 +10,5 @@ PDEPEND=app-crypt/pinentry[gnome-keyring]
 RDEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a591b88cb58ff5b3b580ddcd2345b62c
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index c6e4d5fc1362..813f5bb31aec 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.8.1 b/metadata/md5-cache/gnome-extra/gnome-commander-1.8.1
new file mode 100644
index 000000000000..51ab58c78c67
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig test? ( >=dev-cpp/gtest-1.7.0 ) >=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, full featured, twin-panel file manager
+EAPI=6
+HOMEPAGE=http://gcmd.github.io/
+IUSE=chm exif gsf pdf taglib samba test +unique
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) taglib? ( >=media-libs/taglib-1.4 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-commander/1.8/gnome-commander-1.8.1.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2c6390332a8b90585ad63fcd74241ef2
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index ce4634d2daf8..b804b80ea101 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/akonadi-18.04.0 b/metadata/md5-cache/kde-apps/akonadi-18.04.0
deleted file mode 100644
index e05a1617d481..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-18.04.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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[mysql?,postgres?] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Storage service for PIM data and libraries for PIM apps
-EAPI=6
-HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
-IUSE=+mysql postgres sqlite tools xml test debug designer test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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[mysql?,postgres?] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !<kde-apps/kapptemplate-17.11.80 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/akonadi-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=956f8094ce4c6023ebcd0efb1a3a97c2
diff --git a/metadata/md5-cache/kde-apps/akonadi-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-18.04.1
new file mode 100644
index 000000000000..c45ea90ca0ed
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-18.04.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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[mysql?,postgres?] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Storage service for PIM data and libraries for PIM apps
+EAPI=6
+HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
+IUSE=+mysql postgres sqlite tools xml test debug designer test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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[mysql?,postgres?] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !<kde-apps/kapptemplate-17.11.80 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=956f8094ce4c6023ebcd0efb1a3a97c2
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.0 b/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.0
deleted file mode 100644
index 7084a3a1b396..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=dev-qt/qtdbus-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi calendar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-calendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/akonadi-calendar-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c50928731851ce14a084e12975333797
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.1
new file mode 100644
index 000000000000..2e33c46ebf84
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi calendar integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-calendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-calendar-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c50928731851ce14a084e12975333797
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.0 b/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.0
deleted file mode 100644
index d2dd0027869b..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=dev-qt/qtdbus-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi contact integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-contacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/akonadi-contacts-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7aaad4610b1b4d0cae66f4a559db7af2
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.1
new file mode 100644
index 000000000000..3f9e7b4f1779
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi contact integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-contacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-contacts-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7aaad4610b1b4d0cae66f4a559db7af2
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.0 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.0
deleted file mode 100644
index 5578629977ef..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/mailcommon-18.04.0:5 >=kde-apps/mailimporter-18.04.0:5 >=kde-apps/messagelib-18.04.0:5 >=kde-apps/pimcommon-18.04.0:5 >=dev-qt/qtgui-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Import_Options
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/mailcommon-18.04.0:5 >=kde-apps/mailimporter-18.04.0:5 >=kde-apps/messagelib-18.04.0:5 >=kde-apps/pimcommon-18.04.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/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/akonadi-import-wizard-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=42a223eeb0ead53a422efdf38433b7ec
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.1
new file mode 100644
index 000000000000..71337939475b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/mailimporter-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Import_Options
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/mailimporter-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.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-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/akonadi-import-wizard-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=42a223eeb0ead53a422efdf38433b7ec
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-18.04.0 b/metadata/md5-cache/kde-apps/akonadi-mime-18.04.0
deleted file mode 100644
index b0ffa6fbf929..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-mime-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kmime-18.04.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/libxslt x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi mime types
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kmime-18.04.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/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-mime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/akonadi-mime-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8ec7321744d40f46ed40df82a5b5dfc9
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-mime-18.04.1
new file mode 100644
index 000000000000..d365488cadc8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libxslt x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi mime types
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-mime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-mime-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8ec7321744d40f46ed40df82a5b5dfc9
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-18.04.0 b/metadata/md5-cache/kde-apps/akonadi-notes-18.04.0
deleted file mode 100644
index 78b4fe215232..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-notes-18.04.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.44.0:5 >=kde-apps/kmime-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-apps/akonadi-18.04.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi notes integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kmime-18.04.0:5 >=dev-qt/qtgui-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.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-notes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/akonadi-notes-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80b586d1f3afecaaf87d14605bd4b49b
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-notes-18.04.1
new file mode 100644
index 000000000000..3399e6154b44
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-apps/akonadi-18.04.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi notes integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtgui-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.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-notes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-notes-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80b586d1f3afecaaf87d14605bd4b49b
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-18.04.0 b/metadata/md5-cache/kde-apps/akonadi-search-18.04.0
deleted file mode 100644
index 04a979e51de3..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-search-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmime-18.04.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/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-18.04.0:5[mysql,postgres,sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries and daemons to implement searching in Akonadi
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/akonadi-search.git
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmime-18.04.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/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/akonadi-search-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=43dd6249803d167b10d6662c0ffebe21
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-search-18.04.1
new file mode 100644
index 000000000000..9e2b6181793e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-search-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-18.04.1:5[mysql,postgres,sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries and daemons to implement searching in Akonadi
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/akonadi-search.git
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-search-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d6a1a367d5ebfa724134134b3c62e845
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-18.04.0 b/metadata/md5-cache/kde-apps/akonadiconsole-18.04.0
deleted file mode 100644
index 89970a1ca294..000000000000
--- a/metadata/md5-cache/kde-apps/akonadiconsole-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-search-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/messagelib-18.04.0: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 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application for debugging Akonadi Resources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-search-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/messagelib-18.04.0: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 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/akonadiconsole-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fcc0069b67079c12d2b96580aee9d23f
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-18.04.1 b/metadata/md5-cache/kde-apps/akonadiconsole-18.04.1
new file mode 100644
index 000000000000..2abfe65b3610
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/messagelib-18.04.1: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 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application for debugging Akonadi Resources
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/messagelib-18.04.1: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 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/akonadiconsole-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fcc0069b67079c12d2b96580aee9d23f
diff --git a/metadata/md5-cache/kde-apps/akregator-18.04.0 b/metadata/md5-cache/kde-apps/akregator-18.04.0
deleted file mode 100644
index a2ad654a893e..000000000000
--- a/metadata/md5-cache/kde-apps/akregator-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/grantleetheme-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/messagelib-18.04.0:5 >=kde-apps/pimcommon-18.04.0:5 >=kde-apps/syndication-18.04.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/qtwebengine-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=News feed aggregator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/akregator
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/grantleetheme-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/messagelib-18.04.0:5 >=kde-apps/pimcommon-18.04.0:5 >=kde-apps/syndication-18.04.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/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.44.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/18.04.0/src/akregator-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fd9ad5f7590299b538cae07738413cde
diff --git a/metadata/md5-cache/kde-apps/akregator-18.04.1 b/metadata/md5-cache/kde-apps/akregator-18.04.1
new file mode 100644
index 000000000000..45c788fc0d60
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akregator-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=kde-apps/syndication-18.04.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/qtwebengine-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=News feed aggregator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/akregator
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=kde-apps/syndication-18.04.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/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.44.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/18.04.1/src/akregator-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fd9ad5f7590299b538cae07738413cde
diff --git a/metadata/md5-cache/kde-apps/analitza-18.04.0 b/metadata/md5-cache/kde-apps/analitza-18.04.0
deleted file mode 100644
index 35697a953ae0..000000000000
--- a/metadata/md5-cache/kde-apps/analitza-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.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 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library for mathematical features
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=eigen nls test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.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.44.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/18.04.0/src/analitza-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fc3943ec22bdddf7b38e6707b96e84b4
diff --git a/metadata/md5-cache/kde-apps/analitza-18.04.1 b/metadata/md5-cache/kde-apps/analitza-18.04.1
new file mode 100644
index 000000000000..8e2aa6800406
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/analitza-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=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 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library for mathematical features
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=eigen nls test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.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.44.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/18.04.1/src/analitza-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fc3943ec22bdddf7b38e6707b96e84b4
diff --git a/metadata/md5-cache/kde-apps/ark-18.04.0 b/metadata/md5-cache/kde-apps/ark-18.04.0
deleted file mode 100644
index 2aa41f6fe595..000000000000
--- a/metadata/md5-cache/kde-apps/ark-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Archiving tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark/
-IUSE=bzip2 lzma zip test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/ark-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4fef49d2b4393e539ed5f9dd86a8b4ed
diff --git a/metadata/md5-cache/kde-apps/ark-18.04.1 b/metadata/md5-cache/kde-apps/ark-18.04.1
new file mode 100644
index 000000000000..e4fc66bec924
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ark-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Archiving tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark/
+IUSE=bzip2 lzma zip test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/ark-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=21740169a02ec651e415725830982aa7
diff --git a/metadata/md5-cache/kde-apps/artikulate-18.04.0 b/metadata/md5-cache/kde-apps/artikulate-18.04.0
deleted file mode 100644
index 4e2d22df5ce1..000000000000
--- a/metadata/md5-cache/kde-apps/artikulate-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Language learning application that helps improving pronunciation skills
-EAPI=6
-HOMEPAGE=https://edu.kde.org/applications/language/artikulate
-IUSE=+gstreamer qtmedia debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/artikulate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=|| ( gstreamer qtmedia )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/artikulate-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98b69e6abe3f73aedb429248be2bf308
diff --git a/metadata/md5-cache/kde-apps/artikulate-18.04.1 b/metadata/md5-cache/kde-apps/artikulate-18.04.1
new file mode 100644
index 000000000000..c6eded823ba9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/artikulate-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Language learning application that helps improving pronunciation skills
+EAPI=6
+HOMEPAGE=https://edu.kde.org/applications/language/artikulate
+IUSE=+gstreamer qtmedia debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/artikulate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=|| ( gstreamer qtmedia )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/artikulate-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=98b69e6abe3f73aedb429248be2bf308
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-18.04.0 b/metadata/md5-cache/kde-apps/audiocd-kio-18.04.0
deleted file mode 100644
index b92d0cfc5644..000000000000
--- a/metadata/md5-cache/kde-apps/audiocd-kio-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/libkcddb-18.04.0:5 >=kde-apps/libkcompactdisc-18.04.0: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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kioslave for accessing audio CDs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=flac vorbis debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/libkcddb-18.04.0:5 >=kde-apps/libkcompactdisc-18.04.0: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.44.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/18.04.0/src/audiocd-kio-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be3434b2bd625d99f488ba460c553c0c
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-18.04.1 b/metadata/md5-cache/kde-apps/audiocd-kio-18.04.1
new file mode 100644
index 000000000000..ec8e0a47f6b5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/libkcddb-18.04.1:5 >=kde-apps/libkcompactdisc-18.04.1: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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kioslave for accessing audio CDs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=flac vorbis debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/libkcddb-18.04.1:5 >=kde-apps/libkcompactdisc-18.04.1: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.44.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/18.04.1/src/audiocd-kio-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be3434b2bd625d99f488ba460c553c0c
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-18.04.0 b/metadata/md5-cache/kde-apps/baloo-widgets-18.04.0
deleted file mode 100644
index 808af12f3a2e..000000000000
--- a/metadata/md5-cache/kde-apps/baloo-widgets-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Widget library for baloo
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/baloo-widgets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/baloo-widgets-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9046029a81877985317557cd071b5d4f
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-18.04.1 b/metadata/md5-cache/kde-apps/baloo-widgets-18.04.1
new file mode 100644
index 000000000000..3104982d74f5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Widget library for baloo
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/baloo-widgets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/baloo-widgets-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9046029a81877985317557cd071b5d4f
diff --git a/metadata/md5-cache/kde-apps/blinken-18.04.0 b/metadata/md5-cache/kde-apps/blinken-18.04.0
deleted file mode 100644
index 5b1f4bcfef29..000000000000
--- a/metadata/md5-cache/kde-apps/blinken-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE version of the Simon Says game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/blinken https://edu.kde.org/blinken/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/blinken-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b159b667de0ddd127334601ebded0c6e
diff --git a/metadata/md5-cache/kde-apps/blinken-18.04.1 b/metadata/md5-cache/kde-apps/blinken-18.04.1
new file mode 100644
index 000000000000..9a71793340a4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/blinken-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE version of the Simon Says game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/blinken https://edu.kde.org/blinken/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/blinken-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b159b667de0ddd127334601ebded0c6e
diff --git a/metadata/md5-cache/kde-apps/bomber-18.04.0 b/metadata/md5-cache/kde-apps/bomber-18.04.0
deleted file mode 100644
index f782a074c662..000000000000
--- a/metadata/md5-cache/kde-apps/bomber-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE arcade bombing game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/bomber/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/bomber-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8b83639c1b3e3ef265da30f7888b77db
diff --git a/metadata/md5-cache/kde-apps/bomber-18.04.1 b/metadata/md5-cache/kde-apps/bomber-18.04.1
new file mode 100644
index 000000000000..129e515d7095
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bomber-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE arcade bombing game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/bomber/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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.44.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/18.04.1/src/bomber-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8b83639c1b3e3ef265da30f7888b77db
diff --git a/metadata/md5-cache/kde-apps/bovo-18.04.0 b/metadata/md5-cache/kde-apps/bovo-18.04.0
deleted file mode 100644
index dcaab6e83784..000000000000
--- a/metadata/md5-cache/kde-apps/bovo-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Five-in-a-row Board Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/bovo/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/bovo-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91a745b75108b09c917b5fe72cbc9c78
diff --git a/metadata/md5-cache/kde-apps/bovo-18.04.1 b/metadata/md5-cache/kde-apps/bovo-18.04.1
new file mode 100644
index 000000000000..6dcd6c561dc8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bovo-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Five-in-a-row Board Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/bovo/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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.44.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/18.04.1/src/bovo-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=91a745b75108b09c917b5fe72cbc9c78
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-18.04.0 b/metadata/md5-cache/kde-apps/calendarjanitor-18.04.0
deleted file mode 100644
index 598763519e88..000000000000
--- a/metadata/md5-cache/kde-apps/calendarjanitor-18.04.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.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tool to scan calendar data for buggy instances
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/akonadi-calendar-tools-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=178b703ddd5853b830c132df154b5052
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-18.04.1 b/metadata/md5-cache/kde-apps/calendarjanitor-18.04.1
new file mode 100644
index 000000000000..8239dd288247
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tool to scan calendar data for buggy instances
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/akonadi-calendar-tools-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=178b703ddd5853b830c132df154b5052
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-18.04.0 b/metadata/md5-cache/kde-apps/calendarsupport-18.04.0
deleted file mode 100644
index 7c99e74fd03f..000000000000
--- a/metadata/md5-cache/kde-apps/calendarsupport-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/pimcommon-18.04.0: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Calendar support library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/pimcommon-18.04.0: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.44.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/18.04.0/src/calendarsupport-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e62040446efa9635fb2a3ead5b42a78f
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-18.04.1 b/metadata/md5-cache/kde-apps/calendarsupport-18.04.1
new file mode 100644
index 000000000000..48fc5cdca94c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarsupport-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Calendar support library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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.44.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/18.04.1/src/calendarsupport-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e62040446efa9635fb2a3ead5b42a78f
diff --git a/metadata/md5-cache/kde-apps/cantor-18.04.0 b/metadata/md5-cache/kde-apps/cantor-18.04.0
deleted file mode 100644
index 3c17906bfab7..000000000000
--- a/metadata/md5-cache/kde-apps/cantor-18.04.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.0:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interface for doing mathematics and scientific computing
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/
-IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.0: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.44.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/stable/applications/18.04.0/src/cantor-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0893be899d98b755235e7b13970f2bc8
diff --git a/metadata/md5-cache/kde-apps/cantor-18.04.1 b/metadata/md5-cache/kde-apps/cantor-18.04.1
new file mode 100644
index 000000000000..e56a7ee1baf6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cantor-18.04.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interface for doing mathematics and scientific computing
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/
+IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/stable/applications/18.04.1/src/cantor-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0893be899d98b755235e7b13970f2bc8
diff --git a/metadata/md5-cache/kde-apps/cervisia-18.04.0 b/metadata/md5-cache/kde-apps/cervisia-18.04.0
deleted file mode 100644
index 4949109adf6e..000000000000
--- a/metadata/md5-cache/kde-apps/cervisia-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=CVS frontend by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/cervisia
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/cervisia-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f2f03e60c19b67c396e95fa59c79629
diff --git a/metadata/md5-cache/kde-apps/cervisia-18.04.1 b/metadata/md5-cache/kde-apps/cervisia-18.04.1
new file mode 100644
index 000000000000..9dfb57155e8e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cervisia-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=CVS frontend by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/cervisia
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/cervisia-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7f2f03e60c19b67c396e95fa59c79629
diff --git a/metadata/md5-cache/kde-apps/dolphin-18.04.0 b/metadata/md5-cache/kde-apps/dolphin-18.04.0
deleted file mode 100644
index 41b80aa4fe3b..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-apps/baloo-widgets-18.04.0:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma filemanager focusing on usability
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin
-IUSE=semantic-desktop thumbnail test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-apps/baloo-widgets-18.04.0:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.44.0:5 ) >=kde-apps/kio-extras-18.04.0:5 thumbnail? ( >=kde-apps/ffmpegthumbs-18.04.0:5 >=kde-apps/thumbnailers-18.04.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/dolphin-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=69c5b07614cb0863b9d7f2441feb4ae7
diff --git a/metadata/md5-cache/kde-apps/dolphin-18.04.1 b/metadata/md5-cache/kde-apps/dolphin-18.04.1
new file mode 100644
index 000000000000..3a89fd70fa19
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-apps/baloo-widgets-18.04.1:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma filemanager focusing on usability
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin
+IUSE=semantic-desktop thumbnail test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-apps/baloo-widgets-18.04.1:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.44.0:5 ) >=kde-apps/kio-extras-18.04.1:5 thumbnail? ( >=kde-apps/ffmpegthumbs-18.04.1:5 >=kde-apps/thumbnailers-18.04.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/dolphin-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=69c5b07614cb0863b9d7f2441feb4ae7
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.0 b/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.0
deleted file mode 100644
index 619deb8d484d..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.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.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/dolphin-18.04.0: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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra Dolphin plugins
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=bazaar dropbox git mercurial subversion debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/dolphin-18.04.0: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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 ) >=kde-apps/kompare-18.04.0: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.44.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/18.04.0/src/dolphin-plugins-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cfc4dd489a3e6c14b3a43e810f36da9f
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.1
new file mode 100644
index 000000000000..b81288a0e6a3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/dolphin-18.04.1: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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Extra Dolphin plugins
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=bazaar dropbox git mercurial subversion debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/dolphin-18.04.1: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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 ) >=kde-apps/kompare-18.04.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.44.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/18.04.1/src/dolphin-plugins-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cfc4dd489a3e6c14b3a43e810f36da9f
diff --git a/metadata/md5-cache/kde-apps/dragon-18.04.0 b/metadata/md5-cache/kde-apps/dragon-18.04.0
deleted file mode 100644
index 9c0054fa809d..000000000000
--- a/metadata/md5-cache/kde-apps/dragon-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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(+)] sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A simple video player
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/dragonplayer
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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.44.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/18.04.0/src/dragon-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=834d004813a2fc11feaa289f2adb81e9
diff --git a/metadata/md5-cache/kde-apps/dragon-18.04.1 b/metadata/md5-cache/kde-apps/dragon-18.04.1
new file mode 100644
index 000000000000..ec8a6b72b866
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dragon-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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(+)] sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A simple video player
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/dragonplayer
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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.44.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/18.04.1/src/dragon-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=834d004813a2fc11feaa289f2adb81e9
diff --git a/metadata/md5-cache/kde-apps/eventviews-18.04.0 b/metadata/md5-cache/kde-apps/eventviews-18.04.0
deleted file mode 100644
index 347ffd9c8276..000000000000
--- a/metadata/md5-cache/kde-apps/eventviews-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkdepim-18.04.0: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Calendar viewer for KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkdepim-18.04.0: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.44.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/18.04.0/src/eventviews-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b62db6ab014bd720cd9adbfb5230787b
diff --git a/metadata/md5-cache/kde-apps/eventviews-18.04.1 b/metadata/md5-cache/kde-apps/eventviews-18.04.1
new file mode 100644
index 000000000000..9f7cbfe0d564
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/eventviews-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Calendar viewer for KDE PIM
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1: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.44.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/18.04.1/src/eventviews-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b62db6ab014bd720cd9adbfb5230787b
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.0 b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.0
deleted file mode 100644
index 9878f8f87eee..000000000000
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=FFmpeg based thumbnail generator for video files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libav debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kio-5.44.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.44.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/18.04.0/src/ffmpegthumbs-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90f77bcfef00d17eed6016ea20d42c83
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.1 b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.1
new file mode 100644
index 000000000000..44267d27fb36
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=FFmpeg based thumbnail generator for video files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=libav debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kio-5.44.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.44.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/18.04.1/src/ffmpegthumbs-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=90f77bcfef00d17eed6016ea20d42c83
diff --git a/metadata/md5-cache/kde-apps/filelight-18.04.0 b/metadata/md5-cache/kde-apps/filelight-18.04.0
deleted file mode 100644
index dbc95011eb6f..000000000000
--- a/metadata/md5-cache/kde-apps/filelight-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
-EAPI=6
-HOMEPAGE=https://utils.kde.org/projects/filelight/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/filelight-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4303f8cd013b429bb045feb854e25fb7
diff --git a/metadata/md5-cache/kde-apps/filelight-18.04.1 b/metadata/md5-cache/kde-apps/filelight-18.04.1
new file mode 100644
index 000000000000..f8a09560735d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/filelight-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
+EAPI=6
+HOMEPAGE=https://utils.kde.org/projects/filelight/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/filelight-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4303f8cd013b429bb045feb854e25fb7
diff --git a/metadata/md5-cache/kde-apps/granatier-18.04.0 b/metadata/md5-cache/kde-apps/granatier-18.04.0
deleted file mode 100644
index 989a7ae48804..000000000000
--- a/metadata/md5-cache/kde-apps/granatier-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Bomberman game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/granatier/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/granatier-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1fc6e3916f0e28d4bf26a547c437b5e0
diff --git a/metadata/md5-cache/kde-apps/granatier-18.04.1 b/metadata/md5-cache/kde-apps/granatier-18.04.1
new file mode 100644
index 000000000000..4a0efabb033a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/granatier-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Bomberman game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/granatier/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/granatier-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1fc6e3916f0e28d4bf26a547c437b5e0
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-18.04.0 b/metadata/md5-cache/kde-apps/grantlee-editor-18.04.0
deleted file mode 100644
index c1300c703791..000000000000
--- a/metadata/md5-cache/kde-apps/grantlee-editor-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/messagelib-18.04.0:5 >=kde-apps/pimcommon-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/messagelib-18.04.0:5 >=kde-apps/pimcommon-18.04.0: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.44.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/18.04.0/src/grantlee-editor-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ec80aa9597d8f0a4bffaae82c6baaef
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-18.04.1 b/metadata/md5-cache/kde-apps/grantlee-editor-18.04.1
new file mode 100644
index 000000000000..2fea2e14624d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.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/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.44.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/18.04.1/src/grantlee-editor-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5ec80aa9597d8f0a4bffaae82c6baaef
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-18.04.0 b/metadata/md5-cache/kde-apps/grantleetheme-18.04.0
deleted file mode 100644
index 5e93b3d1d53a..000000000000
--- a/metadata/md5-cache/kde-apps/grantleetheme-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for Grantlee plugins
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantleetheme:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/grantleetheme-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=898ef64f1104d2ac3d24748ddebd137e
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-18.04.1 b/metadata/md5-cache/kde-apps/grantleetheme-18.04.1
new file mode 100644
index 000000000000..cf36b5e66be3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantleetheme-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for Grantlee plugins
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantleetheme:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/grantleetheme-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=898ef64f1104d2ac3d24748ddebd137e
diff --git a/metadata/md5-cache/kde-apps/gwenview-18.04.0 b/metadata/md5-cache/kde-apps/gwenview-18.04.0
deleted file mode 100644
index 8d7cd5f07ba5..000000000000
--- a/metadata/md5-cache/kde-apps/gwenview-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0: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 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.04.0:5= ) raw? ( >=kde-apps/libkdcraw-18.04.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.44.0:5 >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE image viewer
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
-IUSE=fits kipi raw semantic-desktop X debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0: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 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.04.0:5= ) raw? ( >=kde-apps/libkdcraw-18.04.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.44.0:5 >=dev-qt/qtimageformats-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/gwenview:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/gwenview-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98beb05dffc896d6da1a7f4675fbd254
diff --git a/metadata/md5-cache/kde-apps/gwenview-18.04.1 b/metadata/md5-cache/kde-apps/gwenview-18.04.1
new file mode 100644
index 000000000000..1e643d9a87b3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/gwenview-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0: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 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.04.1:5= ) raw? ( >=kde-apps/libkdcraw-18.04.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.44.0:5 >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE image viewer
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
+IUSE=fits kipi raw semantic-desktop X debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0: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 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.04.1:5= ) raw? ( >=kde-apps/libkdcraw-18.04.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.44.0:5 >=dev-qt/qtimageformats-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/gwenview:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/gwenview-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=98beb05dffc896d6da1a7f4675fbd254
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-18.04.0 b/metadata/md5-cache/kde-apps/incidenceeditor-18.04.0
deleted file mode 100644
index 1792d07e1296..000000000000
--- a/metadata/md5-cache/kde-apps/incidenceeditor-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/eventviews-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kldap-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkdepim-18.04.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/kdiagram:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Incidence editor for korganizer
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/eventviews-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kldap-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkdepim-18.04.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/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/incidenceeditor-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c917dbc000dba48901c0c94ea67d0d02
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-18.04.1 b/metadata/md5-cache/kde-apps/incidenceeditor-18.04.1
new file mode 100644
index 000000000000..021a04d991df
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/eventviews-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Incidence editor for korganizer
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/eventviews-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1: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.44.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/18.04.1/src/incidenceeditor-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c917dbc000dba48901c0c94ea67d0d02
diff --git a/metadata/md5-cache/kde-apps/juk-18.04.0 b/metadata/md5-cache/kde-apps/juk-18.04.0
deleted file mode 100644
index 64b7617f19fe..000000000000
--- a/metadata/md5-cache/kde-apps/juk-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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/qtsvg-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.6 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Jukebox and music manager by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/juk/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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/qtsvg-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.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/juk-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b1a312b62adc930756214dcf930e9b26
diff --git a/metadata/md5-cache/kde-apps/juk-18.04.1 b/metadata/md5-cache/kde-apps/juk-18.04.1
new file mode 100644
index 000000000000..1967255963c8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/juk-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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/qtsvg-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.6 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Jukebox and music manager by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/juk/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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/qtsvg-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.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/juk-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1a312b62adc930756214dcf930e9b26
diff --git a/metadata/md5-cache/kde-apps/k3b-18.04.0 b/metadata/md5-cache/kde-apps/k3b-18.04.0
deleted file mode 100644
index 9f02d712670b..000000000000
--- a/metadata/md5-cache/kde-apps/k3b-18.04.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.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5[taglib?] >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=kde-apps/libkcddb-18.04.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/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/K3b
-IUSE=dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5[taglib?] >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=kde-apps/libkcddb-18.04.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/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/k3b:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/k3b-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db24cbcfb8db962b97b8c7183953a2a2
diff --git a/metadata/md5-cache/kde-apps/k3b-18.04.1 b/metadata/md5-cache/kde-apps/k3b-18.04.1
new file mode 100644
index 000000000000..364123f662ab
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/k3b-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5[taglib?] >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=kde-apps/libkcddb-18.04.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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/K3b
+IUSE=dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 FDL-1.2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5[taglib?] >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=kde-apps/libkcddb-18.04.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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/k3b:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/k3b-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=db24cbcfb8db962b97b8c7183953a2a2
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.0 b/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.0
deleted file mode 100644
index bc8631d26db6..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.44.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-integration:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kaccounts-integration-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=352579aaa3cce8fd6076fa43642a3a71
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.1 b/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.1
new file mode 100644
index 000000000000..7d587450ea2b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.44.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-integration:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kaccounts-integration-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=352579aaa3cce8fd6076fa43642a3a71
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.0 b/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.0
deleted file mode 100644
index 03db7a46140d..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.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.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kpackage-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE accounts providers
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kpackage-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.0: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.44.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/18.04.0/src/kaccounts-providers-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1dd0245e438313da23f5a47d54560e5c
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.1 b/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.1
new file mode 100644
index 000000000000..e4809aabc332
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kpackage-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE accounts providers
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kpackage-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.1: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.44.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/18.04.1/src/kaccounts-providers-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1dd0245e438313da23f5a47d54560e5c
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-18.04.0 b/metadata/md5-cache/kde-apps/kaddressbook-18.04.0
deleted file mode 100644
index 3daa86d3bc25..000000000000
--- a/metadata/md5-cache/kde-apps/kaddressbook-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-search-18.04.0:5 >=kde-apps/grantleetheme-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/libgravatar-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/libkleo-18.04.0:5 >=kde-apps/pimcommon-18.04.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 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-18.04.0:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Address book application based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kaddressbook/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-search-18.04.0:5 >=kde-apps/grantleetheme-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/libgravatar-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/libkleo-18.04.0:5 >=kde-apps/pimcommon-18.04.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 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kaddressbook-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=604d149cb0bd612ff8e17cca9eed3327
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-18.04.1 b/metadata/md5-cache/kde-apps/kaddressbook-18.04.1
new file mode 100644
index 000000000000..ed6c4e5bc934
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaddressbook-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/libgravatar-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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 test? ( >=kde-apps/akonadi-18.04.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Address book application based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kaddressbook/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/libgravatar-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kaddressbook-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=604d149cb0bd612ff8e17cca9eed3327
diff --git a/metadata/md5-cache/kde-apps/kajongg-18.04.0 b/metadata/md5-cache/kde-apps/kajongg-18.04.0
deleted file mode 100644
index 1c2be1ff4695..000000000000
--- a/metadata/md5-cache/kde-apps/kajongg-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtcore-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-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classical Mah Jongg for four players
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kajongg/
-IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtcore-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-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-apps/libkmahjongg-18.04.0:5 !kde-apps/kajongg:4 !<kde-apps/kde4-l10n-17.03.90:4
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kajongg-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba6255d3bad662d926beb4e1b49b0819
diff --git a/metadata/md5-cache/kde-apps/kajongg-18.04.1 b/metadata/md5-cache/kde-apps/kajongg-18.04.1
new file mode 100644
index 000000000000..950ac3b2af44
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kajongg-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtcore-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-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classical Mah Jongg for four players
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kajongg/
+IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtcore-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-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-apps/libkmahjongg-18.04.1:5 !kde-apps/kajongg:4 !<kde-apps/kde4-l10n-17.03.90:4
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kajongg-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba6255d3bad662d926beb4e1b49b0819
diff --git a/metadata/md5-cache/kde-apps/kalarm-18.04.0 b/metadata/md5-cache/kde-apps/kalarm-18.04.0
deleted file mode 100644
index 7f0ee3fe394c..000000000000
--- a/metadata/md5-cache/kde-apps/kalarm-18.04.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.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kalarmcal-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/mailcommon-18.04.0:5 >=kde-apps/pimcommon-18.04.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-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KAlarm
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kalarmcal-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/mailcommon-18.04.0:5 >=kde-apps/pimcommon-18.04.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-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-18.04.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kalarm-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3d5a62ab27ea3ce2d7e639b902449f27
diff --git a/metadata/md5-cache/kde-apps/kalarm-18.04.1 b/metadata/md5-cache/kde-apps/kalarm-18.04.1
new file mode 100644
index 000000000000..e6c34d32ed08
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarm-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kalarmcal-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/pimcommon-18.04.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/qtwidgets-5.7.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KAlarm
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kalarmcal-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/pimcommon-18.04.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/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-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kalarm-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3d5a62ab27ea3ce2d7e639b902449f27
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-18.04.0 b/metadata/md5-cache/kde-apps/kalarmcal-18.04.0
deleted file mode 100644
index 8d89849971c5..000000000000
--- a/metadata/md5-cache/kde-apps/kalarmcal-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Client library to access and handling of KAlarm calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kalarmcal-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ff6e9620557fe44bfdb1ebb2434ac8a
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-18.04.1 b/metadata/md5-cache/kde-apps/kalarmcal-18.04.1
new file mode 100644
index 000000000000..341c6b34d256
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarmcal-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Client library to access and handling of KAlarm calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kalarmcal-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5ff6e9620557fe44bfdb1ebb2434ac8a
diff --git a/metadata/md5-cache/kde-apps/kalgebra-18.04.0 b/metadata/md5-cache/kde-apps/kalgebra-18.04.0
deleted file mode 100644
index c02eaa59a853..000000000000
--- a/metadata/md5-cache/kde-apps/kalgebra-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/analitza-18.04.0: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= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=MathML-based graph calculator by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/
-IUSE=readline debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/analitza-18.04.0: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.44.0:5 >=dev-qt/qtquickcontrols-5.7.1:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kalgebra-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=868f67aaa444892b04d3889e0933976e
diff --git a/metadata/md5-cache/kde-apps/kalgebra-18.04.1 b/metadata/md5-cache/kde-apps/kalgebra-18.04.1
new file mode 100644
index 000000000000..d223405c793b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalgebra-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/analitza-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 readline? ( sys-libs/readline:0= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=MathML-based graph calculator by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/
+IUSE=readline debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/analitza-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols-5.7.1:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kalgebra-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=868f67aaa444892b04d3889e0933976e
diff --git a/metadata/md5-cache/kde-apps/kalzium-18.04.0 b/metadata/md5-cache/kde-apps/kalzium-18.04.0
deleted file mode 100644
index 229b969b83ac..000000000000
--- a/metadata/md5-cache/kde-apps/kalzium-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kunitconversion-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-qt/qtopengl-5.7.1:5 >=kde-frameworks/knewstuff-5.44.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kunitconversion-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-qt/qtopengl-5.7.1:5 >=kde-frameworks/knewstuff-5.44.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.44.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/18.04.0/src/kalzium-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc3707ebf2a891099a3c0771d1cbe181
diff --git a/metadata/md5-cache/kde-apps/kalzium-18.04.1 b/metadata/md5-cache/kde-apps/kalzium-18.04.1
new file mode 100644
index 000000000000..38ea6c0db054
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalzium-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kunitconversion-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-qt/qtopengl-5.7.1:5 >=kde-frameworks/knewstuff-5.44.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kunitconversion-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-qt/qtopengl-5.7.1:5 >=kde-frameworks/knewstuff-5.44.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.44.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/18.04.1/src/kalzium-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bc3707ebf2a891099a3c0771d1cbe181
diff --git a/metadata/md5-cache/kde-apps/kamera-18.04.0 b/metadata/md5-cache/kde-apps/kamera-18.04.0
deleted file mode 100644
index 8db3534e2456..000000000000
--- a/metadata/md5-cache/kde-apps/kamera-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libgphoto2:= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma integration for gphoto2 cameras
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.0/src/kamera-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9953179b6598ad830fa59fb156c2807d
diff --git a/metadata/md5-cache/kde-apps/kamera-18.04.1 b/metadata/md5-cache/kde-apps/kamera-18.04.1
new file mode 100644
index 000000000000..4e561a143425
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamera-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libgphoto2:= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma integration for gphoto2 cameras
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.1/src/kamera-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9953179b6598ad830fa59fb156c2807d
diff --git a/metadata/md5-cache/kde-apps/kamoso-18.04.0 b/metadata/md5-cache/kde-apps/kamoso-18.04.0
deleted file mode 100644
index 1d434532a228..000000000000
--- a/metadata/md5-cache/kde-apps/kamoso-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/purpose-5.44.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/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to take pictures and videos from your webcam by KDE
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/Kamoso
-IUSE=test debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/purpose-5.44.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/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols2-5.7.1:5 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamoso:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kamoso-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=97979e96f8809e149c9e1e79d28a9e4e
diff --git a/metadata/md5-cache/kde-apps/kamoso-18.04.1 b/metadata/md5-cache/kde-apps/kamoso-18.04.1
new file mode 100644
index 000000000000..d177c09e058f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamoso-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/purpose-5.44.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/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to take pictures and videos from your webcam by KDE
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/Kamoso
+IUSE=test debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/purpose-5.44.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/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols2-5.7.1:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamoso: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/18.04.1/src/kamoso-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6146feb9cf4b777333466230bbc986e2
diff --git a/metadata/md5-cache/kde-apps/kamoso-3.2.4 b/metadata/md5-cache/kde-apps/kamoso-3.2.4
deleted file mode 100644
index 4aefdf379b8e..000000000000
--- a/metadata/md5-cache/kde-apps/kamoso-3.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kde-frameworks/purpose:5 media-libs/qt-gstreamer[qt5(+)] virtual/libudev:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to take pictures and videos from your webcam by KDE
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/Kamoso
-IUSE=debug +handbook
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kde-frameworks/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.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamoso: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/kamoso/3.2/src/kamoso-3.2.4.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=834ab79394623be076fd9de77eb9d374
diff --git a/metadata/md5-cache/kde-apps/kanagram-18.04.0 b/metadata/md5-cache/kde-apps/kanagram-18.04.0
deleted file mode 100644
index 9c2de7418862..000000000000
--- a/metadata/md5-cache/kde-apps/kanagram-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.0: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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game based on anagrams of words
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/
-IUSE=speech debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.0: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-18.04.0: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.44.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/18.04.0/src/kanagram-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c8b218c50117bffe89f3733bab3ad5c
diff --git a/metadata/md5-cache/kde-apps/kanagram-18.04.1 b/metadata/md5-cache/kde-apps/kanagram-18.04.1
new file mode 100644
index 000000000000..92b7ae265288
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kanagram-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.1: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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game based on anagrams of words
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/
+IUSE=speech debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.1: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-18.04.1: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.44.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/18.04.1/src/kanagram-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c8b218c50117bffe89f3733bab3ad5c
diff --git a/metadata/md5-cache/kde-apps/kapman-18.04.0 b/metadata/md5-cache/kde-apps/kapman-18.04.0
deleted file mode 100644
index 50e9c60f1478..000000000000
--- a/metadata/md5-cache/kde-apps/kapman-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Pac-Man clone by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kapman/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kapman-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5105c6846ca41671e26416e7da1c9631
diff --git a/metadata/md5-cache/kde-apps/kapman-18.04.1 b/metadata/md5-cache/kde-apps/kapman-18.04.1
new file mode 100644
index 000000000000..837c1dc4feb5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapman-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Pac-Man clone by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kapman/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/kapman-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5105c6846ca41671e26416e7da1c9631
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-18.04.0 b/metadata/md5-cache/kde-apps/kapptemplate-18.04.0
deleted file mode 100644
index c4c19f766a80..000000000000
--- a/metadata/md5-cache/kde-apps/kapptemplate-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A shell script to create the necessary framework to develop KDE applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kapptemplate
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.0/src/kapptemplate-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b7f739e0dc17f0121b73752d9b06402
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-18.04.1 b/metadata/md5-cache/kde-apps/kapptemplate-18.04.1
new file mode 100644
index 000000000000..cb4c58e5362d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapptemplate-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A shell script to create the necessary framework to develop KDE applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kapptemplate
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.1/src/kapptemplate-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9b7f739e0dc17f0121b73752d9b06402
diff --git a/metadata/md5-cache/kde-apps/kate-18.04.0 b/metadata/md5-cache/kde-apps/kate-18.04.0
deleted file mode 100644
index 765673d8fade..000000000000
--- a/metadata/md5-cache/kde-apps/kate-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 addons? ( >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtsql-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kate is an advanced text editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kate https://kate-editor.org/
-IUSE=+addons test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 addons? ( >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtsql-5.7.1:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kate-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=94a97919452be46522414dcf34e39f42
diff --git a/metadata/md5-cache/kde-apps/kate-18.04.1 b/metadata/md5-cache/kde-apps/kate-18.04.1
new file mode 100644
index 000000000000..415f3251f4e5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kate-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 addons? ( >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtsql-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kate is an advanced text editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kate https://kate-editor.org/
+IUSE=+addons test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 addons? ( >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtsql-5.7.1:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kate-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=94a97919452be46522414dcf34e39f42
diff --git a/metadata/md5-cache/kde-apps/katomic-18.04.0 b/metadata/md5-cache/kde-apps/katomic-18.04.0
deleted file mode 100644
index 722f2f1486bc..000000000000
--- a/metadata/md5-cache/kde-apps/katomic-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Atomic Entertainment Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/katomic/ https://games.kde.org/game.php?game=katomic
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.0/src/katomic-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=698b5cca1c7e3bc36e0d78aec4c21985
diff --git a/metadata/md5-cache/kde-apps/katomic-18.04.1 b/metadata/md5-cache/kde-apps/katomic-18.04.1
new file mode 100644
index 000000000000..13d7eab44132
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/katomic-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Atomic Entertainment Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/katomic/ https://games.kde.org/game.php?game=katomic
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/katomic-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=698b5cca1c7e3bc36e0d78aec4c21985
diff --git a/metadata/md5-cache/kde-apps/kbackup-18.04.0 b/metadata/md5-cache/kde-apps/kbackup-18.04.0
deleted file mode 100644
index 00c5b372cc72..000000000000
--- a/metadata/md5-cache/kde-apps/kbackup-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Program that lets you back up any directories or files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbackup: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/18.04.0/src/kbackup-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=993ec9361abad4d3a7639df6412f173a
diff --git a/metadata/md5-cache/kde-apps/kbackup-18.04.1 b/metadata/md5-cache/kde-apps/kbackup-18.04.1
new file mode 100644
index 000000000000..a05d7b1e7b7d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbackup-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Program that lets you back up any directories or files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbackup: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/18.04.1/src/kbackup-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=993ec9361abad4d3a7639df6412f173a
diff --git a/metadata/md5-cache/kde-apps/kblackbox-18.04.0 b/metadata/md5-cache/kde-apps/kblackbox-18.04.0
deleted file mode 100644
index 530d778e2763..000000000000
--- a/metadata/md5-cache/kde-apps/kblackbox-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Blackbox Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kblackbox-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2a4008003b755fad9cafa77d9f6127ed
diff --git a/metadata/md5-cache/kde-apps/kblackbox-18.04.1 b/metadata/md5-cache/kde-apps/kblackbox-18.04.1
new file mode 100644
index 000000000000..248c34d9b1eb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblackbox-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Blackbox Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/kblackbox-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2a4008003b755fad9cafa77d9f6127ed
diff --git a/metadata/md5-cache/kde-apps/kblocks-18.04.0 b/metadata/md5-cache/kde-apps/kblocks-18.04.0
deleted file mode 100644
index e69b92400753..000000000000
--- a/metadata/md5-cache/kde-apps/kblocks-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A single-player Tetris-like KDE game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kblocks/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/kblocks-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48a52cfbfe867bc24341d31ae0b72372
diff --git a/metadata/md5-cache/kde-apps/kblocks-18.04.1 b/metadata/md5-cache/kde-apps/kblocks-18.04.1
new file mode 100644
index 000000000000..1314207900ba
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblocks-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A single-player Tetris-like KDE game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kblocks/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kblocks-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=48a52cfbfe867bc24341d31ae0b72372
diff --git a/metadata/md5-cache/kde-apps/kblog-18.04.0 b/metadata/md5-cache/kde-apps/kblog-18.04.0
deleted file mode 100644
index a4acecee85ca..000000000000
--- a/metadata/md5-cache/kde-apps/kblog-18.04.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.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlrpcclient-5.44.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/syndication-18.04.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library providing client-side support for web application remote blogging APIs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlrpcclient-5.44.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/syndication-18.04.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kblog-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=687bfb6d7023a7d91019e4d18034e3e9
diff --git a/metadata/md5-cache/kde-apps/kblog-18.04.1 b/metadata/md5-cache/kde-apps/kblog-18.04.1
new file mode 100644
index 000000000000..8c4a0ca19a2a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblog-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlrpcclient-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/syndication-18.04.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library providing client-side support for web application remote blogging APIs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlrpcclient-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/syndication-18.04.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kblog-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=687bfb6d7023a7d91019e4d18034e3e9
diff --git a/metadata/md5-cache/kde-apps/kbounce-18.04.0 b/metadata/md5-cache/kde-apps/kbounce-18.04.0
deleted file mode 100644
index 66397a25e71b..000000000000
--- a/metadata/md5-cache/kde-apps/kbounce-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Bounce Ball Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kbounce/ https://games.kde.org/game.php?game=kbounce
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.0/src/kbounce-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=235a8a30266e94b4522c647a4be063c6
diff --git a/metadata/md5-cache/kde-apps/kbounce-18.04.1 b/metadata/md5-cache/kde-apps/kbounce-18.04.1
new file mode 100644
index 000000000000..59c0404b3eda
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbounce-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Bounce Ball Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kbounce/ https://games.kde.org/game.php?game=kbounce
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/kbounce-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=235a8a30266e94b4522c647a4be063c6
diff --git a/metadata/md5-cache/kde-apps/kbreakout-18.04.0 b/metadata/md5-cache/kde-apps/kbreakout-18.04.0
deleted file mode 100644
index ab40684c3f3c..000000000000
--- a/metadata/md5-cache/kde-apps/kbreakout-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breakout-like game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kbreakout/ https://games.kde.org/game.php?game=kbreakout
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/kbreakout-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1d9e59e72529bde08051b72dfaa28465
diff --git a/metadata/md5-cache/kde-apps/kbreakout-18.04.1 b/metadata/md5-cache/kde-apps/kbreakout-18.04.1
new file mode 100644
index 000000000000..01f006a6169f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbreakout-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breakout-like game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kbreakout/ https://games.kde.org/game.php?game=kbreakout
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kbreakout-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d9e59e72529bde08051b72dfaa28465
diff --git a/metadata/md5-cache/kde-apps/kbruch-18.04.0 b/metadata/md5-cache/kde-apps/kbruch-18.04.0
deleted file mode 100644
index 32a4cd81e264..000000000000
--- a/metadata/md5-cache/kde-apps/kbruch-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Educational application to learn calculating with fractions
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kbruch-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a5edaafc5b3f1e4977091881780308e
diff --git a/metadata/md5-cache/kde-apps/kbruch-18.04.1 b/metadata/md5-cache/kde-apps/kbruch-18.04.1
new file mode 100644
index 000000000000..b8201c54c365
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbruch-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Educational application to learn calculating with fractions
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kbruch-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a5edaafc5b3f1e4977091881780308e
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-18.04.0 b/metadata/md5-cache/kde-apps/kcachegrind-18.04.0
deleted file mode 100644
index 2352107cd947..000000000000
--- a/metadata/md5-cache/kde-apps/kcachegrind-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.7.1: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Frontend for Cachegrind by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kcachegrind https://kcachegrind.github.io/html/Home.html
-IUSE=nls debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kcachegrind-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c229cb4a9001f3689c4abbec17eae5bb
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-18.04.1 b/metadata/md5-cache/kde-apps/kcachegrind-18.04.1
new file mode 100644
index 000000000000..b4fcccb02b9e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcachegrind-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.7.1: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Frontend for Cachegrind by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kcachegrind https://kcachegrind.github.io/html/Home.html
+IUSE=nls debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kcachegrind-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c229cb4a9001f3689c4abbec17eae5bb
diff --git a/metadata/md5-cache/kde-apps/kcalc-18.04.0 b/metadata/md5-cache/kde-apps/kcalc-18.04.0
deleted file mode 100644
index a3c4ffc4254d..000000000000
--- a/metadata/md5-cache/kde-apps/kcalc-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE calculator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kcalc https://utils.kde.org/projects/kcalc/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kcalc-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f967ecedf5b7d0d3a7b3d9914e32540e
diff --git a/metadata/md5-cache/kde-apps/kcalc-18.04.1 b/metadata/md5-cache/kde-apps/kcalc-18.04.1
new file mode 100644
index 000000000000..f5ec2fa7f89f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalc-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE calculator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kcalc https://utils.kde.org/projects/kcalc/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kcalc-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f967ecedf5b7d0d3a7b3d9914e32540e
diff --git a/metadata/md5-cache/kde-apps/kcalcore-18.04.0 b/metadata/md5-cache/kde-apps/kcalcore-18.04.0
deleted file mode 100644
index 4c8881395bbe..000000000000
--- a/metadata/md5-cache/kde-apps/kcalcore-18.04.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-libs/libical:= sys-devel/bison sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for handling calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ test? ( LGPL-3+ )
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalcore:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kcalcore-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=804b5b37caa3a83100cc2850a3db1785
diff --git a/metadata/md5-cache/kde-apps/kcalcore-18.04.1 b/metadata/md5-cache/kde-apps/kcalcore-18.04.1
new file mode 100644
index 000000000000..483913aeecc6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalcore-18.04.1
@@ -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-libs/libical:= sys-devel/bison sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for handling calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ test? ( LGPL-3+ )
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalcore:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kcalcore-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=804b5b37caa3a83100cc2850a3db1785
diff --git a/metadata/md5-cache/kde-apps/kcalutils-18.04.0 b/metadata/md5-cache/kde-apps/kcalutils-18.04.0
deleted file mode 100644
index d1d5273c0d51..000000000000
--- a/metadata/md5-cache/kde-apps/kcalutils-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library providing utility functions for the handling of calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalutils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kcalutils-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66aa061c6257be3beef11c05668d21e3
diff --git a/metadata/md5-cache/kde-apps/kcalutils-18.04.1 b/metadata/md5-cache/kde-apps/kcalutils-18.04.1
new file mode 100644
index 000000000000..99f335d2b9fa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalutils-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library providing utility functions for the handling of calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalutils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kcalutils-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=66aa061c6257be3beef11c05668d21e3
diff --git a/metadata/md5-cache/kde-apps/kcharselect-18.04.0 b/metadata/md5-cache/kde-apps/kcharselect-18.04.0
deleted file mode 100644
index 56783870629c..000000000000
--- a/metadata/md5-cache/kde-apps/kcharselect-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE character selection utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kcharselect https://utils.kde.org/projects/kcharselect
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kcharselect-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c151d3258499fae2ec772629d090187
diff --git a/metadata/md5-cache/kde-apps/kcharselect-18.04.1 b/metadata/md5-cache/kde-apps/kcharselect-18.04.1
new file mode 100644
index 000000000000..dc03d8fe283d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcharselect-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE character selection utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kcharselect https://utils.kde.org/projects/kcharselect
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kcharselect-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c151d3258499fae2ec772629d090187
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-18.04.0 b/metadata/md5-cache/kde-apps/kcolorchooser-18.04.0
deleted file mode 100644
index 34864aef7fdf..000000000000
--- a/metadata/md5-cache/kde-apps/kcolorchooser-18.04.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.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE color selector/editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kcolorchooser/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kcolorchooser-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2148f0838104039364c052e4bf4557d4
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-18.04.1 b/metadata/md5-cache/kde-apps/kcolorchooser-18.04.1
new file mode 100644
index 000000000000..64ffada58c04
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE color selector/editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kcolorchooser/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kcolorchooser-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2148f0838104039364c052e4bf4557d4
diff --git a/metadata/md5-cache/kde-apps/kcontacts-18.04.0 b/metadata/md5-cache/kde-apps/kcontacts-18.04.0
deleted file mode 100644
index 2efb26694f13..000000000000
--- a/metadata/md5-cache/kde-apps/kcontacts-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Address book API based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kcontacts-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=413799d606f7d9232440fb9fcf0fe374
diff --git a/metadata/md5-cache/kde-apps/kcontacts-18.04.1 b/metadata/md5-cache/kde-apps/kcontacts-18.04.1
new file mode 100644
index 000000000000..189680afa7e0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcontacts-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Address book API based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kcontacts-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4d76ea0ff094b31e51891250dcd41b6a
diff --git a/metadata/md5-cache/kde-apps/kcron-18.04.0 b/metadata/md5-cache/kde-apps/kcron-18.04.0
deleted file mode 100644
index 641a67e1d5da..000000000000
--- a/metadata/md5-cache/kde-apps/kcron-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Task Scheduler
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.0/src/kcron-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a3900686a81478a3039678547f01dbb7
diff --git a/metadata/md5-cache/kde-apps/kcron-18.04.1 b/metadata/md5-cache/kde-apps/kcron-18.04.1
new file mode 100644
index 000000000000..3c3b66b12218
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcron-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Task Scheduler
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.1/src/kcron-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a3900686a81478a3039678547f01dbb7
diff --git a/metadata/md5-cache/kde-apps/kdav-18.04.0 b/metadata/md5-cache/kde-apps/kdav-18.04.0
deleted file mode 100644
index 4214d582c194..000000000000
--- a/metadata/md5-cache/kde-apps/kdav-18.04.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.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=DAV protocol implemention with KJobs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.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.44.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/18.04.0/src/kdav-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e59f3a5bad3dbebe83dacbae44ce8075
diff --git a/metadata/md5-cache/kde-apps/kdav-18.04.1 b/metadata/md5-cache/kde-apps/kdav-18.04.1
new file mode 100644
index 000000000000..632dca032d2f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdav-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=DAV protocol implemention with KJobs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.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.44.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/18.04.1/src/kdav-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e59f3a5bad3dbebe83dacbae44ce8075
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.0 b/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.0
deleted file mode 100644
index 738227584717..000000000000
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for the KDE Applications collection
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=accessibility pim sdk
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kate-18.04.0 >=kde-apps/kdeadmin-meta-18.04.0 >=kde-apps/kdecore-meta-18.04.0 >=kde-apps/kdeedu-meta-18.04.0 >=kde-apps/kdegames-meta-18.04.0 >=kde-apps/kdegraphics-meta-18.04.0 >=kde-apps/kdemultimedia-meta-18.04.0 >=kde-apps/kdenetwork-meta-18.04.0 >=kde-apps/kdeutils-meta-18.04.0 accessibility? ( >=kde-apps/kdeaccessibility-meta-18.04.0 ) pim? ( >=kde-apps/kdepim-meta-18.04.0 ) sdk? ( >=kde-apps/kdesdk-meta-18.04.0 ) !kde-apps/kde-apps-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a0e6d1ea4df0fc3bef1a113c1f945913
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.1 b/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.1
new file mode 100644
index 000000000000..077510fc4c6b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for the KDE Applications collection
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=accessibility pim sdk
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kate-18.04.1 >=kde-apps/kdeadmin-meta-18.04.1 >=kde-apps/kdecore-meta-18.04.1 >=kde-apps/kdeedu-meta-18.04.1 >=kde-apps/kdegames-meta-18.04.1 >=kde-apps/kdegraphics-meta-18.04.1 >=kde-apps/kdemultimedia-meta-18.04.1 >=kde-apps/kdenetwork-meta-18.04.1 >=kde-apps/kdeutils-meta-18.04.1 accessibility? ( >=kde-apps/kdeaccessibility-meta-18.04.1 ) pim? ( >=kde-apps/kdepim-meta-18.04.1 ) sdk? ( >=kde-apps/kdesdk-meta-18.04.1 ) !kde-apps/kde-apps-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a0e6d1ea4df0fc3bef1a113c1f945913
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.0 b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.0
deleted file mode 100644
index 8b0a2ae7671f..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Development Scripts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!kde-apps/kde4-l10n app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kde-dev-scripts-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f83e1fe4fc7067af33d9efb06850ccd
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.1 b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.1
new file mode 100644
index 000000000000..2d174208c226
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Development Scripts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!kde-apps/kde4-l10n app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kde-dev-scripts-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f83e1fe4fc7067af33d9efb06850ccd
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.0 b/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.0
deleted file mode 100644
index 8e8c0ce454bf..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/designer-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Development Utilities
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kde-dev-utils-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=862be38ce8103f8f06d9902a2dea5b55
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.1 b/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.1
new file mode 100644
index 000000000000..3d662b59c1e6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/designer-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Development Utilities
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kde-dev-utils-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=862be38ce8103f8f06d9902a2dea5b55
diff --git a/metadata/md5-cache/kde-apps/kde-meta-18.04.0 b/metadata/md5-cache/kde-apps/kde-meta-18.04.0
deleted file mode 100644
index 8a1cb19c1101..000000000000
--- a/metadata/md5-cache/kde-apps/kde-meta-18.04.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kde-apps-meta-18.04.0 >=kde-plasma/plasma-meta-5.11.5 !kde-apps/kde-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=37a2146aed6d3954dcc2646af68e7054
diff --git a/metadata/md5-cache/kde-apps/kde-meta-18.04.1 b/metadata/md5-cache/kde-apps/kde-meta-18.04.1
new file mode 100644
index 000000000000..a5380f3cc16a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-meta-18.04.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kde-apps-meta-18.04.1 >=kde-plasma/plasma-meta-5.11.5 !kde-apps/kde-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=37a2146aed6d3954dcc2646af68e7054
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.0 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.0
deleted file mode 100644
index f2e7e094aa85..000000000000
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kmag-18.04.0 >=kde-apps/kmousetool-18.04.0 >=kde-apps/kmouth-18.04.0 !kde-apps/kdeaccessibility-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9479613a160436edf491109b1fc967f8
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.1
new file mode 100644
index 000000000000..8ed7bde2a390
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kmag-18.04.1 >=kde-apps/kmousetool-18.04.1 >=kde-apps/kmouth-18.04.1 !kde-apps/kdeaccessibility-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9479613a160436edf491109b1fc967f8
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.0 b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.0
deleted file mode 100644
index a14bdfc0f72d..000000000000
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+cron
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ksystemlog-18.04.0 cron? ( >=kde-apps/kcron-18.04.0 ) !kde-apps/kdeadmin-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7b034eccb07548568d7a8b09d102443f
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.1
new file mode 100644
index 000000000000..62dcbd10dcab
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+cron
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ksystemlog-18.04.1 cron? ( >=kde-apps/kcron-18.04.1 ) !kde-apps/kdeadmin-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7b034eccb07548568d7a8b09d102443f
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-18.04.0 b/metadata/md5-cache/kde-apps/kdebase-meta-18.04.0
deleted file mode 100644
index de6438319408..000000000000
--- a/metadata/md5-cache/kde-apps/kdebase-meta-18.04.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdecore-meta-18.04.0 >=kde-plasma/plasma-meta-5.11.5 !kde-apps/kdebase-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=223e3b031bf2c2a4c0b1cb7ebd7ee3ec
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdebase-meta-18.04.1
new file mode 100644
index 000000000000..e2b1fb814912
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-18.04.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdecore-meta-18.04.1 >=kde-plasma/plasma-meta-5.11.5 !kde-apps/kdebase-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=223e3b031bf2c2a4c0b1cb7ebd7ee3ec
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-18.04.0 b/metadata/md5-cache/kde-apps/kdebugsettings-18.04.0
deleted file mode 100644
index 457197f2c8d7..000000000000
--- a/metadata/md5-cache/kde-apps/kdebugsettings-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to enable/disable qCDebug
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdebugsettings:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kdebugsettings-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e19fa9f51a61d986e16b04b72711f6ba
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-18.04.1 b/metadata/md5-cache/kde-apps/kdebugsettings-18.04.1
new file mode 100644
index 000000000000..110c60a2c721
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to enable/disable qCDebug
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdebugsettings:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdebugsettings-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e19fa9f51a61d986e16b04b72711f6ba
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-18.04.0 b/metadata/md5-cache/kde-apps/kdecore-meta-18.04.0
deleted file mode 100644
index d00aa785f9c4..000000000000
--- a/metadata/md5-cache/kde-apps/kdecore-meta-18.04.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdecore - merge this to pull in the most basic applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-18.04.0 >=kde-apps/kdialog-18.04.0 >=kde-apps/keditbookmarks-18.04.0 >=kde-apps/kfind-18.04.0 || ( www-client/falkon www-client/qupzilla >=kde-apps/konqueror-18.04.0 ) >=kde-apps/konsole-18.04.0 >=kde-apps/kwrite-18.04.0 handbook? ( >=kde-apps/khelpcenter-18.04.0 ) !kde-apps/kdecore-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9bae73c549428796596a722374cb8938
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdecore-meta-18.04.1
new file mode 100644
index 000000000000..7a3576c8e056
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-18.04.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdecore - merge this to pull in the most basic applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dolphin-18.04.1 >=kde-apps/kdialog-18.04.1 >=kde-apps/keditbookmarks-18.04.1 >=kde-apps/kfind-18.04.1 || ( www-client/falkon www-client/qupzilla >=kde-apps/konqueror-18.04.1 ) >=kde-apps/konsole-18.04.1 >=kde-apps/kwrite-18.04.1 handbook? ( >=kde-apps/khelpcenter-18.04.1 ) !kde-apps/kdecore-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9bae73c549428796596a722374cb8938
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-18.04.0 b/metadata/md5-cache/kde-apps/kdeedu-data-18.04.0
deleted file mode 100644
index 325387bcaa8b..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-data-18.04.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.44.0:5 >=dev-qt/qtcore-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Shared icons, artwork and data files for educational applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kdeedu-data-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b17d9a218f7520b4abf43aacfe6f7ff5
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-18.04.1 b/metadata/md5-cache/kde-apps/kdeedu-data-18.04.1
new file mode 100644
index 000000000000..ad3cb82bebc8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-18.04.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Shared icons, artwork and data files for educational applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdeedu-data-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b17d9a218f7520b4abf43aacfe6f7ff5
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.0 b/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.0
deleted file mode 100644
index 017d13a1d627..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
-EAPI=6
-HOMEPAGE=https://edu.kde.org
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/analitza-18.04.0 >=kde-apps/artikulate-18.04.0 >=kde-apps/blinken-18.04.0 >=kde-apps/cantor-18.04.0 >=kde-apps/kalgebra-18.04.0 >=kde-apps/kalzium-18.04.0 >=kde-apps/kanagram-18.04.0 >=kde-apps/kbruch-18.04.0 >=kde-apps/kdeedu-data-18.04.0 >=kde-apps/kgeography-18.04.0 >=kde-apps/khangman-18.04.0 >=kde-apps/kig-18.04.0 >=kde-apps/kiten-18.04.0 >=kde-apps/klettres-18.04.0 >=kde-apps/kmplot-18.04.0 >=kde-apps/kqtquickcharts-18.04.0 >=kde-apps/ktouch-18.04.0 >=kde-apps/kturtle-18.04.0 >=kde-apps/kwordquiz-18.04.0 >=kde-apps/libkeduvocdocument-18.04.0 >=kde-apps/marble-18.04.0 >=kde-apps/minuet-18.04.0 >=kde-apps/parley-18.04.0 >=kde-apps/rocs-18.04.0 >=kde-apps/step-18.04.0 !kde-apps/kdeedu-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fad2326e88a11480daf662622befb4b9
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.1
new file mode 100644
index 000000000000..ac89144aca3a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
+EAPI=6
+HOMEPAGE=https://edu.kde.org
+IUSE=+webengine
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/analitza-18.04.1 >=kde-apps/artikulate-18.04.1 >=kde-apps/blinken-18.04.1 >=kde-apps/cantor-18.04.1 >=kde-apps/kalzium-18.04.1 >=kde-apps/kanagram-18.04.1 >=kde-apps/kbruch-18.04.1 >=kde-apps/kdeedu-data-18.04.1 >=kde-apps/kgeography-18.04.1 >=kde-apps/khangman-18.04.1 >=kde-apps/kig-18.04.1 >=kde-apps/kiten-18.04.1 >=kde-apps/klettres-18.04.1 >=kde-apps/kmplot-18.04.1 >=kde-apps/kqtquickcharts-18.04.1 >=kde-apps/ktouch-18.04.1 >=kde-apps/kturtle-18.04.1 >=kde-apps/kwordquiz-18.04.1 >=kde-apps/libkeduvocdocument-18.04.1 >=kde-apps/marble-18.04.1 >=kde-apps/minuet-18.04.1 >=kde-apps/rocs-18.04.1 >=kde-apps/step-18.04.1 webengine? ( >=kde-apps/kalgebra-18.04.1 >=kde-apps/parley-18.04.1 ) !kde-apps/kdeedu-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=916f4ff673e41d1868eff4da4ada06e0
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-18.04.0 b/metadata/md5-cache/kde-apps/kdegames-meta-18.04.0
deleted file mode 100644
index afff32543fb8..000000000000
--- a/metadata/md5-cache/kde-apps/kdegames-meta-18.04.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
-EAPI=6
-HOMEPAGE=https://games.kde.org/
-IUSE=opengl python
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/bomber-18.04.0 >=kde-apps/bovo-18.04.0 >=kde-apps/granatier-18.04.0 >=kde-apps/kapman-18.04.0 >=kde-apps/katomic-18.04.0 >=kde-apps/kblackbox-18.04.0 >=kde-apps/kblocks-18.04.0 >=kde-apps/kbounce-18.04.0 >=kde-apps/kbreakout-18.04.0 >=kde-apps/kdiamond-18.04.0 >=kde-apps/kfourinline-18.04.0 >=kde-apps/kgoldrunner-18.04.0 >=kde-apps/kigo-18.04.0 >=kde-apps/killbots-18.04.0 >=kde-apps/kiriki-18.04.0 >=kde-apps/kjumpingcube-18.04.0 >=kde-apps/klickety-18.04.0 >=kde-apps/klines-18.04.0 >=kde-apps/kmahjongg-18.04.0 >=kde-apps/kmines-18.04.0 >=kde-apps/knavalbattle-18.04.0 >=kde-apps/knetwalk-18.04.0 >=kde-apps/kolf-18.04.0 >=kde-apps/kollision-18.04.0 >=kde-apps/konquest-18.04.0 >=kde-apps/kpat-18.04.0 >=kde-apps/kreversi-18.04.0 >=kde-apps/kshisen-18.04.0 >=kde-apps/ksirk-18.04.0 >=kde-apps/ksnakeduel-18.04.0 >=kde-apps/kspaceduel-18.04.0 >=kde-apps/ksquares-18.04.0 >=kde-apps/ktuberling-18.04.0 >=kde-apps/libkdegames-18.04.0 >=kde-apps/libkmahjongg-18.04.0 >=kde-apps/lskat-18.04.0 >=kde-apps/palapeli-18.04.0 >=kde-apps/picmi-18.04.0 opengl? ( >=kde-apps/ksudoku-18.04.0 >=kde-apps/kubrick-18.04.0 ) python? ( >=kde-apps/kajongg-18.04.0 ) !kde-apps/kdegames-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ac739c727fa23cf0a94273aae73da775
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdegames-meta-18.04.1
new file mode 100644
index 000000000000..0a88bfdaf993
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-18.04.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
+EAPI=6
+HOMEPAGE=https://games.kde.org/
+IUSE=opengl python
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/bomber-18.04.1 >=kde-apps/bovo-18.04.1 >=kde-apps/granatier-18.04.1 >=kde-apps/kapman-18.04.1 >=kde-apps/katomic-18.04.1 >=kde-apps/kblackbox-18.04.1 >=kde-apps/kblocks-18.04.1 >=kde-apps/kbounce-18.04.1 >=kde-apps/kbreakout-18.04.1 >=kde-apps/kdiamond-18.04.1 >=kde-apps/kfourinline-18.04.1 >=kde-apps/kgoldrunner-18.04.1 >=kde-apps/kigo-18.04.1 >=kde-apps/killbots-18.04.1 >=kde-apps/kiriki-18.04.1 >=kde-apps/kjumpingcube-18.04.1 >=kde-apps/klickety-18.04.1 >=kde-apps/klines-18.04.1 >=kde-apps/kmahjongg-18.04.1 >=kde-apps/kmines-18.04.1 >=kde-apps/knavalbattle-18.04.1 >=kde-apps/knetwalk-18.04.1 >=kde-apps/kolf-18.04.1 >=kde-apps/kollision-18.04.1 >=kde-apps/konquest-18.04.1 >=kde-apps/kpat-18.04.1 >=kde-apps/kreversi-18.04.1 >=kde-apps/kshisen-18.04.1 >=kde-apps/ksirk-18.04.1 >=kde-apps/ksnakeduel-18.04.1 >=kde-apps/kspaceduel-18.04.1 >=kde-apps/ksquares-18.04.1 >=kde-apps/ktuberling-18.04.1 >=kde-apps/libkdegames-18.04.1 >=kde-apps/libkmahjongg-18.04.1 >=kde-apps/lskat-18.04.1 >=kde-apps/palapeli-18.04.1 >=kde-apps/picmi-18.04.1 opengl? ( >=kde-apps/ksudoku-18.04.1 >=kde-apps/kubrick-18.04.1 ) python? ( >=kde-apps/kajongg-18.04.1 ) !kde-apps/kdegames-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ac739c727fa23cf0a94273aae73da775
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.0 b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.0
deleted file mode 100644
index 6c5f93cc156a..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/
-IUSE=scanner
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/gwenview-18.04.0 >=kde-apps/kamera-18.04.0 >=kde-apps/kcolorchooser-18.04.0 >=kde-apps/kdegraphics-mobipocket-18.04.0 >=kde-apps/kolourpaint-18.04.0 >=kde-apps/kruler-18.04.0 >=kde-apps/libkdcraw-18.04.0 >=kde-apps/libkexiv2-18.04.0 >=kde-apps/libkipi-18.04.0 >=kde-apps/okular-18.04.0 >=kde-apps/spectacle-18.04.0 >=kde-apps/svgpart-18.04.0 >=kde-apps/thumbnailers-18.04.0 scanner? ( >=kde-apps/libksane-18.04.0 ) !kde-apps/kdegraphics-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1efcf975eeebf133f72e1b0dcd5d1660
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.1
new file mode 100644
index 000000000000..10391a778f04
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/
+IUSE=scanner
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/gwenview-18.04.1 >=kde-apps/kamera-18.04.1 >=kde-apps/kcolorchooser-18.04.1 >=kde-apps/kdegraphics-mobipocket-18.04.1 >=kde-apps/kolourpaint-18.04.1 >=kde-apps/kruler-18.04.1 >=kde-apps/libkdcraw-18.04.1 >=kde-apps/libkexiv2-18.04.1 >=kde-apps/libkipi-18.04.1 >=kde-apps/okular-18.04.1 >=kde-apps/spectacle-18.04.1 >=kde-apps/svgpart-18.04.1 >=kde-apps/thumbnailers-18.04.1 scanner? ( >=kde-apps/libksane-18.04.1 ) !kde-apps/kdegraphics-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1efcf975eeebf133f72e1b0dcd5d1660
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.0 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.0
deleted file mode 100644
index a6f920571c7a..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.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 thumbnail? ( >=kde-frameworks/kio-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to support mobipocket ebooks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+thumbnail debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 thumbnail? ( >=kde-frameworks/kio-5.44.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kdegraphics-mobipocket-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e74ae9f281704f214a75214aef016f87
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.1 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.1
new file mode 100644
index 000000000000..d03c421fdc72
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.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 thumbnail? ( >=kde-frameworks/kio-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library to support mobipocket ebooks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+thumbnail debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 thumbnail? ( >=kde-frameworks/kio-5.44.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kdegraphics-mobipocket-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e74ae9f281704f214a75214aef016f87
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.0 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.0
deleted file mode 100644
index 95361ce4eced..000000000000
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/ https://multimedia.kde.org/
-IUSE=+cdrom +ffmpeg
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dragon-18.04.0 >=kde-apps/juk-18.04.0 >=kde-apps/kamoso-18.04.0 >=kde-apps/kdenlive-18.04.0 >=kde-apps/kmix-18.04.0 >=kde-apps/kwave-18.04.0 >=kde-apps/libkcddb-18.04.0 cdrom? ( >=kde-apps/audiocd-kio-18.04.0 >=kde-apps/k3b-18.04.0 >=kde-apps/libkcompactdisc-18.04.0 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-18.04.0 ) !kde-apps/kdemultimedia-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ef74f5d236f323f62b427265785f8ca3
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.1
new file mode 100644
index 000000000000..c58a8d962ca2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/ https://multimedia.kde.org/
+IUSE=+cdrom +ffmpeg gstreamer
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dragon-18.04.1 >=kde-apps/juk-18.04.1 >=kde-apps/kdenlive-18.04.1 >=kde-apps/kmix-18.04.1 >=kde-apps/kwave-18.04.1 >=kde-apps/libkcddb-18.04.1 cdrom? ( >=kde-apps/audiocd-kio-18.04.1 >=kde-apps/k3b-18.04.1 >=kde-apps/libkcompactdisc-18.04.1 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-18.04.1 ) gstreamer? ( >=kde-apps/kamoso-18.04.1 ) !kde-apps/kdemultimedia-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=19533069cf8a831929fa766cdc8d0381
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.0 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.0
deleted file mode 100644
index d42271a187e2..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kcontrol filesharing config module for SMB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.0/src/kdenetwork-filesharing-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c2abbae7a7066633d084f335a6dc9f7b
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.1 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.1
new file mode 100644
index 000000000000..f1dd12b10971
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kcontrol filesharing config module for SMB
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.1/src/kdenetwork-filesharing-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c2abbae7a7066633d084f335a6dc9f7b
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.0 b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.0
deleted file mode 100644
index 65521399f7e4..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdenetwork-filesharing-18.04.0 >=kde-apps/kget-18.04.0 >=kde-apps/krdc-18.04.0 >=kde-apps/kopete-18.04.0 >=kde-apps/krfb-18.04.0 >=kde-apps/plasma-telepathy-meta-18.04.0 >=kde-apps/zeroconf-ioslave-18.04.0 !kde-apps/kdenetwork-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=05354ccea4acc8204f2a6834e02e4b11
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.1
new file mode 100644
index 000000000000..cbe3286b74ee
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+telepathy
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdenetwork-filesharing-18.04.1 >=kde-apps/kget-18.04.1 >=kde-apps/krdc-18.04.1 >=kde-apps/kopete-18.04.1 >=kde-apps/krfb-18.04.1 >=kde-apps/zeroconf-ioslave-18.04.1 telepathy? ( >=kde-apps/plasma-telepathy-meta-18.04.1 ) !kde-apps/kdenetwork-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=65b9dc7995b65aef238a474de1947348
diff --git a/metadata/md5-cache/kde-apps/kdenlive-18.04.0-r1 b/metadata/md5-cache/kde-apps/kdenlive-18.04.0-r1
deleted file mode 100644
index a67f1abb1d38..000000000000
--- a/metadata/md5-cache/kde-apps/kdenlive-18.04.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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.6.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.44.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Non-linear video editing suite by KDE
-EAPI=6
-HOMEPAGE=https://www.kdenlive.org/
-IUSE=freesound gles2 jogshuttle semantic-desktop v4l debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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.6.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.44.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kdenlive-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c61ad6354ff4272bc632588e08d4da7
diff --git a/metadata/md5-cache/kde-apps/kdenlive-18.04.1 b/metadata/md5-cache/kde-apps/kdenlive-18.04.1
new file mode 100644
index 000000000000..07473e9c61ca
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenlive-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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.6.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.44.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Non-linear video editing suite by KDE
+EAPI=6
+HOMEPAGE=https://www.kdenlive.org/
+IUSE=freesound gles2 jogshuttle semantic-desktop v4l debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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.6.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.44.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kdenlive-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=331c0a95d4c773f960e4dac5bfea076b
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-18.04.0 b/metadata/md5-cache/kde-apps/kdepim-addons-18.04.0
deleted file mode 100644
index 942458cc7ba9..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-addons-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-notes-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/eventviews-18.04.0:5 >=kde-apps/grantleetheme-18.04.0:5 >=kde-apps/incidenceeditor-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kimap-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/libkleo-18.04.0:5 >=kde-apps/libksieve-18.04.0:5 >=kde-apps/libktnef-18.04.0:5 >=kde-apps/mailcommon-18.04.0:5 >=kde-apps/messagelib-18.04.0:5 >=kde-apps/pimcommon-18.04.0: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 importwizard? ( >=kde-apps/akonadi-import-wizard-18.04.0:5 ) >=app-crypt/gpgme-1.7.1[cxx,qt5] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plugins for KDE Personal Information Management Suite
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=importwizard test debug examples test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-notes-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/eventviews-18.04.0:5 >=kde-apps/grantleetheme-18.04.0:5 >=kde-apps/incidenceeditor-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kimap-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/libkleo-18.04.0:5 >=kde-apps/libksieve-18.04.0:5 >=kde-apps/libktnef-18.04.0:5 >=kde-apps/mailcommon-18.04.0:5 >=kde-apps/messagelib-18.04.0:5 >=kde-apps/pimcommon-18.04.0: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 importwizard? ( >=kde-apps/akonadi-import-wizard-18.04.0:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-addons:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kdepim-addons-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eb11701765a3f2d12b844674c5d568f4
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-18.04.1 b/metadata/md5-cache/kde-apps/kdepim-addons-18.04.1
new file mode 100644
index 000000000000..f4b6b3c969b7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/eventviews-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/incidenceeditor-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kimap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/libksieve-18.04.1:5 >=kde-apps/libktnef-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.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 importwizard? ( >=kde-apps/akonadi-import-wizard-18.04.1:5 ) >=app-crypt/gpgme-1.7.1[cxx,qt5] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plugins for KDE Personal Information Management Suite
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kontact/
+IUSE=importwizard test debug examples test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/eventviews-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/incidenceeditor-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kimap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/libksieve-18.04.1:5 >=kde-apps/libktnef-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.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 importwizard? ( >=kde-apps/akonadi-import-wizard-18.04.1:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-addons:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdepim-addons-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eb11701765a3f2d12b844674c5d568f4
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.0 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.0
deleted file mode 100644
index a09d7d804881..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/grantleetheme-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/libkleo-18.04.0:5 >=kde-apps/pimcommon-18.04.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/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries for KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/grantleetheme-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/libkleo-18.04.0:5 >=kde-apps/pimcommon-18.04.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/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kdepim-apps-libs-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f44a813ead9b8c415c01e5cbcf997fb
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.1 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.1
new file mode 100644
index 000000000000..8add5415f55e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries for KDE PIM applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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.44.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/18.04.1/src/kdepim-apps-libs-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f44a813ead9b8c415c01e5cbcf997fb
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-18.04.0 b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.0
deleted file mode 100644
index cd17cca42cc0..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-meta-18.04.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/akonadi-18.04.0 >=kde-apps/akonadiconsole-18.04.0 >=kde-apps/akonadi-calendar-18.04.0 >=kde-apps/akonadi-contacts-18.04.0 >=kde-apps/akonadi-import-wizard-18.04.0 >=kde-apps/akonadi-mime-18.04.0 >=kde-apps/akonadi-notes-18.04.0 >=kde-apps/akonadi-search-18.04.0 >=kde-apps/akregator-18.04.0 >=kde-apps/calendarjanitor-18.04.0 >=kde-apps/calendarsupport-18.04.0 >=kde-apps/eventviews-18.04.0 >=kde-apps/grantlee-editor-18.04.0 >=kde-apps/grantleetheme-18.04.0 >=kde-apps/incidenceeditor-18.04.0 >=kde-apps/kaddressbook-18.04.0 >=kde-apps/kalarm-18.04.0 >=kde-apps/kalarmcal-18.04.0 >=kde-apps/kcalcore-18.04.0 >=kde-apps/kcalutils-18.04.0 >=kde-apps/kcontacts-18.04.0 >=kde-apps/kdepim-addons-18.04.0 >=kde-apps/kdepim-apps-libs-18.04.0 >=kde-apps/kdepim-runtime-18.04.0 >=kde-apps/kidentitymanagement-18.04.0 >=kde-apps/kimap-18.04.0 >=kde-apps/kldap-18.04.0 >=kde-apps/kleopatra-18.04.0 >=kde-apps/kmail-18.04.0 >=kde-apps/kmail-account-wizard-18.04.0 >=kde-apps/kmailtransport-18.04.0 >=kde-apps/kmbox-18.04.0 >=kde-apps/kmime-18.04.0 >=kde-apps/knotes-18.04.0 >=kde-apps/konsolekalendar-18.04.0 >=kde-apps/kontact-18.04.0 >=kde-apps/kontactinterface-18.04.0 >=kde-apps/korganizer-18.04.0 >=kde-apps/kpimtextedit-18.04.0 >=kde-apps/ksmtp-18.04.0 >=kde-apps/libgravatar-18.04.0 >=kde-apps/libkdepim-18.04.0 >=kde-apps/libkgapi-18.04.0 >=kde-apps/libkleo-18.04.0 >=kde-apps/libksieve-18.04.0 >=kde-apps/libktnef-18.04.0 >=kde-apps/mailcommon-18.04.0 >=kde-apps/mailimporter-18.04.0 >=kde-apps/mbox-importer-18.04.0 >=kde-apps/messagelib-18.04.0 >=kde-apps/pim-data-exporter-18.04.0 >=kde-apps/pim-sieve-editor-18.04.0 >=kde-apps/pimcommon-18.04.0 >=kde-apps/syndication-18.04.0 !kde-apps/kdepim-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9ea783cb1933ae875cbc0c2d03777e26
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.1
new file mode 100644
index 000000000000..dd458c18f69b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/akonadi-18.04.1 >=kde-apps/akonadiconsole-18.04.1 >=kde-apps/akonadi-calendar-18.04.1 >=kde-apps/akonadi-contacts-18.04.1 >=kde-apps/akonadi-import-wizard-18.04.1 >=kde-apps/akonadi-mime-18.04.1 >=kde-apps/akonadi-notes-18.04.1 >=kde-apps/akonadi-search-18.04.1 >=kde-apps/akregator-18.04.1 >=kde-apps/calendarjanitor-18.04.1 >=kde-apps/calendarsupport-18.04.1 >=kde-apps/eventviews-18.04.1 >=kde-apps/grantlee-editor-18.04.1 >=kde-apps/grantleetheme-18.04.1 >=kde-apps/incidenceeditor-18.04.1 >=kde-apps/kaddressbook-18.04.1 >=kde-apps/kalarm-18.04.1 >=kde-apps/kalarmcal-18.04.1 >=kde-apps/kcalcore-18.04.1 >=kde-apps/kcalutils-18.04.1 >=kde-apps/kcontacts-18.04.1 >=kde-apps/kdepim-addons-18.04.1 >=kde-apps/kdepim-apps-libs-18.04.1 >=kde-apps/kdepim-runtime-18.04.1 >=kde-apps/kidentitymanagement-18.04.1 >=kde-apps/kimap-18.04.1 >=kde-apps/kldap-18.04.1 >=kde-apps/kleopatra-18.04.1 >=kde-apps/kmail-18.04.1 >=kde-apps/kmail-account-wizard-18.04.1 >=kde-apps/kmailtransport-18.04.1 >=kde-apps/kmbox-18.04.1 >=kde-apps/kmime-18.04.1 >=kde-apps/knotes-18.04.1 >=kde-apps/konsolekalendar-18.04.1 >=kde-apps/kontact-18.04.1 >=kde-apps/kontactinterface-18.04.1 >=kde-apps/korganizer-18.04.1 >=kde-apps/kpimtextedit-18.04.1 >=kde-apps/ksmtp-18.04.1 >=kde-apps/libgravatar-18.04.1 >=kde-apps/libkdepim-18.04.1 >=kde-apps/libkgapi-18.04.1 >=kde-apps/libkleo-18.04.1 >=kde-apps/libksieve-18.04.1 >=kde-apps/libktnef-18.04.1 >=kde-apps/mailcommon-18.04.1 >=kde-apps/mailimporter-18.04.1 >=kde-apps/mbox-importer-18.04.1 >=kde-apps/messagelib-18.04.1 >=kde-apps/pim-data-exporter-18.04.1 >=kde-apps/pim-sieve-editor-18.04.1 >=kde-apps/pimcommon-18.04.1 >=kde-apps/syndication-18.04.1 !kde-apps/kdepim-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9ea783cb1933ae875cbc0c2d03777e26
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.0 b/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.0
deleted file mode 100644
index 60935679f245..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/akonadi-notes-18.04.0:5 >=kde-apps/kalarmcal-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdav-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kimap-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmbox-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkgapi-18.04.0:5 >=kde-apps/pimcommon-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=dev-qt/qtxmlpatterns-5.7.1:5 dev-libs/libxslt test? ( >=kde-apps/kimap-18.04.0:5[test] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/akonadi-notes-18.04.0:5 >=kde-apps/kalarmcal-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdav-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kimap-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmbox-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkgapi-18.04.0:5 >=kde-apps/pimcommon-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.7.1:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/oxygen-icons-5.44.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-runtime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kdepim-runtime-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0ba1ec34207bfec38db44f3d5950500c
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.1 b/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.1
new file mode 100644
index 000000000000..d63283ed04b5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/kalarmcal-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdav-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kimap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmbox-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkgapi-18.04.1:5 >=kde-apps/pimcommon-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=dev-qt/qtxmlpatterns-5.7.1:5 dev-libs/libxslt test? ( >=kde-apps/kimap-18.04.1:5[test] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/kalarmcal-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdav-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kimap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmbox-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkgapi-18.04.1:5 >=kde-apps/pimcommon-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.7.1:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/oxygen-icons-5.44.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-runtime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdepim-runtime-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0ba1ec34207bfec38db44f3d5950500c
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.0 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.0
deleted file mode 100644
index 4485c5d51ed5..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.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.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kioslaves from kdesdk package
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kdesdk-kioslaves-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0cf76a651c7f4c87a0c70086ff638af7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.1 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.1
new file mode 100644
index 000000000000..7922fdc808c2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kioslaves from kdesdk package
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kdesdk-kioslaves-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0cf76a651c7f4c87a0c70086ff638af7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.0 b/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.0
deleted file mode 100644
index e021ebafda27..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development
-IUSE=cvs
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-plugins-18.04.0 >=kde-apps/kapptemplate-18.04.0 >=kde-apps/kcachegrind-18.04.0 >=kde-apps/kde-dev-scripts-18.04.0 >=kde-apps/kde-dev-utils-18.04.0 >=kde-apps/kdesdk-kioslaves-18.04.0 >=kde-apps/kdesdk-thumbnailers-18.04.0 >=kde-apps/kompare-18.04.0 >=kde-apps/kross-interpreters-18.04.0 >=kde-apps/libkomparediff2-18.04.0 >=kde-apps/lokalize-18.04.0 >=kde-apps/poxml-18.04.0 >=kde-apps/umbrello-18.04.0 cvs? ( >=kde-apps/cervisia-18.04.0 ) !kde-apps/kdesdk-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ecdbdfbfef966e8bf2000c3e1d12667e
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.1
new file mode 100644
index 000000000000..83682c89fdd3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development
+IUSE=cvs
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dolphin-plugins-18.04.1 >=kde-apps/kapptemplate-18.04.1 >=kde-apps/kcachegrind-18.04.1 >=kde-apps/kde-dev-scripts-18.04.1 >=kde-apps/kde-dev-utils-18.04.1 >=kde-apps/kdesdk-kioslaves-18.04.1 >=kde-apps/kdesdk-thumbnailers-18.04.1 >=kde-apps/kompare-18.04.1 >=kde-apps/kross-interpreters-18.04.1 >=kde-apps/libkomparediff2-18.04.1 >=kde-apps/lokalize-18.04.1 >=kde-apps/poxml-18.04.1 >=kde-apps/umbrello-18.04.1 cvs? ( >=kde-apps/cervisia-18.04.1 ) !kde-apps/kdesdk-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ecdbdfbfef966e8bf2000c3e1d12667e
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.0 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.0
deleted file mode 100644
index f15675114c1f..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.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.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Thumbnail generator for PO files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.0/src/kdesdk-thumbnailers-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5dbaced390c5e4e50a244e828e2231e0
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.1 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.1
new file mode 100644
index 000000000000..df33f4938859
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Thumbnail generator for PO files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.1/src/kdesdk-thumbnailers-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5dbaced390c5e4e50a244e828e2231e0
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.0 b/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.0
deleted file mode 100644
index d731abd3785f..000000000000
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities https://utils.kde.org
-IUSE=cups floppy
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ark-18.04.0 >=kde-apps/filelight-18.04.0 >=kde-apps/kbackup-18.04.0 >=kde-apps/kcalc-18.04.0 >=kde-apps/kcharselect-18.04.0 >=kde-apps/kdebugsettings-18.04.0 >=kde-apps/kdf-18.04.0 >=kde-apps/kgpg-18.04.0 >=kde-apps/kimagemapeditor-18.04.0 >=kde-apps/kteatime-18.04.0 >=kde-apps/ktimer-18.04.0 >=kde-apps/kwalletmanager-18.04.0 >=kde-apps/sweeper-18.04.0 cups? ( >=kde-apps/print-manager-18.04.0 ) floppy? ( >=kde-apps/kfloppy-18.04.0 ) !kde-apps/kdeutils-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=43fac0da81f9d8d20e482aa8d349d94c
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.1
new file mode 100644
index 000000000000..8f1015a98ed7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities https://utils.kde.org
+IUSE=cups floppy
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ark-18.04.1 >=kde-apps/filelight-18.04.1 >=kde-apps/kbackup-18.04.1 >=kde-apps/kcalc-18.04.1 >=kde-apps/kcharselect-18.04.1 >=kde-apps/kdebugsettings-18.04.1 >=kde-apps/kdf-18.04.1 >=kde-apps/kgpg-18.04.1 >=kde-apps/kimagemapeditor-18.04.1 >=kde-apps/kteatime-18.04.1 >=kde-apps/ktimer-18.04.1 >=kde-apps/kwalletmanager-18.04.1 >=kde-apps/sweeper-18.04.1 cups? ( >=kde-apps/print-manager-18.04.1 ) floppy? ( >=kde-apps/kfloppy-18.04.1 ) !kde-apps/kdeutils-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=43fac0da81f9d8d20e482aa8d349d94c
diff --git a/metadata/md5-cache/kde-apps/kdf-18.04.0 b/metadata/md5-cache/kde-apps/kdf-18.04.0
deleted file mode 100644
index e5da2acf6c97..000000000000
--- a/metadata/md5-cache/kde-apps/kdf-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE free disk space utility
-EAPI=6
-HOMEPAGE=https://utils.kde.org/projects/kdf
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kdf-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=650fa3c98c9cac3966c21030a454b79f
diff --git a/metadata/md5-cache/kde-apps/kdf-18.04.1 b/metadata/md5-cache/kde-apps/kdf-18.04.1
new file mode 100644
index 000000000000..2bc1c19caee4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdf-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE free disk space utility
+EAPI=6
+HOMEPAGE=https://utils.kde.org/projects/kdf
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kdf-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=650fa3c98c9cac3966c21030a454b79f
diff --git a/metadata/md5-cache/kde-apps/kdialog-18.04.0 b/metadata/md5-cache/kde-apps/kdialog-18.04.0
deleted file mode 100644
index d11ff143bff1..000000000000
--- a/metadata/md5-cache/kde-apps/kdialog-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.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.44.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/18.04.0/src/kdialog-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1e420467a1a870969468770e27c30d2
diff --git a/metadata/md5-cache/kde-apps/kdialog-18.04.1 b/metadata/md5-cache/kde-apps/kdialog-18.04.1
new file mode 100644
index 000000000000..fcb9b6822a5e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdialog-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.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.44.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/18.04.1/src/kdialog-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d1e420467a1a870969468770e27c30d2
diff --git a/metadata/md5-cache/kde-apps/kdiamond-18.04.0 b/metadata/md5-cache/kde-apps/kdiamond-18.04.0
deleted file mode 100644
index 73ad4eac47ea..000000000000
--- a/metadata/md5-cache/kde-apps/kdiamond-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE three-in-a-row game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kdiamond/ https://games.kde.org/game.php?game=kdiamond
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.0/src/kdiamond-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3b421c14200258d5d1e965224fc0ccb2
diff --git a/metadata/md5-cache/kde-apps/kdiamond-18.04.1 b/metadata/md5-cache/kde-apps/kdiamond-18.04.1
new file mode 100644
index 000000000000..5868377e252e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdiamond-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE three-in-a-row game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kdiamond/ https://games.kde.org/game.php?game=kdiamond
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/kdiamond-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3b421c14200258d5d1e965224fc0ccb2
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-18.04.0 b/metadata/md5-cache/kde-apps/keditbookmarks-18.04.0
deleted file mode 100644
index 623b1906dc5c..000000000000
--- a/metadata/md5-cache/kde-apps/keditbookmarks-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Bookmarks editor based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/keditbookmarks-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6156671d040751654e25977588ee1cfe
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-18.04.1 b/metadata/md5-cache/kde-apps/keditbookmarks-18.04.1
new file mode 100644
index 000000000000..edf390c4f4e7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Bookmarks editor based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/keditbookmarks-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6156671d040751654e25977588ee1cfe
diff --git a/metadata/md5-cache/kde-apps/kfind-18.04.0 b/metadata/md5-cache/kde-apps/kfind-18.04.0
deleted file mode 100644
index 95060deabbbb..000000000000
--- a/metadata/md5-cache/kde-apps/kfind-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=File finder utility based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kfind/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kfind-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cdf5b5647d714aae0431751f0704625d
diff --git a/metadata/md5-cache/kde-apps/kfind-18.04.1 b/metadata/md5-cache/kde-apps/kfind-18.04.1
new file mode 100644
index 000000000000..3aaba48a9444
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfind-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=File finder utility based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kfind/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kfind-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cdf5b5647d714aae0431751f0704625d
diff --git a/metadata/md5-cache/kde-apps/kfloppy-18.04.0 b/metadata/md5-cache/kde-apps/kfloppy-18.04.0
deleted file mode 100644
index c08e4bfbbf7b..000000000000
--- a/metadata/md5-cache/kde-apps/kfloppy-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A straightforward graphical means to format 3.5" and 5.25" floppy disks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kfloppy/ https://utils.kde.org/projects/kfloppy/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kfloppy-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=54a92eecca592db7751c789791af1976
diff --git a/metadata/md5-cache/kde-apps/kfloppy-18.04.1 b/metadata/md5-cache/kde-apps/kfloppy-18.04.1
new file mode 100644
index 000000000000..a7721e36d981
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfloppy-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A straightforward graphical means to format 3.5" and 5.25" floppy disks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kfloppy/ https://utils.kde.org/projects/kfloppy/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kfloppy-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=54a92eecca592db7751c789791af1976
diff --git a/metadata/md5-cache/kde-apps/kfourinline-18.04.0 b/metadata/md5-cache/kde-apps/kfourinline-18.04.0
deleted file mode 100644
index 0fdc55f29e27..000000000000
--- a/metadata/md5-cache/kde-apps/kfourinline-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE four-in-a-row game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kfourinline/ https://games.kde.org/game.php?game=kfourinline
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.0/src/kfourinline-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf743d92077f286bfb10a8d7965eb0b8
diff --git a/metadata/md5-cache/kde-apps/kfourinline-18.04.1 b/metadata/md5-cache/kde-apps/kfourinline-18.04.1
new file mode 100644
index 000000000000..04ca166f3ef7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfourinline-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE four-in-a-row game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kfourinline/ https://games.kde.org/game.php?game=kfourinline
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/kfourinline-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cf743d92077f286bfb10a8d7965eb0b8
diff --git a/metadata/md5-cache/kde-apps/kgeography-18.04.0 b/metadata/md5-cache/kde-apps/kgeography-18.04.0
deleted file mode 100644
index 88f5a6cd1454..000000000000
--- a/metadata/md5-cache/kde-apps/kgeography-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Geography learning tool
-EAPI=6
-HOMEPAGE=https://edu.kde.org/applications/miscellaneous/kgeography https://edu.kde.org/applications/all/kgeography
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kgeography-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7116f6f2b0fe25be358e6bb65932b3c1
diff --git a/metadata/md5-cache/kde-apps/kgeography-18.04.1 b/metadata/md5-cache/kde-apps/kgeography-18.04.1
new file mode 100644
index 000000000000..c05eba4381a0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgeography-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Geography learning tool
+EAPI=6
+HOMEPAGE=https://edu.kde.org/applications/miscellaneous/kgeography https://edu.kde.org/applications/all/kgeography
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kgeography-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7116f6f2b0fe25be358e6bb65932b3c1
diff --git a/metadata/md5-cache/kde-apps/kget-18.04.0 b/metadata/md5-cache/kde-apps/kget-18.04.0
deleted file mode 100644
index bab4c6fc5afd..000000000000
--- a/metadata/md5-cache/kde-apps/kget-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.11.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Advanced download manager by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kget/
-IUSE=bittorrent gpg kde mms sqlite debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.11.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kget-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7392a0cf28ee9e04f8dbaead57cb8ebe
diff --git a/metadata/md5-cache/kde-apps/kget-18.04.1 b/metadata/md5-cache/kde-apps/kget-18.04.1
new file mode 100644
index 000000000000..b327fa5a0f80
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kget-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.11.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Advanced download manager by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/kget/
+IUSE=bittorrent gpg kde mms sqlite debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.11.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kget-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7392a0cf28ee9e04f8dbaead57cb8ebe
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-18.04.0 b/metadata/md5-cache/kde-apps/kgoldrunner-18.04.0
deleted file mode 100644
index b390e1275e48..000000000000
--- a/metadata/md5-cache/kde-apps/kgoldrunner-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game of action and puzzle solving by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kgoldrunner/ https://games.kde.org/game.php?game=kgoldrunner
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/kgoldrunner-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e2de7126ccbed64cedb87a6df7abf5b3
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-18.04.1 b/metadata/md5-cache/kde-apps/kgoldrunner-18.04.1
new file mode 100644
index 000000000000..9726e49386e5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game of action and puzzle solving by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kgoldrunner/ https://games.kde.org/game.php?game=kgoldrunner
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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.44.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/18.04.1/src/kgoldrunner-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e2de7126ccbed64cedb87a6df7abf5b3
diff --git a/metadata/md5-cache/kde-apps/kgpg-18.04.0 b/metadata/md5-cache/kde-apps/kgpg-18.04.0
deleted file mode 100644
index 5172d8183aec..000000000000
--- a/metadata/md5-cache/kde-apps/kgpg-18.04.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.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/kcontacts-18.04.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 app-crypt/gpgme sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kgpg https://utils.kde.org/projects/kgpg
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/kcontacts-18.04.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 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kgpg-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc6af4d3e845cd57bf1e461373295fd2
diff --git a/metadata/md5-cache/kde-apps/kgpg-18.04.1 b/metadata/md5-cache/kde-apps/kgpg-18.04.1
new file mode 100644
index 000000000000..dde67d1d1131
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgpg-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/kcontacts-18.04.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/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-crypt/gpgme sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kgpg https://utils.kde.org/projects/kgpg
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/kcontacts-18.04.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/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.44.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/18.04.1/src/kgpg-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bc6af4d3e845cd57bf1e461373295fd2
diff --git a/metadata/md5-cache/kde-apps/khangman-18.04.0 b/metadata/md5-cache/kde-apps/khangman-18.04.0
deleted file mode 100644
index 3d3fefd57ce5..000000000000
--- a/metadata/md5-cache/kde-apps/khangman-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classical hangman game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/khangman https://edu.kde.org/khangman
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-18.04.0: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.44.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/18.04.0/src/khangman-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=404802cf0d6f418ca90c62b7bc6a3eff
diff --git a/metadata/md5-cache/kde-apps/khangman-18.04.1 b/metadata/md5-cache/kde-apps/khangman-18.04.1
new file mode 100644
index 000000000000..d227ec466d9d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khangman-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.1: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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classical hangman game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/khangman https://edu.kde.org/khangman
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.1: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-18.04.1: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.44.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/18.04.1/src/khangman-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=404802cf0d6f418ca90c62b7bc6a3eff
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-18.04.0 b/metadata/md5-cache/kde-apps/khelpcenter-18.04.0
deleted file mode 100644
index 5760babfbff9..000000000000
--- a/metadata/md5-cache/kde-apps/khelpcenter-18.04.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.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=The KDE Help Center
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.11.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/khelpcenter-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c792ff11b417c4c39743ae303bea60a5
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-18.04.1 b/metadata/md5-cache/kde-apps/khelpcenter-18.04.1
new file mode 100644
index 000000000000..77a08b4f6520
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khelpcenter-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=The KDE Help Center
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.11.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/khelpcenter-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c792ff11b417c4c39743ae303bea60a5
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.0 b/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.0
deleted file mode 100644
index 488b8537deeb..000000000000
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kpimtextedit-18.04.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-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for managing identitites
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kpimtextedit-18.04.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 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kidentitymanagement:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kidentitymanagement-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=771c29cc4e5066573fcfddf21ac14e4a
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.1 b/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.1
new file mode 100644
index 000000000000..46d54cdb1dad
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kpimtextedit-18.04.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/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for managing identitites
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kpimtextedit-18.04.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/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kidentitymanagement:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kidentitymanagement-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=771c29cc4e5066573fcfddf21ac14e4a
diff --git a/metadata/md5-cache/kde-apps/kig-18.04.0 b/metadata/md5-cache/kde-apps/kig-18.04.0
deleted file mode 100644
index 89bf644b4660..000000000000
--- a/metadata/md5-cache/kde-apps/kig-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 geogebra? ( >=dev-qt/qtxmlpatterns-5.7.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=kde-frameworks/ktexteditor-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Interactive Geometry tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kig https://edu.kde.org/kig
-IUSE=geogebra scripting python_targets_python2_7 debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 geogebra? ( >=dev-qt/qtxmlpatterns-5.7.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kig:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=python_targets_python2_7
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kig-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1be851991efb62cf10a2c67e6ebe2eed
diff --git a/metadata/md5-cache/kde-apps/kig-18.04.1 b/metadata/md5-cache/kde-apps/kig-18.04.1
new file mode 100644
index 000000000000..0c985753dd09
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kig-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 geogebra? ( >=dev-qt/qtxmlpatterns-5.7.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=kde-frameworks/ktexteditor-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Interactive Geometry tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kig https://edu.kde.org/kig
+IUSE=geogebra scripting python_targets_python2_7 debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 geogebra? ( >=dev-qt/qtxmlpatterns-5.7.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kig:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=python_targets_python2_7
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kig-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1be851991efb62cf10a2c67e6ebe2eed
diff --git a/metadata/md5-cache/kde-apps/kigo-18.04.0 b/metadata/md5-cache/kde-apps/kigo-18.04.0
deleted file mode 100644
index 6fc74badc9b1..000000000000
--- a/metadata/md5-cache/kde-apps/kigo-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Go game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kigo/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/kigo-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=faff1c565a91d12b86676078379d6111
diff --git a/metadata/md5-cache/kde-apps/kigo-18.04.1 b/metadata/md5-cache/kde-apps/kigo-18.04.1
new file mode 100644
index 000000000000..3007f2e9c006
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kigo-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Go game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kigo/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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.44.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/18.04.1/src/kigo-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=faff1c565a91d12b86676078379d6111
diff --git a/metadata/md5-cache/kde-apps/killbots-18.04.0 b/metadata/md5-cache/kde-apps/killbots-18.04.0
deleted file mode 100644
index 9e9b89b4cba5..000000000000
--- a/metadata/md5-cache/kde-apps/killbots-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kill the bots or they kill you!
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/killbots/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.0/src/killbots-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=abaea641b8bebbead2e36b60553f718a
diff --git a/metadata/md5-cache/kde-apps/killbots-18.04.1 b/metadata/md5-cache/kde-apps/killbots-18.04.1
new file mode 100644
index 000000000000..51179d9e9ee2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/killbots-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kill the bots or they kill you!
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/killbots/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/killbots-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=abaea641b8bebbead2e36b60553f718a
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.0 b/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.0
deleted file mode 100644
index ee8fd55da353..000000000000
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Generator of HTML image maps
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kimagemapeditor/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kimagemapeditor-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5d47a3854e6026622d585fb0234bf6c
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.1 b/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.1
new file mode 100644
index 000000000000..939f1dadff34
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Generator of HTML image maps
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kimagemapeditor/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kimagemapeditor-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e5d47a3854e6026622d585fb0234bf6c
diff --git a/metadata/md5-cache/kde-apps/kimap-18.04.0 b/metadata/md5-cache/kde-apps/kimap-18.04.0
deleted file mode 100644
index 6cca5f59bbd3..000000000000
--- a/metadata/md5-cache/kde-apps/kimap-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with IMAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.0: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.44.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/18.04.0/src/kimap-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=667fd9b4a77ab021f96547a3e4653b96
diff --git a/metadata/md5-cache/kde-apps/kimap-18.04.1 b/metadata/md5-cache/kde-apps/kimap-18.04.1
new file mode 100644
index 000000000000..6eee058d86ed
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimap-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for interacting with IMAP servers
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.1: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.44.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/18.04.1/src/kimap-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=667fd9b4a77ab021f96547a3e4653b96
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.04.0 b/metadata/md5-cache/kde-apps/kio-extras-18.04.0
deleted file mode 100644
index fc677b88e73b..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-18.04.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.44.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 activities? ( >=kde-frameworks/kactivities-5.44.0:5 >=dev-qt/qtsql-5.7.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.7.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.44.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kio-extras.git
-IUSE=activities htmlthumbs +man mtp openexr phonon samba +sftp taglib test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 activities? ( >=kde-frameworks/kactivities-5.44.0:5 >=dev-qt/qtsql-5.7.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.7.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.44.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.44.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kio-extras:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kio-extras-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=15a6a04d537ae88f28f205bf262c0dfe
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.04.1 b/metadata/md5-cache/kde-apps/kio-extras-18.04.1
new file mode 100644
index 000000000000..dd693c93697b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kio-extras-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 activities? ( >=kde-frameworks/kactivities-5.44.0:5 >=dev-qt/qtsql-5.7.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.7.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.44.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kio-extras.git
+IUSE=activities htmlthumbs +man mtp openexr phonon samba +sftp taglib test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.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/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 activities? ( >=kde-frameworks/kactivities-5.44.0:5 >=dev-qt/qtsql-5.7.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.7.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.44.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.44.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kio-extras:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kio-extras-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=15a6a04d537ae88f28f205bf262c0dfe
diff --git a/metadata/md5-cache/kde-apps/kiriki-18.04.0 b/metadata/md5-cache/kde-apps/kiriki-18.04.0
deleted file mode 100644
index 0a363c6e717c..000000000000
--- a/metadata/md5-cache/kde-apps/kiriki-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=An addictive and fun dice game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kiriki/ https://games.kde.org/game.php?game=kiriki
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/kiriki-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=335d648126dde34b535ca74b7a140591
diff --git a/metadata/md5-cache/kde-apps/kiriki-18.04.1 b/metadata/md5-cache/kde-apps/kiriki-18.04.1
new file mode 100644
index 000000000000..aec64212078e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiriki-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=An addictive and fun dice game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kiriki/ https://games.kde.org/game.php?game=kiriki
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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.44.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/18.04.1/src/kiriki-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=335d648126dde34b535ca74b7a140591
diff --git a/metadata/md5-cache/kde-apps/kiten-18.04.0 b/metadata/md5-cache/kde-apps/kiten-18.04.0
deleted file mode 100644
index dbd856928916..000000000000
--- a/metadata/md5-cache/kde-apps/kiten-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Japanese dictionary and reference
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kiten-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a87c95eedb92a014dd296f08dc20b59
diff --git a/metadata/md5-cache/kde-apps/kiten-18.04.1 b/metadata/md5-cache/kde-apps/kiten-18.04.1
new file mode 100644
index 000000000000..3c48c4b5114a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiten-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Japanese dictionary and reference
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kiten-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7a87c95eedb92a014dd296f08dc20b59
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-18.04.0 b/metadata/md5-cache/kde-apps/kjumpingcube-18.04.0
deleted file mode 100644
index 4903a78c9ccd..000000000000
--- a/metadata/md5-cache/kde-apps/kjumpingcube-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tactical one or two player game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kjumpingcube/ https://games.kde.org/game.php?game=kjumpingcube
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.0/src/kjumpingcube-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c05a72a5dbc576135d0aad11112a41d
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-18.04.1 b/metadata/md5-cache/kde-apps/kjumpingcube-18.04.1
new file mode 100644
index 000000000000..83d28dd8ae82
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tactical one or two player game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kjumpingcube/ https://games.kde.org/game.php?game=kjumpingcube
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/kjumpingcube-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3c05a72a5dbc576135d0aad11112a41d
diff --git a/metadata/md5-cache/kde-apps/kldap-18.04.0 b/metadata/md5-cache/kde-apps/kldap-18.04.0
deleted file mode 100644
index 6cb442ccd9c6..000000000000
--- a/metadata/md5-cache/kde-apps/kldap-18.04.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.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/cyrus-sasl net-nds/openldap sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with LDAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.0/src/kldap-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ebe535b333dd7748393cbab3e69058ba
diff --git a/metadata/md5-cache/kde-apps/kldap-18.04.1 b/metadata/md5-cache/kde-apps/kldap-18.04.1
new file mode 100644
index 000000000000..74aa0ed8f5aa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kldap-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/cyrus-sasl net-nds/openldap sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for interacting with LDAP servers
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.1/src/kldap-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ebe535b333dd7748393cbab3e69058ba
diff --git a/metadata/md5-cache/kde-apps/kleopatra-18.04.0 b/metadata/md5-cache/kde-apps/kleopatra-18.04.0
deleted file mode 100644
index 0d85e927ce4d..000000000000
--- a/metadata/md5-cache/kde-apps/kleopatra-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkleo-18.04.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 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kleopatra
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkleo-18.04.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 >=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.44.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
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kleopatra-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5203a10deaadbee4f2f03fd4b89ecfb2
diff --git a/metadata/md5-cache/kde-apps/kleopatra-18.04.1 b/metadata/md5-cache/kde-apps/kleopatra-18.04.1
new file mode 100644
index 000000000000..5d9b2440cbac
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kleopatra-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkleo-18.04.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/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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kleopatra
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkleo-18.04.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/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.44.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
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kleopatra-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5203a10deaadbee4f2f03fd4b89ecfb2
diff --git a/metadata/md5-cache/kde-apps/klettres-18.04.0 b/metadata/md5-cache/kde-apps/klettres-18.04.0
deleted file mode 100644
index efa2ccf92583..000000000000
--- a/metadata/md5-cache/kde-apps/klettres-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Alphabet learning application
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/klettres https://edu.kde.org/klettres
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/klettres-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=10f2b3ff0df1804c972f45c75a442fc5
diff --git a/metadata/md5-cache/kde-apps/klettres-18.04.1 b/metadata/md5-cache/kde-apps/klettres-18.04.1
new file mode 100644
index 000000000000..448c34af605c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klettres-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Alphabet learning application
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/klettres https://edu.kde.org/klettres
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/klettres-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=10f2b3ff0df1804c972f45c75a442fc5
diff --git a/metadata/md5-cache/kde-apps/klickety-18.04.0 b/metadata/md5-cache/kde-apps/klickety-18.04.0
deleted file mode 100644
index 398c5d402061..000000000000
--- a/metadata/md5-cache/kde-apps/klickety-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A game almost the same as ksame, but a bit different by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.0/src/klickety-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e2526d403ffa4edc9d61e6d1c763de11
diff --git a/metadata/md5-cache/kde-apps/klickety-18.04.1 b/metadata/md5-cache/kde-apps/klickety-18.04.1
new file mode 100644
index 000000000000..d73444538f93
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klickety-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A game almost the same as ksame, but a bit different by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/klickety-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e2526d403ffa4edc9d61e6d1c763de11
diff --git a/metadata/md5-cache/kde-apps/klines-18.04.0 b/metadata/md5-cache/kde-apps/klines-18.04.0
deleted file mode 100644
index c980b4373853..000000000000
--- a/metadata/md5-cache/kde-apps/klines-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A little KDE game about balls and how to get rid of them
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/klines/ https://games.kde.org/game.php?game=klines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.0/src/klines-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=990d4a676301571fc4f2c10ada7e1d2e
diff --git a/metadata/md5-cache/kde-apps/klines-18.04.1 b/metadata/md5-cache/kde-apps/klines-18.04.1
new file mode 100644
index 000000000000..bca6cffaaf22
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klines-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A little KDE game about balls and how to get rid of them
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/klines/ https://games.kde.org/game.php?game=klines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/klines-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=990d4a676301571fc4f2c10ada7e1d2e
diff --git a/metadata/md5-cache/kde-apps/kmag-18.04.0 b/metadata/md5-cache/kde-apps/kmag-18.04.0
deleted file mode 100644
index f35742d36ad9..000000000000
--- a/metadata/md5-cache/kde-apps/kmag-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE screen magnifier
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmag/
-IUSE=keyboardfocus debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kmag-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fcdda3f759c0a90139a9da55f5ab2b5d
diff --git a/metadata/md5-cache/kde-apps/kmag-18.04.1 b/metadata/md5-cache/kde-apps/kmag-18.04.1
new file mode 100644
index 000000000000..45b6aa355c6f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmag-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE screen magnifier
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmag/
+IUSE=keyboardfocus debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kmag-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fcdda3f759c0a90139a9da55f5ab2b5d
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-18.04.0 b/metadata/md5-cache/kde-apps/kmahjongg-18.04.0
deleted file mode 100644
index e3fcb96d1ea1..000000000000
--- a/metadata/md5-cache/kde-apps/kmahjongg-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=kde-apps/libkmahjongg-18.04.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A tile matching game for one or two players
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kmahjongg/ https://games.kde.org/game.php?game=kmahjongg
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=kde-apps/libkmahjongg-18.04.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.44.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/18.04.0/src/kmahjongg-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd9d328e8a2ec90f33d710850559380c
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-18.04.1 b/metadata/md5-cache/kde-apps/kmahjongg-18.04.1
new file mode 100644
index 000000000000..01abaec143cf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmahjongg-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=kde-apps/libkmahjongg-18.04.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A tile matching game for one or two players
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kmahjongg/ https://games.kde.org/game.php?game=kmahjongg
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=kde-apps/libkmahjongg-18.04.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.44.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/18.04.1/src/kmahjongg-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cd9d328e8a2ec90f33d710850559380c
diff --git a/metadata/md5-cache/kde-apps/kmail-18.04.0 b/metadata/md5-cache/kde-apps/kmail-18.04.0
deleted file mode 100644
index 09862e541a69..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/akonadi-search-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libgravatar-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/libkleo-18.04.0:5 >=kde-apps/libksieve-18.04.0:5 >=kde-apps/libktnef-18.04.0:5 >=kde-apps/mailcommon-18.04.0:5 >=kde-apps/messagelib-18.04.0:5 >=kde-apps/pimcommon-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kldap-18.04.0:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-18.04.0:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=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.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/akonadi-search-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libgravatar-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/libkleo-18.04.0:5 >=kde-apps/libksieve-18.04.0:5 >=kde-apps/libktnef-18.04.0:5 >=kde-apps/mailcommon-18.04.0:5 >=kde-apps/messagelib-18.04.0:5 >=kde-apps/pimcommon-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-18.04.0:5 >=kde-apps/kmail-account-wizard-18.04.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kmail-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=09eb9f1e5bc1c02edc857e32049a277a
diff --git a/metadata/md5-cache/kde-apps/kmail-18.04.1 b/metadata/md5-cache/kde-apps/kmail-18.04.1
new file mode 100644
index 000000000000..9d26d8ec93a8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libgravatar-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/libksieve-18.04.1:5 >=kde-apps/libktnef-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kldap-18.04.1:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-18.04.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=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.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libgravatar-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/libksieve-18.04.1:5 >=kde-apps/libktnef-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-18.04.1:5 >=kde-apps/kmail-account-wizard-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmail-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=09eb9f1e5bc1c02edc857e32049a277a
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.0 b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.0
deleted file mode 100644
index ec9f6e0fe5f7..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kldap-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/libkleo-18.04.0:5 >=kde-apps/pimcommon-18.04.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant for KMail accounts configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Account_Wizard
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kldap-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/libkleo-18.04.0:5 >=kde-apps/pimcommon-18.04.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-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kmail-account-wizard-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e6bbc28b56f27883ea7cf9088529f82c
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.1 b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.1
new file mode 100644
index 000000000000..5d65b94ddff7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant for KMail accounts configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Account_Wizard
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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.44.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/18.04.1/src/kmail-account-wizard-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e6bbc28b56f27883ea7cf9088529f82c
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-18.04.0 b/metadata/md5-cache/kde-apps/kmailtransport-18.04.0
deleted file mode 100644
index 5d9b3f6a32db..000000000000
--- a/metadata/md5-cache/kde-apps/kmailtransport-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/ksmtp-18.04.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 test? ( >=kde-frameworks/ktextwidgets-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/ksmtp-18.04.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 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kmailtransport-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bb8a598ce1385111ccedfdd54a58ffbd
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-18.04.1 b/metadata/md5-cache/kde-apps/kmailtransport-18.04.1
new file mode 100644
index 000000000000..81b1158e8469
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmailtransport-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/ksmtp-18.04.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/qtwidgets-5.7.1:5 test? ( >=kde-frameworks/ktextwidgets-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/ksmtp-18.04.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/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmailtransport-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bb8a598ce1385111ccedfdd54a58ffbd
diff --git a/metadata/md5-cache/kde-apps/kmbox-18.04.0 b/metadata/md5-cache/kde-apps/kmbox-18.04.0
deleted file mode 100644
index 8df1e519cbb4..000000000000
--- a/metadata/md5-cache/kde-apps/kmbox-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kmime-18.04.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for accessing MBox format mail storages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-apps/kmime-18.04.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kmbox-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=64020712d490617cddef3bce72a2847b
diff --git a/metadata/md5-cache/kde-apps/kmbox-18.04.1 b/metadata/md5-cache/kde-apps/kmbox-18.04.1
new file mode 100644
index 000000000000..efce5243fa42
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmbox-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/kmime-18.04.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for accessing MBox format mail storages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-apps/kmime-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kmbox-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=64020712d490617cddef3bce72a2847b
diff --git a/metadata/md5-cache/kde-apps/kmime-18.04.0 b/metadata/md5-cache/kde-apps/kmime-18.04.0
deleted file mode 100644
index 5f3d851e6b36..000000000000
--- a/metadata/md5-cache/kde-apps/kmime-18.04.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.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libary for handling mail messages and newsgroup articles
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kmime-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b40b99d96c71264f6d3ebc0933d16da8
diff --git a/metadata/md5-cache/kde-apps/kmime-18.04.1 b/metadata/md5-cache/kde-apps/kmime-18.04.1
new file mode 100644
index 000000000000..f9b1e1043779
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmime-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libary for handling mail messages and newsgroup articles
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kmime-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b40b99d96c71264f6d3ebc0933d16da8
diff --git a/metadata/md5-cache/kde-apps/kmines-18.04.0 b/metadata/md5-cache/kde-apps/kmines-18.04.0
deleted file mode 100644
index f134cad22d9b..000000000000
--- a/metadata/md5-cache/kde-apps/kmines-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classic mine sweeper game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kmines/ https://games.kde.org/game.php?game=kmines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.0/src/kmines-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be3ded71de3bbd33d4a626a64f49adc6
diff --git a/metadata/md5-cache/kde-apps/kmines-18.04.1 b/metadata/md5-cache/kde-apps/kmines-18.04.1
new file mode 100644
index 000000000000..e1a6969a45a8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmines-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classic mine sweeper game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kmines/ https://games.kde.org/game.php?game=kmines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/kmines-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be3ded71de3bbd33d4a626a64f49adc6
diff --git a/metadata/md5-cache/kde-apps/kmix-18.04.0 b/metadata/md5-cache/kde-apps/kmix-18.04.0
deleted file mode 100644
index 2104ef71d32e..000000000000
--- a/metadata/md5-cache/kde-apps/kmix-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/plasma-5.44.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? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma mixer gui
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/kmix/
-IUSE=alsa pulseaudio debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/plasma-5.44.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? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.11.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kmix-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=122e4f2430842e2fb9f6506a55081f0f
diff --git a/metadata/md5-cache/kde-apps/kmix-18.04.1 b/metadata/md5-cache/kde-apps/kmix-18.04.1
new file mode 100644
index 000000000000..38e9c3fdefd0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmix-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/plasma-5.44.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? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma mixer gui
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/kmix/
+IUSE=alsa pulseaudio debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/plasma-5.44.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? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.11.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kmix-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=122e4f2430842e2fb9f6506a55081f0f
diff --git a/metadata/md5-cache/kde-apps/kmousetool-18.04.0 b/metadata/md5-cache/kde-apps/kmousetool-18.04.0
deleted file mode 100644
index ac261e2121c7..000000000000
--- a/metadata/md5-cache/kde-apps/kmousetool-18.04.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.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 x11-libs/libXext x11-libs/libXt x11-proto/xproto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE program that clicks the mouse for you
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmousetool/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kmousetool-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc810b85c89f63d3ad8945b7d0f4c513
diff --git a/metadata/md5-cache/kde-apps/kmousetool-18.04.1 b/metadata/md5-cache/kde-apps/kmousetool-18.04.1
new file mode 100644
index 000000000000..7734df5004a4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmousetool-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 x11-base/xorg-proto x11-libs/libXext x11-libs/libXt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE program that clicks the mouse for you
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmousetool/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kmousetool-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3fa056f331b3d4cfc01afb0ad49ad9bc
diff --git a/metadata/md5-cache/kde-apps/kmouth-18.04.0 b/metadata/md5-cache/kde-apps/kmouth-18.04.0
deleted file mode 100644
index ed28e0623e6c..000000000000
--- a/metadata/md5-cache/kde-apps/kmouth-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtspeech-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Text-to-speech synthesizer front end
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmouth/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtspeech-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kmouth-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b00700dea8d13873195c00be69daed34
diff --git a/metadata/md5-cache/kde-apps/kmouth-18.04.1 b/metadata/md5-cache/kde-apps/kmouth-18.04.1
new file mode 100644
index 000000000000..0484331c2371
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmouth-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtspeech-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Text-to-speech synthesizer front end
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmouth/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtspeech-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmouth-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b00700dea8d13873195c00be69daed34
diff --git a/metadata/md5-cache/kde-apps/kmplot-18.04.0 b/metadata/md5-cache/kde-apps/kmplot-18.04.0
deleted file mode 100644
index 8bbcada4a443..000000000000
--- a/metadata/md5-cache/kde-apps/kmplot-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mathematical function plotter
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kmplot-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=729c2d923ed70bed3cb0c13051e1decf
diff --git a/metadata/md5-cache/kde-apps/kmplot-18.04.1 b/metadata/md5-cache/kde-apps/kmplot-18.04.1
new file mode 100644
index 000000000000..83800c4c6f18
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmplot-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mathematical function plotter
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kmplot-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=729c2d923ed70bed3cb0c13051e1decf
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-18.04.0 b/metadata/md5-cache/kde-apps/knavalbattle-18.04.0
deleted file mode 100644
index 5745fec8c468..000000000000
--- a/metadata/md5-cache/kde-apps/knavalbattle-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Battleship clone by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/navalbattle/ https://games.kde.org/game.php?game=kbattleship
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/knavalbattle-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1176a4417618722f921ae2d255832c78
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-18.04.1 b/metadata/md5-cache/kde-apps/knavalbattle-18.04.1
new file mode 100644
index 000000000000..dd3afe5d2641
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knavalbattle-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Battleship clone by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/navalbattle/ https://games.kde.org/game.php?game=kbattleship
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/knavalbattle-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1176a4417618722f921ae2d255832c78
diff --git a/metadata/md5-cache/kde-apps/knetwalk-18.04.0 b/metadata/md5-cache/kde-apps/knetwalk-18.04.0
deleted file mode 100644
index 35ee89c90771..000000000000
--- a/metadata/md5-cache/kde-apps/knetwalk-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE version of the popular NetWalk game for system administrators
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/knetwalk/ https://games.kde.org/game.php?game=knetwalk
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/knetwalk-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f15f34b587a364818339f02ba2c28b61
diff --git a/metadata/md5-cache/kde-apps/knetwalk-18.04.1 b/metadata/md5-cache/kde-apps/knetwalk-18.04.1
new file mode 100644
index 000000000000..dedc0b11a676
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knetwalk-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE version of the popular NetWalk game for system administrators
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/knetwalk/ https://games.kde.org/game.php?game=knetwalk
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/knetwalk-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f15f34b587a364818339f02ba2c28b61
diff --git a/metadata/md5-cache/kde-apps/knotes-18.04.0 b/metadata/md5-cache/kde-apps/knotes-18.04.0
deleted file mode 100644
index 786d11595caa..000000000000
--- a/metadata/md5-cache/kde-apps/knotes-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-notes-18.04.0:5 >=kde-apps/akonadi-search-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/pimcommon-18.04.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/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Note taking application
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-notes-18.04.0:5 >=kde-apps/akonadi-search-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/pimcommon-18.04.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/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-18.04.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/knotes-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aaf8ab91d8d3bb14645be318348a6aa0
diff --git a/metadata/md5-cache/kde-apps/knotes-18.04.1 b/metadata/md5-cache/kde-apps/knotes-18.04.1
new file mode 100644
index 000000000000..73cd5c4a4c6c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knotes-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Note taking application
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/knotes-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aaf8ab91d8d3bb14645be318348a6aa0
diff --git a/metadata/md5-cache/kde-apps/kolf-18.04.0 b/metadata/md5-cache/kde-apps/kolf-18.04.0
deleted file mode 100644
index 86f2aa0a3643..000000000000
--- a/metadata/md5-cache/kde-apps/kolf-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Minigolf game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kolf/ https://games.kde.org/game.php?game=kolf
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kolf-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ed06f3b3244457881f67979974bb15ea
diff --git a/metadata/md5-cache/kde-apps/kolf-18.04.1 b/metadata/md5-cache/kde-apps/kolf-18.04.1
new file mode 100644
index 000000000000..cf0f081b1858
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolf-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Minigolf game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kolf/ https://games.kde.org/game.php?game=kolf
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kolf-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ed06f3b3244457881f67979974bb15ea
diff --git a/metadata/md5-cache/kde-apps/kollision-18.04.0 b/metadata/md5-cache/kde-apps/kollision-18.04.0
deleted file mode 100644
index 8a34cb656ac1..000000000000
--- a/metadata/md5-cache/kde-apps/kollision-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple ball dodging game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kollision/ https://games.kde.org/game.php?game=kollision
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.0/src/kollision-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=376846a81674449ff6c60d111c23b432
diff --git a/metadata/md5-cache/kde-apps/kollision-18.04.1 b/metadata/md5-cache/kde-apps/kollision-18.04.1
new file mode 100644
index 000000000000..e7e9f2e53a28
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kollision-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Simple ball dodging game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kollision/ https://games.kde.org/game.php?game=kollision
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/kollision-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=376846a81674449ff6c60d111c23b432
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-18.04.0 b/metadata/md5-cache/kde-apps/kolourpaint-18.04.0
deleted file mode 100644
index fe4fc79129a2..000000000000
--- a/metadata/md5-cache/kde-apps/kolourpaint-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.0:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Paint Program by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kolourpaint/
-IUSE=scanner debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kolourpaint-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=334b1cd61969839a035212d5a7a4af50
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-18.04.1 b/metadata/md5-cache/kde-apps/kolourpaint-18.04.1
new file mode 100644
index 000000000000..0f8f14e9dae7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolourpaint-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.1:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Paint Program by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kolourpaint/
+IUSE=scanner debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kolourpaint-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=334b1cd61969839a035212d5a7a4af50
diff --git a/metadata/md5-cache/kde-apps/kompare-18.04.0 b/metadata/md5-cache/kde-apps/kompare-18.04.0
deleted file mode 100644
index e6d7b4cf3f25..000000000000
--- a/metadata/md5-cache/kde-apps/kompare-18.04.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.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkomparediff2-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A program to view the differences between files
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkomparediff2-18.04.0: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.44.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/18.04.0/src/kompare-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7810ebb64b8b17168b6c12374d4bba13
diff --git a/metadata/md5-cache/kde-apps/kompare-18.04.1 b/metadata/md5-cache/kde-apps/kompare-18.04.1
new file mode 100644
index 000000000000..4e6bfe33738f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kompare-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkomparediff2-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A program to view the differences between files
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkomparediff2-18.04.1: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.44.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/18.04.1/src/kompare-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7810ebb64b8b17168b6c12374d4bba13
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.04.0 b/metadata/md5-cache/kde-apps/konqueror-18.04.0
deleted file mode 100644
index e2bab85607c8..000000000000
--- a/metadata/md5-cache/kde-apps/konqueror-18.04.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.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0: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 >=dev-qt/qtxml-5.7.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.7.1:5 ) tidy? ( app-text/htmltidy ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) activities? ( >=kde-frameworks/kactivities-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Web browser and file manager based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/
-IUSE=activities speech tidy X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0: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 >=dev-qt/qtxml-5.7.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.7.1:5 ) tidy? ( app-text/htmltidy ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-apps/kfind-18.04.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/konqueror-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f267ee1d9580ed5abd184c3e04716f6
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.04.1 b/metadata/md5-cache/kde-apps/konqueror-18.04.1
new file mode 100644
index 000000000000..c764e1604164
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konqueror-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.7.1:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.7.1:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) activities? ( >=kde-frameworks/kactivities-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Web browser and file manager based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/
+IUSE=activities speech tidy +webengine X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.7.1:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.7.1:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-apps/kfind-18.04.1:5 >=kde-plasma/kde-cli-tools-5.11.5:5 !webengine? ( kde-misc/kwebkitpart:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/konqueror-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be9e90af9cff929ca88471f10b10f5d4
diff --git a/metadata/md5-cache/kde-apps/konquest-18.04.0 b/metadata/md5-cache/kde-apps/konquest-18.04.0
deleted file mode 100644
index efba83cedbc4..000000000000
--- a/metadata/md5-cache/kde-apps/konquest-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Galactic Strategy KDE Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/konquest/ https://games.kde.org/game.php?game=konquest
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/konquest-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=39abbe22a167acefc8d27ff1e8a2d56d
diff --git a/metadata/md5-cache/kde-apps/konquest-18.04.1 b/metadata/md5-cache/kde-apps/konquest-18.04.1
new file mode 100644
index 000000000000..02a1bd68be79
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konquest-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/libkdegames-18.04.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Galactic Strategy KDE Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/konquest/ https://games.kde.org/game.php?game=konquest
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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.44.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/18.04.1/src/konquest-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=39abbe22a167acefc8d27ff1e8a2d56d
diff --git a/metadata/md5-cache/kde-apps/konsole-18.04.0-r1 b/metadata/md5-cache/kde-apps/konsole-18.04.0-r1
deleted file mode 100644
index c59db7e88bd5..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-18.04.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE's terminal emulator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/konsole-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0540bff7faa536bab397e34be690a6c8
diff --git a/metadata/md5-cache/kde-apps/konsole-18.04.1 b/metadata/md5-cache/kde-apps/konsole-18.04.1
new file mode 100644
index 000000000000..509fe67b6871
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsole-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE's terminal emulator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/konsole-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0540bff7faa536bab397e34be690a6c8
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-18.04.0 b/metadata/md5-cache/kde-apps/konsolekalendar-18.04.0
deleted file mode 100644
index 2dbf4fd4b507..000000000000
--- a/metadata/md5-cache/kde-apps/konsolekalendar-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Command line interface to KDE calendars
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KonsoleKalendar
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/akonadi-calendar-tools-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=41b8cf3c86d80a33123f4e10707254ea
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-18.04.1 b/metadata/md5-cache/kde-apps/konsolekalendar-18.04.1
new file mode 100644
index 000000000000..347d5b7024a0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Command line interface to KDE calendars
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KonsoleKalendar
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/akonadi-calendar-tools-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=41b8cf3c86d80a33123f4e10707254ea
diff --git a/metadata/md5-cache/kde-apps/kontact-18.04.0 b/metadata/md5-cache/kde-apps/kontact-18.04.0
deleted file mode 100644
index 19f0f32296f8..000000000000
--- a/metadata/md5-cache/kde-apps/kontact-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/grantleetheme-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/mailcommon-18.04.0: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Container application to unify several major PIM applications within one
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/grantleetheme-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/mailcommon-18.04.0: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.44.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/18.04.0/src/kontact-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b0b36331f38f21615b2db494f7a598b
diff --git a/metadata/md5-cache/kde-apps/kontact-18.04.1 b/metadata/md5-cache/kde-apps/kontact-18.04.1
new file mode 100644
index 000000000000..6a010ae0ea2a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontact-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Container application to unify several major PIM applications within one
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1: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.44.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/18.04.1/src/kontact-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b0b36331f38f21615b2db494f7a598b
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-18.04.0 b/metadata/md5-cache/kde-apps/kontactinterface-18.04.0
deleted file mode 100644
index 1bb3e086d102..000000000000
--- a/metadata/md5-cache/kde-apps/kontactinterface-18.04.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.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for embedding KParts in a Kontact component
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kontactinterface-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2549361bdde54f6c5dfb9badfc1d429
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-18.04.1 b/metadata/md5-cache/kde-apps/kontactinterface-18.04.1
new file mode 100644
index 000000000000..b3fa7bfc96c4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontactinterface-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for embedding KParts in a Kontact component
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kontactinterface-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a2549361bdde54f6c5dfb9badfc1d429
diff --git a/metadata/md5-cache/kde-apps/kopete-18.04.0 b/metadata/md5-cache/kde-apps/kopete-18.04.0
deleted file mode 100644
index 536422e6e420..000000000000
--- a/metadata/md5-cache/kde-apps/kopete-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/libkleo-18.04.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 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0 >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn sys-libs/zlib ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 ) x11-proto/scrnsaverproto jingle? ( dev-libs/jsoncpp ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://kopete.kde.org https://www.kde.org/applications/internet/kopete
-IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp yahoo zeroconf debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/libkleo-18.04.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 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0 >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn sys-libs/zlib ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kopete:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kopete-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0300a83b0e1fbaf702afe0e284dbe798
diff --git a/metadata/md5-cache/kde-apps/kopete-18.04.1 b/metadata/md5-cache/kde-apps/kopete-18.04.1
new file mode 100644
index 000000000000..2da749c8aa13
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kopete-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/libkleo-18.04.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 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0 >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn sys-libs/zlib ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.1:5 ) x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://kopete.kde.org https://www.kde.org/applications/internet/kopete
+IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp yahoo zeroconf debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/libkleo-18.04.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 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0 >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn sys-libs/zlib ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.1:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kopete:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kopete-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=580bfaabdbbe4c4a403891ed6f6e0a73
diff --git a/metadata/md5-cache/kde-apps/korganizer-18.04.0 b/metadata/md5-cache/kde-apps/korganizer-18.04.0
deleted file mode 100644
index bb0f92da77cc..000000000000
--- a/metadata/md5-cache/kde-apps/korganizer-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/akonadi-notes-18.04.0:5 >=kde-apps/akonadi-search-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/eventviews-18.04.0:5 >=kde-apps/incidenceeditor-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/pimcommon-18.04.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(+)] X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-apps/kldap-18.04.0:5 >=dev-qt/designer-5.7.1:5 test? ( >=kde-apps/akonadi-18.04.0:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/korganizer/
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-calendar-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/akonadi-notes-18.04.0:5 >=kde-apps/akonadi-search-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/eventviews-18.04.0:5 >=kde-apps/incidenceeditor-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kontactinterface-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/pimcommon-18.04.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(+)] 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-18.04.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/korganizer-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7ffe3b147734d6dc51ca296778c8ba5e
diff --git a/metadata/md5-cache/kde-apps/korganizer-18.04.1 b/metadata/md5-cache/kde-apps/korganizer-18.04.1
new file mode 100644
index 000000000000..3e24e61c196f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/korganizer-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/eventviews-18.04.1:5 >=kde-apps/incidenceeditor-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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/kldap-18.04.1:5 >=dev-qt/designer-5.7.1:5 test? ( >=kde-apps/akonadi-18.04.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/korganizer/
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/eventviews-18.04.1:5 >=kde-apps/incidenceeditor-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/korganizer-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7ffe3b147734d6dc51ca296778c8ba5e
diff --git a/metadata/md5-cache/kde-apps/kpat-18.04.0 b/metadata/md5-cache/kde-apps/kpat-18.04.0
deleted file mode 100644
index e235df07f335..000000000000
--- a/metadata/md5-cache/kde-apps/kpat-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE patience game
-EAPI=6
-HOMEPAGE=https://games.kde.org/game.php?game=kpat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/kpat-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80e98ff800e2e6a72136cf67fe96425d
diff --git a/metadata/md5-cache/kde-apps/kpat-18.04.1 b/metadata/md5-cache/kde-apps/kpat-18.04.1
new file mode 100644
index 000000000000..1b910a41ee90
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpat-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE patience game
+EAPI=6
+HOMEPAGE=https://games.kde.org/game.php?game=kpat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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.44.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/18.04.1/src/kpat-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80e98ff800e2e6a72136cf67fe96425d
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-18.04.0 b/metadata/md5-cache/kde-apps/kpimtextedit-18.04.0
deleted file mode 100644
index 1eff910bd3b2..000000000000
--- a/metadata/md5-cache/kde-apps/kpimtextedit-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) test? ( >=kde-frameworks/ktextwidgets-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A textedit with PIM-specific features
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpimtextedit:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kpimtextedit-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c70029487e4d9c9062345a2c1d014797
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-18.04.1 b/metadata/md5-cache/kde-apps/kpimtextedit-18.04.1
new file mode 100644
index 000000000000..d719c51c14bc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) test? ( >=kde-frameworks/ktextwidgets-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A textedit with PIM-specific features
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpimtextedit:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kpimtextedit-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c70029487e4d9c9062345a2c1d014797
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.0 b/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.0
deleted file mode 100644
index 76db3b2c3c19..000000000000
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kqtquickcharts-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=814e55e7fe91d369030a11c8d7255eab
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.1 b/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.1
new file mode 100644
index 000000000000..87346b94e4ff
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kqtquickcharts-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=814e55e7fe91d369030a11c8d7255eab
diff --git a/metadata/md5-cache/kde-apps/krdc-18.04.0 b/metadata/md5-cache/kde-apps/krdc-18.04.0
deleted file mode 100644
index 7da47b679944..000000000000
--- a/metadata/md5-cache/kde-apps/krdc-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Remote desktop connection (RDP and VNC) client
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/krdc/
-IUSE=+rdp vnc debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/krdc-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=098fbdda4e8acd6c2a74c4d80bd93898
diff --git a/metadata/md5-cache/kde-apps/krdc-18.04.1 b/metadata/md5-cache/kde-apps/krdc-18.04.1
new file mode 100644
index 000000000000..6277e0a2d6a7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krdc-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Remote desktop connection (RDP and VNC) client
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/krdc/
+IUSE=+rdp vnc debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/krdc-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=098fbdda4e8acd6c2a74c4d80bd93898
diff --git a/metadata/md5-cache/kde-apps/kreversi-18.04.0 b/metadata/md5-cache/kde-apps/kreversi-18.04.0
deleted file mode 100644
index 574a2fdc0d89..000000000000
--- a/metadata/md5-cache/kde-apps/kreversi-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Board game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kreversi/ https://games.kde.org/game.php?game=kreversi
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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/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.44.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/18.04.0/src/kreversi-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=93c7c55d5522ec85cf1387ef505e7ca7
diff --git a/metadata/md5-cache/kde-apps/kreversi-18.04.1 b/metadata/md5-cache/kde-apps/kreversi-18.04.1
new file mode 100644
index 000000000000..a42aa2e3c981
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kreversi-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Board game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kreversi/ https://games.kde.org/game.php?game=kreversi
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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.44.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/18.04.1/src/kreversi-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=93c7c55d5522ec85cf1387ef505e7ca7
diff --git a/metadata/md5-cache/kde-apps/krfb-18.04.0 b/metadata/md5-cache/kde-apps/krfb-18.04.0
deleted file mode 100644
index 4b4ca0983e6f..000000000000
--- a/metadata/md5-cache/kde-apps/krfb-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=VNC-compatible server to share Plasma desktops
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/krfb/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/krfb-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0f72961a05c0325a8d01d45083396ef
diff --git a/metadata/md5-cache/kde-apps/krfb-18.04.1 b/metadata/md5-cache/kde-apps/krfb-18.04.1
new file mode 100644
index 000000000000..4bd127d0032a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krfb-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=VNC-compatible server to share Plasma desktops
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/krfb/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/krfb-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b0f72961a05c0325a8d01d45083396ef
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-18.04.0 b/metadata/md5-cache/kde-apps/kross-interpreters-18.04.0
deleted file mode 100644
index c5c27118992c..000000000000
--- a/metadata/md5-cache/kde-apps/kross-interpreters-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kross-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kross interpreter plugins for programming languages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+python ruby debug python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kross-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/kross-interpreters-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=badf17c8bb40cd4709c3dd10a2346903
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-18.04.1 b/metadata/md5-cache/kde-apps/kross-interpreters-18.04.1
new file mode 100644
index 000000000000..ab65e6ee10e6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kross-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kross interpreter plugins for programming languages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+python ruby debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kross-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/kross-interpreters-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=badf17c8bb40cd4709c3dd10a2346903
diff --git a/metadata/md5-cache/kde-apps/kruler-18.04.0 b/metadata/md5-cache/kde-apps/kruler-18.04.0
deleted file mode 100644
index b98af3008d20..000000000000
--- a/metadata/md5-cache/kde-apps/kruler-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screen ruler for Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kruler/
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kruler-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a532d96e7aa8dfb2ed7b6932070a7c3
diff --git a/metadata/md5-cache/kde-apps/kruler-18.04.1 b/metadata/md5-cache/kde-apps/kruler-18.04.1
new file mode 100644
index 000000000000..27e872e10407
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kruler-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screen ruler for Plasma
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kruler/
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kruler-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a532d96e7aa8dfb2ed7b6932070a7c3
diff --git a/metadata/md5-cache/kde-apps/kshisen-18.04.0 b/metadata/md5-cache/kde-apps/kshisen-18.04.0
deleted file mode 100644
index a3e956e79cf8..000000000000
--- a/metadata/md5-cache/kde-apps/kshisen-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=kde-apps/libkmahjongg-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE game similiar to Mahjongg
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kshisen/ https://games.kde.org/game.php?game=kshisen
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=kde-apps/libkmahjongg-18.04.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.44.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/18.04.0/src/kshisen-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d8b4378093fbcba1eeb6a98fac70ee88
diff --git a/metadata/md5-cache/kde-apps/kshisen-18.04.1 b/metadata/md5-cache/kde-apps/kshisen-18.04.1
new file mode 100644
index 000000000000..dd803c77e7ac
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kshisen-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=kde-apps/libkmahjongg-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE game similiar to Mahjongg
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kshisen/ https://games.kde.org/game.php?game=kshisen
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=kde-apps/libkmahjongg-18.04.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.44.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/18.04.1/src/kshisen-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d8b4378093fbcba1eeb6a98fac70ee88
diff --git a/metadata/md5-cache/kde-apps/ksirk-18.04.0 b/metadata/md5-cache/kde-apps/ksirk-18.04.0
deleted file mode 100644
index aa138bb63b1c..000000000000
--- a/metadata/md5-cache/kde-apps/ksirk-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Port of the board game risk
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksirk/ https://games.kde.org/game.php?game=ksirk
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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 >=dev-qt/qtxml-5.7.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.44.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.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/ksirk-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=60a888a869dd513e1502869a2d5d0786
diff --git a/metadata/md5-cache/kde-apps/ksirk-18.04.1 b/metadata/md5-cache/kde-apps/ksirk-18.04.1
new file mode 100644
index 000000000000..75209485f724
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksirk-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Port of the board game risk
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksirk/ https://games.kde.org/game.php?game=ksirk
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 >=dev-qt/qtxml-5.7.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.44.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.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/ksirk-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=60a888a869dd513e1502869a2d5d0786
diff --git a/metadata/md5-cache/kde-apps/ksmtp-18.04.0 b/metadata/md5-cache/kde-apps/ksmtp-18.04.0
deleted file mode 100644
index bc770146b0f7..000000000000
--- a/metadata/md5-cache/kde-apps/ksmtp-18.04.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.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.0:5 >=dev-qt/qtnetwork-5.7.1:5 dev-libs/cyrus-sasl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Job-based library to send email through an SMTP server
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.0:5 >=dev-qt/qtnetwork-5.7.1:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksmtp:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/ksmtp-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fed3515f2192e5c9117086079ac61c38
diff --git a/metadata/md5-cache/kde-apps/ksmtp-18.04.1 b/metadata/md5-cache/kde-apps/ksmtp-18.04.1
new file mode 100644
index 000000000000..50a96b079aaf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksmtp-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtnetwork-5.7.1:5 dev-libs/cyrus-sasl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Job-based library to send email through an SMTP server
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtnetwork-5.7.1:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksmtp:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/ksmtp-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fed3515f2192e5c9117086079ac61c38
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-18.04.0 b/metadata/md5-cache/kde-apps/ksnakeduel-18.04.0
deleted file mode 100644
index c8236682a8f8..000000000000
--- a/metadata/md5-cache/kde-apps/ksnakeduel-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Tron game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksnakeduel/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/ksnakeduel-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8202199ed0d0dc7f85ddb8a7a882f1f5
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-18.04.1 b/metadata/md5-cache/kde-apps/ksnakeduel-18.04.1
new file mode 100644
index 000000000000..5183b6e254a5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Tron game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksnakeduel/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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.44.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/18.04.1/src/ksnakeduel-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8202199ed0d0dc7f85ddb8a7a882f1f5
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-18.04.0 b/metadata/md5-cache/kde-apps/kspaceduel-18.04.0
deleted file mode 100644
index f3745d300d15..000000000000
--- a/metadata/md5-cache/kde-apps/kspaceduel-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Space Game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kspaceduel/ https://games.kde.org/game.php?game=kspaceduel
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/kspaceduel-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9fe3f5db6495d786675e58283c5ad45c
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-18.04.1 b/metadata/md5-cache/kde-apps/kspaceduel-18.04.1
new file mode 100644
index 000000000000..46300d9ca402
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kspaceduel-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Space Game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kspaceduel/ https://games.kde.org/game.php?game=kspaceduel
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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.44.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/18.04.1/src/kspaceduel-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9fe3f5db6495d786675e58283c5ad45c
diff --git a/metadata/md5-cache/kde-apps/ksquares-18.04.0 b/metadata/md5-cache/kde-apps/ksquares-18.04.0
deleted file mode 100644
index 2fc850d523ca..000000000000
--- a/metadata/md5-cache/kde-apps/ksquares-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE clone of the game squares
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksquares/ https://games.kde.org/game.php?game=ksquares
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.0/src/ksquares-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=503bea865a83e7f934ffdd389a369286
diff --git a/metadata/md5-cache/kde-apps/ksquares-18.04.1 b/metadata/md5-cache/kde-apps/ksquares-18.04.1
new file mode 100644
index 000000000000..b5f9047e5de3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksquares-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE clone of the game squares
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksquares/ https://games.kde.org/game.php?game=ksquares
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.44.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/18.04.1/src/ksquares-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=503bea865a83e7f934ffdd389a369286
diff --git a/metadata/md5-cache/kde-apps/ksudoku-18.04.0 b/metadata/md5-cache/kde-apps/ksudoku-18.04.0
deleted file mode 100644
index bc3199aa888e..000000000000
--- a/metadata/md5-cache/kde-apps/ksudoku-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 opengl? ( >=dev-qt/qtopengl-5.7.1:5 virtual/glu ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Logic-based symbol placement puzzle by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksudoku/ https://games.kde.org/game.php?game=ksudoku
-IUSE=opengl debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 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.44.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/18.04.0/src/ksudoku-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7834efdc4fd82950246e934b359216cb
diff --git a/metadata/md5-cache/kde-apps/ksudoku-18.04.1 b/metadata/md5-cache/kde-apps/ksudoku-18.04.1
new file mode 100644
index 000000000000..d4a6807d31a6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksudoku-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 opengl? ( >=dev-qt/qtopengl-5.7.1:5 virtual/glu ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Logic-based symbol placement puzzle by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksudoku/ https://games.kde.org/game.php?game=ksudoku
+IUSE=opengl debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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 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.44.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/18.04.1/src/ksudoku-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7834efdc4fd82950246e934b359216cb
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-18.04.0 b/metadata/md5-cache/kde-apps/ksystemlog-18.04.0
deleted file mode 100644
index 9c0f13d5e56a..000000000000
--- a/metadata/md5-cache/kde-apps/ksystemlog-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 systemd? ( sys-apps/systemd ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System log viewer by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/ksystemlog/
-IUSE=systemd test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksystemlog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/ksystemlog-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8068bbeddb94e265142fcdc9a8111e72
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-18.04.1 b/metadata/md5-cache/kde-apps/ksystemlog-18.04.1
new file mode 100644
index 000000000000..789d01dbf95c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksystemlog-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 systemd? ( sys-apps/systemd ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=System log viewer by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/ksystemlog/
+IUSE=systemd test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksystemlog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/ksystemlog-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9948f9339dc7458897ce8f3e7a134a64
diff --git a/metadata/md5-cache/kde-apps/kteatime-18.04.0 b/metadata/md5-cache/kde-apps/kteatime-18.04.0
deleted file mode 100644
index 62fe7aff5aa8..000000000000
--- a/metadata/md5-cache/kde-apps/kteatime-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE timer for making a fine cup of tea
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kteatime
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kteatime-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=006c64ed4d27fb9cc705c17bd69d61db
diff --git a/metadata/md5-cache/kde-apps/kteatime-18.04.1 b/metadata/md5-cache/kde-apps/kteatime-18.04.1
new file mode 100644
index 000000000000..e315271d79ea
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kteatime-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE timer for making a fine cup of tea
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kteatime
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kteatime-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=006c64ed4d27fb9cc705c17bd69d61db
diff --git a/metadata/md5-cache/kde-apps/ktimer-18.04.0 b/metadata/md5-cache/kde-apps/ktimer-18.04.0
deleted file mode 100644
index ded4bb895b2f..000000000000
--- a/metadata/md5-cache/kde-apps/ktimer-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Timer
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/ktimer https://utils.kde.org/projects/ktimer
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.0/src/ktimer-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fdf243d73bd0d84c982fd498b9b4115a
diff --git a/metadata/md5-cache/kde-apps/ktimer-18.04.1 b/metadata/md5-cache/kde-apps/ktimer-18.04.1
new file mode 100644
index 000000000000..c92db6ef3307
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktimer-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Timer
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/ktimer https://utils.kde.org/projects/ktimer
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.1/src/ktimer-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fdf243d73bd0d84c982fd498b9b4115a
diff --git a/metadata/md5-cache/kde-apps/ktouch-18.04.0 b/metadata/md5-cache/kde-apps/ktouch-18.04.0
deleted file mode 100644
index 53ba5502341a..000000000000
--- a/metadata/md5-cache/kde-apps/ktouch-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-frameworks/kwindowsystem-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Program that helps to learn and practice touch typing
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/ktouch/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/ktouch-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1137cbf30604fe2ece5b99851669ca7b
diff --git a/metadata/md5-cache/kde-apps/ktouch-18.04.1 b/metadata/md5-cache/kde-apps/ktouch-18.04.1
new file mode 100644
index 000000000000..94f1fdb01c98
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktouch-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-frameworks/kwindowsystem-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Program that helps to learn and practice touch typing
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/ktouch/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/ktouch-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1137cbf30604fe2ece5b99851669ca7b
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.0 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.0
deleted file mode 100644
index 7d5c07e7d5ca..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.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-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 net-libs/libaccounts-glib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy account management kcm
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=experimental debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.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-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-18.04.0:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/ktp-accounts-kcm-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5e58f595839a82e85d28331ddd6a0d0
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.1 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.1
new file mode 100644
index 000000000000..6de903610c86
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.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/qtwidgets-5.7.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 net-libs/libaccounts-glib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy account management kcm
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=experimental debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.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/qtwidgets-5.7.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-18.04.1:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/ktp-accounts-kcm-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e5e58f595839a82e85d28331ddd6a0d0
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-18.04.0 b/metadata/md5-cache/kde-apps/ktp-approver-18.04.0
deleted file mode 100644
index cc40bd3aed86..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-approver-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy notification handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.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-18.04.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/ktp-approver-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=65b8fe72f6aa3c3d6a6738c5d5b82693
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-18.04.1 b/metadata/md5-cache/kde-apps/ktp-approver-18.04.1
new file mode 100644
index 000000000000..f453b60aed41
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-approver-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy notification handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.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-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/ktp-approver-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=65b8fe72f6aa3c3d6a6738c5d5b82693
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.0 b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.0
deleted file mode 100644
index 1da1c3c478ac..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.0:5 >=kde-apps/ktp-common-internals-18.04.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 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy authentication handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.0:5 >=kde-apps/ktp-common-internals-18.04.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 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.44.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/18.04.0/src/ktp-auth-handler-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3ff45856fe8e0cdf15f0959283ba2da0
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.1 b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.1
new file mode 100644
index 000000000000..5a8df74f7ec4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.1:5 >=kde-apps/ktp-common-internals-18.04.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/qtwidgets-5.7.1:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy authentication handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.1:5 >=kde-apps/ktp-common-internals-18.04.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/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.44.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/18.04.1/src/ktp-auth-handler-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3ff45856fe8e0cdf15f0959283ba2da0
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.0 b/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.0
deleted file mode 100644
index 1c04253d864d..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.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/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy audio/video conferencing ui
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.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/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.44.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/18.04.0/src/ktp-call-ui-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f367f17c34d362d0c78c358506a12f94
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.1 b/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.1
new file mode 100644
index 000000000000..86dc8836c3b1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy audio/video conferencing ui
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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.44.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/18.04.1/src/ktp-call-ui-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f367f17c34d362d0c78c358506a12f94
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.0 b/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.0
deleted file mode 100644
index 388a2e1e63c3..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.0:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy common library
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=otr +sso debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.0:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/ktp-common-internals-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51483183c789d09c950ece03475a6394
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.1 b/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.1
new file mode 100644
index 000000000000..3b99c351c16e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy common library
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=otr +sso debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/ktp-common-internals-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=51483183c789d09c950ece03475a6394
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.0 b/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.0
deleted file mode 100644
index b86e6193ae44..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.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-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy contact list
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.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-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/ktp-contact-list-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=64a04e912e5f4e183dd7fa86427c2717
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.1 b/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.1
new file mode 100644
index 000000000000..ae2a349b3e65
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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/kcmutils-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy contact list
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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.44.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/18.04.1/src/ktp-contact-list-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=64a04e912e5f4e183dd7fa86427c2717
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.0 b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.0
deleted file mode 100644
index c9e4d7113a3f..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.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.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.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-frameworks/kservice-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy krunner plugin
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.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-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/ktp-contact-runner-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e513d781659ff0386e55f5c1e97f8ca
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.1 b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.1
new file mode 100644
index 000000000000..19551f6e1b0e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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/kservice-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy krunner plugin
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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.44.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/18.04.1/src/ktp-contact-runner-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6e513d781659ff0386e55f5c1e97f8ca
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.0 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.0
deleted file mode 100644
index 7a177fbea9f1..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=kde-frameworks/ki18n-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.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.44.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/18.04.0/src/ktp-desktop-applets-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab6633c1acf6be89efb3294c6598cbe2
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.1 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.1
new file mode 100644
index 000000000000..5e71de561b20
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=kde-frameworks/ki18n-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.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.44.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/18.04.1/src/ktp-desktop-applets-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ab6633c1acf6be89efb3294c6598cbe2
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.0 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.0
deleted file mode 100644
index 6248bc4b5bc6..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy file transfer handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.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-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/ktp-filetransfer-handler-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ecba561fa7e8faea9faecd2deba23cee
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.1 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.1
new file mode 100644
index 000000000000..f1cab65f45c6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy file transfer handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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.44.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/18.04.1/src/ktp-filetransfer-handler-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ecba561fa7e8faea9faecd2deba23cee
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.0 b/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.0
deleted file mode 100644
index cf2891aca642..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kidletime-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.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 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy workspace integration
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kidletime-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.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 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-18.04.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/ktp-kded-module-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f7c51ed16aa7e7047ec5f0c93159a9ec
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.1 b/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.1
new file mode 100644
index 000000000000..4745fb48f2b0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kidletime-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy workspace integration
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kidletime-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/ktp-kded-module-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f7c51ed16aa7e7047ec5f0c93159a9ec
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-18.04.0 b/metadata/md5-cache/kde-apps/ktp-send-file-18.04.0
deleted file mode 100644
index a4c2d3a9ad70..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-send-file-18.04.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.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.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-frameworks/kcmutils-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.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-18.04.0:5 >=kde-apps/ktp-filetransfer-handler-18.04.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/ktp-send-file-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d3bde96425d6c989eef302f534847e72
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-18.04.1 b/metadata/md5-cache/kde-apps/ktp-send-file-18.04.1
new file mode 100644
index 000000000000..60c6c6f535b5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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/kcmutils-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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-18.04.1:5 >=kde-apps/ktp-filetransfer-handler-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/ktp-send-file-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d3bde96425d6c989eef302f534847e72
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.0 b/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.0
deleted file mode 100644
index 5617334a4196..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.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.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdewebkit-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.0: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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy text chat window
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=speech debug
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdewebkit-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.0: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-18.04.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/ktp-text-ui-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=31c665181c737d5ebc1c4b33d00259bb
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.1 b/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.1
new file mode 100644
index 000000000000..9cf0667dc21f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdewebkit-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy text chat window
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=speech debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdewebkit-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1: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-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/ktp-text-ui-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=31c665181c737d5ebc1c4b33d00259bb
diff --git a/metadata/md5-cache/kde-apps/ktuberling-18.04.0 b/metadata/md5-cache/kde-apps/ktuberling-18.04.0
deleted file mode 100644
index 99de47c884ec..000000000000
--- a/metadata/md5-cache/kde-apps/ktuberling-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtmultimedia-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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Potato game for kids by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ktuberling/ https://games.kde.org/game.php?game=ktuberling
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtmultimedia-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.44.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/18.04.0/src/ktuberling-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1038287370eaea721680d9a6f51d09b0
diff --git a/metadata/md5-cache/kde-apps/ktuberling-18.04.1 b/metadata/md5-cache/kde-apps/ktuberling-18.04.1
new file mode 100644
index 000000000000..72f62589f088
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktuberling-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtmultimedia-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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Potato game for kids by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ktuberling/ https://games.kde.org/game.php?game=ktuberling
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtmultimedia-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.44.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/18.04.1/src/ktuberling-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1038287370eaea721680d9a6f51d09b0
diff --git a/metadata/md5-cache/kde-apps/kturtle-18.04.0 b/metadata/md5-cache/kde-apps/kturtle-18.04.0
deleted file mode 100644
index 43ef42f34393..000000000000
--- a/metadata/md5-cache/kde-apps/kturtle-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Educational programming environment using the Logo programming language
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kturtle-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f89540e0837e30bda032ae99b5651474
diff --git a/metadata/md5-cache/kde-apps/kturtle-18.04.1 b/metadata/md5-cache/kde-apps/kturtle-18.04.1
new file mode 100644
index 000000000000..048eba40b51a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kturtle-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Educational programming environment using the Logo programming language
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kturtle-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f89540e0837e30bda032ae99b5651474
diff --git a/metadata/md5-cache/kde-apps/kubrick-18.04.0 b/metadata/md5-cache/kde-apps/kubrick-18.04.0
deleted file mode 100644
index b273827082f7..000000000000
--- a/metadata/md5-cache/kde-apps/kubrick-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kubrick/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/kubrick-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f0610d60542083915aca0d76650459c5
diff --git a/metadata/md5-cache/kde-apps/kubrick-18.04.1 b/metadata/md5-cache/kde-apps/kubrick-18.04.1
new file mode 100644
index 000000000000..4e9eda0a1c3d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kubrick-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kubrick/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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.44.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/18.04.1/src/kubrick-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f0610d60542083915aca0d76650459c5
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-18.04.0 b/metadata/md5-cache/kde-apps/kwalletmanager-18.04.0
deleted file mode 100644
index e88217307d55..000000000000
--- a/metadata/md5-cache/kde-apps/kwalletmanager-18.04.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.44.0:5 >=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Wallet management tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kwalletmanager-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=faaa9c3774d329920439864295659be3
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-18.04.1 b/metadata/md5-cache/kde-apps/kwalletmanager-18.04.1
new file mode 100644
index 000000000000..8afb10e13e64
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Wallet management tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kwalletmanager-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=faaa9c3774d329920439864295659be3
diff --git a/metadata/md5-cache/kde-apps/kwave-18.04.0 b/metadata/md5-cache/kde-apps/kwave-18.04.0
deleted file mode 100644
index 20bc10dafaf6..000000000000
--- a/metadata/md5-cache/kde-apps/kwave-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-apps/poxml-18.04.0:5 >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
-EAPI=6
-HOMEPAGE=http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/
-IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kwave-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e12ad0d34f5d768ac3c2ac5b3a0a60ff
diff --git a/metadata/md5-cache/kde-apps/kwave-18.04.1 b/metadata/md5-cache/kde-apps/kwave-18.04.1
new file mode 100644
index 000000000000..63e659a8f368
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwave-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-apps/poxml-18.04.1:5 >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
+EAPI=6
+HOMEPAGE=http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/
+IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kwave-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e12ad0d34f5d768ac3c2ac5b3a0a60ff
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-18.04.0 b/metadata/md5-cache/kde-apps/kwordquiz-18.04.0
deleted file mode 100644
index 0b7a8b8ba868..000000000000
--- a/metadata/md5-cache/kde-apps/kwordquiz-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.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 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A powerful flashcard and vocabulary learning program
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.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 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kwordquiz-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2e94f36b7940f46038f1605a16f36ee2
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-18.04.1 b/metadata/md5-cache/kde-apps/kwordquiz-18.04.1
new file mode 100644
index 000000000000..f6e301f97902
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwordquiz-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.1: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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A powerful flashcard and vocabulary learning program
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.1: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.44.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/18.04.1/src/kwordquiz-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2e94f36b7940f46038f1605a16f36ee2
diff --git a/metadata/md5-cache/kde-apps/kwrite-18.04.0 b/metadata/md5-cache/kde-apps/kwrite-18.04.0
deleted file mode 100644
index aaaf057a7c9a..000000000000
--- a/metadata/md5-cache/kde-apps/kwrite-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE simple text editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kwrite
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/kate-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1ec19493095d035321afda652edd6c04
diff --git a/metadata/md5-cache/kde-apps/kwrite-18.04.1 b/metadata/md5-cache/kde-apps/kwrite-18.04.1
new file mode 100644
index 000000000000..fc16eb77eec2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwrite-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE simple text editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kwrite
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/kate-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ec19493095d035321afda652edd6c04
diff --git a/metadata/md5-cache/kde-apps/libgravatar-18.04.0 b/metadata/md5-cache/kde-apps/libgravatar-18.04.0
deleted file mode 100644
index 805ca6adecd0..000000000000
--- a/metadata/md5-cache/kde-apps/libgravatar-18.04.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.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/pimcommon-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for gravatar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/pimcommon-18.04.0: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.44.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/18.04.0/src/libgravatar-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=beb94fac01f541f260eef3b3950cfc59
diff --git a/metadata/md5-cache/kde-apps/libgravatar-18.04.1 b/metadata/md5-cache/kde-apps/libgravatar-18.04.1
new file mode 100644
index 000000000000..155d73062a9b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libgravatar-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for gravatar integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/pimcommon-18.04.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-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/libgravatar-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=beb94fac01f541f260eef3b3950cfc59
diff --git a/metadata/md5-cache/kde-apps/libkcddb-18.04.0 b/metadata/md5-cache/kde-apps/libkcddb-18.04.0
deleted file mode 100644
index 5adba5761063..000000000000
--- a/metadata/md5-cache/kde-apps/libkcddb-18.04.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library for CDDB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=musicbrainz debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/libkcddb-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e4ed2d1e418cca8158da3e002e3e2848
diff --git a/metadata/md5-cache/kde-apps/libkcddb-18.04.1 b/metadata/md5-cache/kde-apps/libkcddb-18.04.1
new file mode 100644
index 000000000000..7e4e027b8cb1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcddb-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library for CDDB
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=musicbrainz debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkcddb-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e4ed2d1e418cca8158da3e002e3e2848
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.0 b/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.0
deleted file mode 100644
index 2cc90d010b53..000000000000
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.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.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.7.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for playing & ripping CDs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=alsa debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/solid-5.44.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.44.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/18.04.0/src/libkcompactdisc-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=60d253c89d319c5eccaba4ae38273ca6
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.1 b/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.1
new file mode 100644
index 000000000000..7288c8f048ec
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.7.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for playing & ripping CDs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=alsa debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/solid-5.44.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.44.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/18.04.1/src/libkcompactdisc-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=60d253c89d319c5eccaba4ae38273ca6
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-18.04.0 b/metadata/md5-cache/kde-apps/libkdcraw-18.04.0
deleted file mode 100644
index bf94eeb40746..000000000000
--- a/metadata/md5-cache/kde-apps/libkdcraw-18.04.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-libs/libraw-0.16:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Digital camera raw image library wrapper
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/libkdcraw-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ac56850989ddf7ea772cef4d6b83c126
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-18.04.1 b/metadata/md5-cache/kde-apps/libkdcraw-18.04.1
new file mode 100644
index 000000000000..d808c65aeed8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdcraw-18.04.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 >=media-libs/libraw-0.16:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Digital camera raw image library wrapper
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/libkdcraw-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ac56850989ddf7ea772cef4d6b83c126
diff --git a/metadata/md5-cache/kde-apps/libkdegames-18.04.0 b/metadata/md5-cache/kde-apps/libkdegames-18.04.0
deleted file mode 100644
index 5bcbd1b08bd9..000000000000
--- a/metadata/md5-cache/kde-apps/libkdegames-18.04.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.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Base library common to many KDE games
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/libkdegames-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b61186187d35fa19b2b013d40bf38f62
diff --git a/metadata/md5-cache/kde-apps/libkdegames-18.04.1 b/metadata/md5-cache/kde-apps/libkdegames-18.04.1
new file mode 100644
index 000000000000..fb8f5db4af9c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdegames-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Base library common to many KDE games
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/libkdegames-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b61186187d35fa19b2b013d40bf38f62
diff --git a/metadata/md5-cache/kde-apps/libkdepim-18.04.0 b/metadata/md5-cache/kde-apps/libkdepim-18.04.0
deleted file mode 100644
index adb5ae5f0865..000000000000
--- a/metadata/md5-cache/kde-apps/libkdepim-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-search-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kldap-18.04.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-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-search-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kldap-18.04.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 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/libkdepim-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d27b91dfd95df8873c85409097ef9dd0
diff --git a/metadata/md5-cache/kde-apps/libkdepim-18.04.1 b/metadata/md5-cache/kde-apps/libkdepim-18.04.1
new file mode 100644
index 000000000000..9ae926d9791e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdepim-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kldap-18.04.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/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kldap-18.04.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/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.44.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/18.04.1/src/libkdepim-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d27b91dfd95df8873c85409097ef9dd0
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.0 b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.0
deleted file mode 100644
index 0036ab12d039..000000000000
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for reading/writing KVTML
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/libkeduvocdocument-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fc4c0711688f0c790416357a03d33f5e
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.1 b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.1
new file mode 100644
index 000000000000..ca8c979a7c3e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for reading/writing KVTML
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/libkeduvocdocument-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fc4c0711688f0c790416357a03d33f5e
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-18.04.0 b/metadata/md5-cache/kde-apps/libkexiv2-18.04.0
deleted file mode 100644
index 4b65350124be..000000000000
--- a/metadata/md5-cache/kde-apps/libkexiv2-18.04.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/exiv2-0.25:=[xmp=] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Image Plugin Interface: an exiv2 library wrapper
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+xmp debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/libkexiv2-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba19d1ef3906fb72dc2cfc56a1e5775c
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-18.04.1 b/metadata/md5-cache/kde-apps/libkexiv2-18.04.1
new file mode 100644
index 000000000000..3aa3eddcebd1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkexiv2-18.04.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 >=media-gfx/exiv2-0.25:=[xmp=] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Image Plugin Interface: an exiv2 library wrapper
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+xmp debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/libkexiv2-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba19d1ef3906fb72dc2cfc56a1e5775c
diff --git a/metadata/md5-cache/kde-apps/libkgapi-18.04.0 b/metadata/md5-cache/kde-apps/libkgapi-18.04.0
deleted file mode 100644
index df9e5f976124..000000000000
--- a/metadata/md5-cache/kde-apps/libkgapi-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcontacts-18.04.0: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 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for accessing Google calendar and contact resources
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/libkgapi.git
-IUSE=nls test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcontacts-18.04.0: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.44.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/18.04.0/src/libkgapi-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3932b1adf2ee4ad7f11f2959cc732033
diff --git a/metadata/md5-cache/kde-apps/libkgapi-18.04.1 b/metadata/md5-cache/kde-apps/libkgapi-18.04.1
new file mode 100644
index 000000000000..89deff694f61
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgapi-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1: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 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for accessing Google calendar and contact resources
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/libkgapi.git
+IUSE=nls test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1: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.44.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/18.04.1/src/libkgapi-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3932b1adf2ee4ad7f11f2959cc732033
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-18.04.0 b/metadata/md5-cache/kde-apps/libkgeomap-18.04.0
deleted file mode 100644
index d29d11965bc4..000000000000
--- a/metadata/md5-cache/kde-apps/libkgeomap-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/marble-18.04.0: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Wrapper library for world map components as marble, openstreetmap and googlemap
-EAPI=6
-HOMEPAGE=https://www.digikam.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/marble-18.04.0: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.44.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/18.04.0/src/libkgeomap-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be4082f64cf30ac0565ab8bef019febd
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-18.04.1 b/metadata/md5-cache/kde-apps/libkgeomap-18.04.1
new file mode 100644
index 000000000000..c8571c0982d9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgeomap-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/marble-18.04.1: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Wrapper library for world map components as marble, openstreetmap and googlemap
+EAPI=6
+HOMEPAGE=https://www.digikam.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/marble-18.04.1: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.44.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/18.04.1/src/libkgeomap-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be4082f64cf30ac0565ab8bef019febd
diff --git a/metadata/md5-cache/kde-apps/libkipi-18.04.0 b/metadata/md5-cache/kde-apps/libkipi-18.04.0
deleted file mode 100644
index 19b5040336c3..000000000000
--- a/metadata/md5-cache/kde-apps/libkipi-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A library for image plugins accross KDE applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/libkipi-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4255d17f008de0d16dc59a4ca961c0f8
diff --git a/metadata/md5-cache/kde-apps/libkipi-18.04.1 b/metadata/md5-cache/kde-apps/libkipi-18.04.1
new file mode 100644
index 000000000000..92c13cb820fd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkipi-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A library for image plugins accross KDE applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/libkipi-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4255d17f008de0d16dc59a4ca961c0f8
diff --git a/metadata/md5-cache/kde-apps/libkleo-18.04.0 b/metadata/md5-cache/kde-apps/libkleo-18.04.0
deleted file mode 100644
index bc4ac3492aad..000000000000
--- a/metadata/md5-cache/kde-apps/libkleo-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for encryption handling
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kpimtextedit-18.04.0: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.44.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/18.04.0/src/libkleo-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6603d206edf3f515ef50e4979e31961b
diff --git a/metadata/md5-cache/kde-apps/libkleo-18.04.1 b/metadata/md5-cache/kde-apps/libkleo-18.04.1
new file mode 100644
index 000000000000..e1b536630fd0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkleo-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kpimtextedit-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for encryption handling
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kpimtextedit-18.04.1: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.44.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/18.04.1/src/libkleo-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6603d206edf3f515ef50e4979e31961b
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-18.04.0 b/metadata/md5-cache/kde-apps/libkmahjongg-18.04.0
deleted file mode 100644
index dd95c2701670..000000000000
--- a/metadata/md5-cache/kde-apps/libkmahjongg-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.0/src/libkmahjongg-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a031f862490c62de64f6a65f6f6cb7df
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-18.04.1 b/metadata/md5-cache/kde-apps/libkmahjongg-18.04.1
new file mode 100644
index 000000000000..8f1fc93ba07a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.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.44.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/18.04.1/src/libkmahjongg-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a031f862490c62de64f6a65f6f6cb7df
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-18.04.0 b/metadata/md5-cache/kde-apps/libkomparediff2-18.04.0
deleted file mode 100644
index 239414822d8e..000000000000
--- a/metadata/md5-cache/kde-apps/libkomparediff2-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library to compare files and strings
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/libkomparediff2-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71717e4a34cd202c01d8518f9b8e2abe
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-18.04.1 b/metadata/md5-cache/kde-apps/libkomparediff2-18.04.1
new file mode 100644
index 000000000000..39542451a93b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library to compare files and strings
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/libkomparediff2-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=71717e4a34cd202c01d8518f9b8e2abe
diff --git a/metadata/md5-cache/kde-apps/libksane-18.04.0 b/metadata/md5-cache/kde-apps/libksane-18.04.0
deleted file mode 100644
index 1c7d56a322dc..000000000000
--- a/metadata/md5-cache/kde-apps/libksane-18.04.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.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=SANE Library interface based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=kwallet debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.44.0:5 ) !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/libksane-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=664e3e3594d4876781098b28c1af630a
diff --git a/metadata/md5-cache/kde-apps/libksane-18.04.1 b/metadata/md5-cache/kde-apps/libksane-18.04.1
new file mode 100644
index 000000000000..87853557a7c2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksane-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=SANE Library interface based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=kwallet debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.44.0:5 ) !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/libksane-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=664e3e3594d4876781098b28c1af630a
diff --git a/metadata/md5-cache/kde-apps/libksieve-18.04.0 b/metadata/md5-cache/kde-apps/libksieve-18.04.0
deleted file mode 100644
index deaa7570c7a0..000000000000
--- a/metadata/md5-cache/kde-apps/libksieve-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/pimcommon-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 dev-libs/cyrus-sasl >=kde-apps/kimap-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/pimcommon-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libksieve:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/libksieve-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5322310fe94bfa3632c9426f00d36282
diff --git a/metadata/md5-cache/kde-apps/libksieve-18.04.1 b/metadata/md5-cache/kde-apps/libksieve-18.04.1
new file mode 100644
index 000000000000..9a2d541b54c4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksieve-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.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/qtprintsupport-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 dev-libs/cyrus-sasl >=kde-apps/kimap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.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/qtprintsupport-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libksieve:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/libksieve-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5322310fe94bfa3632c9426f00d36282
diff --git a/metadata/md5-cache/kde-apps/libktnef-18.04.0 b/metadata/md5-cache/kde-apps/libktnef-18.04.0
deleted file mode 100644
index 39c2501d785f..000000000000
--- a/metadata/md5-cache/kde-apps/libktnef-18.04.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.44.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for handling TNEF data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcalutils-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/ktnef-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06df9e7ba703b871c194c906560b35ff
diff --git a/metadata/md5-cache/kde-apps/libktnef-18.04.1 b/metadata/md5-cache/kde-apps/libktnef-18.04.1
new file mode 100644
index 000000000000..4889a3f951b9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libktnef-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for handling TNEF data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/ktnef-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=06df9e7ba703b871c194c906560b35ff
diff --git a/metadata/md5-cache/kde-apps/lokalize-18.04.0 b/metadata/md5-cache/kde-apps/lokalize-18.04.0
deleted file mode 100644
index 29d37c014b21..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-18.04.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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.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/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=app-text/hunspell-1.2.8:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Applications 5 translation tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/lokalize https://l10n.kde.org/tools
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.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/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lokalize:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/lokalize-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a6fb43682a57a747af2678e0e1f3300
diff --git a/metadata/md5-cache/kde-apps/lokalize-18.04.1 b/metadata/md5-cache/kde-apps/lokalize-18.04.1
new file mode 100644
index 000000000000..b53d197ecfdf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lokalize-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.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/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=app-text/hunspell-1.2.8:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Applications 5 translation tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/lokalize https://l10n.kde.org/tools
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.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/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lokalize:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/lokalize-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a6fb43682a57a747af2678e0e1f3300
diff --git a/metadata/md5-cache/kde-apps/lskat-18.04.0 b/metadata/md5-cache/kde-apps/lskat-18.04.0
deleted file mode 100644
index accd9da8f1d1..000000000000
--- a/metadata/md5-cache/kde-apps/lskat-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Skat game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/lskat/ https://games.kde.org/game.php?game=lskat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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.44.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/18.04.0/src/lskat-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f2532cb8056fc767c0133620dda0569
diff --git a/metadata/md5-cache/kde-apps/lskat-18.04.1 b/metadata/md5-cache/kde-apps/lskat-18.04.1
new file mode 100644
index 000000000000..a7e29d4d3d1a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lskat-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Skat game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/lskat/ https://games.kde.org/game.php?game=lskat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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.44.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/18.04.1/src/lskat-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1f2532cb8056fc767c0133620dda0569
diff --git a/metadata/md5-cache/kde-apps/mailcommon-18.04.0 b/metadata/md5-cache/kde-apps/mailcommon-18.04.0
deleted file mode 100644
index 548e01c60644..000000000000
--- a/metadata/md5-cache/kde-apps/mailcommon-18.04.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.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/mailimporter-18.04.0:5 >=kde-apps/messagelib-18.04.0:5 >=kde-apps/pimcommon-18.04.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 media-libs/phonon[qt5(+)] dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common mail library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/mailimporter-18.04.0:5 >=kde-apps/messagelib-18.04.0:5 >=kde-apps/pimcommon-18.04.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 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/mailcommon-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e19b66251bccff75b1b8423e205b2e67
diff --git a/metadata/md5-cache/kde-apps/mailcommon-18.04.1 b/metadata/md5-cache/kde-apps/mailcommon-18.04.1
new file mode 100644
index 000000000000..095e78d4c552
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailcommon-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailimporter-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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 media-libs/phonon[qt5(+)] dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common mail library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailimporter-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/mailcommon-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e19b66251bccff75b1b8423e205b2e67
diff --git a/metadata/md5-cache/kde-apps/mailimporter-18.04.0 b/metadata/md5-cache/kde-apps/mailimporter-18.04.0
deleted file mode 100644
index bc4ba341a16b..000000000000
--- a/metadata/md5-cache/kde-apps/mailimporter-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=dev-qt/qtgui-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.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to import mail from various sources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/libkdepim-18.04.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/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/mailimporter-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa5d621b3e7458f6964e8ea929556e19
diff --git a/metadata/md5-cache/kde-apps/mailimporter-18.04.1 b/metadata/md5-cache/kde-apps/mailimporter-18.04.1
new file mode 100644
index 000000000000..d7641818adfa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailimporter-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=dev-qt/qtgui-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.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library to import mail from various sources
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.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.44.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/18.04.1/src/mailimporter-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fa5d621b3e7458f6964e8ea929556e19
diff --git a/metadata/md5-cache/kde-apps/marble-18.04.0 b/metadata/md5-cache/kde-apps/marble-18.04.0
deleted file mode 100644
index bd53d13c44c0..000000000000
--- a/metadata/md5-cache/kde-apps/marble-18.04.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/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/qtxml-5.7.1:5 aprs? ( >=dev-qt/qtserialport-5.7.1:5 ) dbus? ( >=dev-qt/qtdbus-5.7.1:5 ) designer? ( >=dev-qt/designer-5.7.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.7.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
-EAPI=6
-HOMEPAGE=https://marble.kde.org/
-IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.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/qtxml-5.7.1:5 aprs? ( >=dev-qt/qtserialport-5.7.1:5 ) dbus? ( >=dev-qt/qtdbus-5.7.1:5 ) designer? ( >=dev-qt/designer-5.7.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.7.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/marble:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5/18.04
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/marble-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b3297b41cbca3c6ac53f1644219c0ef
diff --git a/metadata/md5-cache/kde-apps/marble-18.04.1 b/metadata/md5-cache/kde-apps/marble-18.04.1
new file mode 100644
index 000000000000..f8530ea3e4d0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/marble-18.04.1
@@ -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/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/qtxml-5.7.1:5 aprs? ( >=dev-qt/qtserialport-5.7.1:5 ) dbus? ( >=dev-qt/qtdbus-5.7.1:5 ) designer? ( >=dev-qt/designer-5.7.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.7.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
+EAPI=6
+HOMEPAGE=https://marble.kde.org/
+IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.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/qtxml-5.7.1:5 aprs? ( >=dev-qt/qtserialport-5.7.1:5 ) dbus? ( >=dev-qt/qtdbus-5.7.1:5 ) designer? ( >=dev-qt/designer-5.7.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.7.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/marble:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5/18.04
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/marble-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b3297b41cbca3c6ac53f1644219c0ef
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-18.04.0 b/metadata/md5-cache/kde-apps/mbox-importer-18.04.0
deleted file mode 100644
index 408280c44b85..000000000000
--- a/metadata/md5-cache/kde-apps/mbox-importer-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/mailcommon-18.04.0:5 >=kde-apps/mailimporter-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Import mbox email archives from various sources into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/mailcommon-18.04.0:5 >=kde-apps/mailimporter-18.04.0: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.44.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/18.04.0/src/mbox-importer-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=17fd6d8edc80636f539ba9abfa526673
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-18.04.1 b/metadata/md5-cache/kde-apps/mbox-importer-18.04.1
new file mode 100644
index 000000000000..bbe6e137c278
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mbox-importer-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/mailimporter-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Import mbox email archives from various sources into Akonadi
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/mailimporter-18.04.1: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.44.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/18.04.1/src/mbox-importer-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=17fd6d8edc80636f539ba9abfa526673
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.04.0 b/metadata/md5-cache/kde-apps/messagelib-18.04.0
deleted file mode 100644
index dbceb5331668..000000000000
--- a/metadata/md5-cache/kde-apps/messagelib-18.04.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.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/grantleetheme-18.04.0:5 >=kde-apps/incidenceeditor-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kldap-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmbox-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libgravatar-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/libkleo-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries for messaging functions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/grantleetheme-18.04.0:5 >=kde-apps/incidenceeditor-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kdepim-apps-libs-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kldap-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmbox-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libgravatar-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/libkleo-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 !<kde-apps/kdepim-addons-16.08.50:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !=kde-apps/kmail-4.4*:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/messagelib:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/messagelib-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24f1fb5c1b0da32b4214c738b168663e
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.04.1 b/metadata/md5-cache/kde-apps/messagelib-18.04.1
new file mode 100644
index 000000000000..62e90866a836
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/messagelib-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/incidenceeditor-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmbox-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libgravatar-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries for messaging functions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/incidenceeditor-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmbox-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libgravatar-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.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/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 !<kde-apps/kdepim-addons-16.08.50:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !=kde-apps/kmail-4.4*:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/messagelib:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/messagelib-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=24f1fb5c1b0da32b4214c738b168663e
diff --git a/metadata/md5-cache/kde-apps/minuet-18.04.0 b/metadata/md5-cache/kde-apps/minuet-18.04.0
deleted file mode 100644
index 0a489f44e142..000000000000
--- a/metadata/md5-cache/kde-apps/minuet-18.04.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.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.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 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE Software for Music Education
-EAPI=6
-HOMEPAGE=https://minuet.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.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.44.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/18.04.0/src/minuet-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b34f033c0b48824a49d6db5fad7450b9
diff --git a/metadata/md5-cache/kde-apps/minuet-18.04.1 b/metadata/md5-cache/kde-apps/minuet-18.04.1
new file mode 100644
index 000000000000..d4d2c9c88d35
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/minuet-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.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 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE Software for Music Education
+EAPI=6
+HOMEPAGE=https://minuet.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.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.44.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/18.04.1/src/minuet-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b34f033c0b48824a49d6db5fad7450b9
diff --git a/metadata/md5-cache/kde-apps/okular-18.04.0 b/metadata/md5-cache/kde-apps/okular-18.04.0
deleted file mode 100644
index c652864e871a..000000000000
--- a/metadata/md5-cache/kde-apps/okular-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjs-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/threadweaver-5.44.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-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.44.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-18.04.0:5 >=dev-qt/qtgui-5.7.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.04.0:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) tiff? ( media-libs/tiff:0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Universal document viewer based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://okular.kde.org https://www.kde.org/applications/graphics/okular
-IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjs-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/threadweaver-5.44.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-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.44.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-18.04.0:5 >=dev-qt/qtgui-5.7.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.04.0:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.44.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/okular-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a6dcb7fb101c93f990cc929dc1a5adb9
diff --git a/metadata/md5-cache/kde-apps/okular-18.04.1 b/metadata/md5-cache/kde-apps/okular-18.04.1
new file mode 100644
index 000000000000..aad01f664a1d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/okular-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjs-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/threadweaver-5.44.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-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.44.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-18.04.1:5 >=dev-qt/qtgui-5.7.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.04.1:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) tiff? ( media-libs/tiff:0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Universal document viewer based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://okular.kde.org https://www.kde.org/applications/graphics/okular
+IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjs-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/threadweaver-5.44.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-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.44.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-18.04.1:5 >=dev-qt/qtgui-5.7.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.04.1:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.44.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/okular-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a6dcb7fb101c93f990cc929dc1a5adb9
diff --git a/metadata/md5-cache/kde-apps/palapeli-18.04.0 b/metadata/md5-cache/kde-apps/palapeli-18.04.0
deleted file mode 100644
index 564371b75360..000000000000
--- a/metadata/md5-cache/kde-apps/palapeli-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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/qtconcurrent-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Jigsaw puzzle game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/palapeli/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.0: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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/palapeli-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d70de4e62f097445c63fd7812f757424
diff --git a/metadata/md5-cache/kde-apps/palapeli-18.04.1 b/metadata/md5-cache/kde-apps/palapeli-18.04.1
new file mode 100644
index 000000000000..da76d900f725
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/palapeli-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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/qtconcurrent-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Jigsaw puzzle game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/palapeli/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/palapeli-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d70de4e62f097445c63fd7812f757424
diff --git a/metadata/md5-cache/kde-apps/parley-18.04.0 b/metadata/md5-cache/kde-apps/parley-18.04.0
deleted file mode 100644
index ebecad912f85..000000000000
--- a/metadata/md5-cache/kde-apps/parley-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/libkeduvocdocument-18.04.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.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-qt/qtwebengine-5.7.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A vocabulary trainer to help you memorize things
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/parley https://edu.kde.org/applications/school/parley
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-apps/libkeduvocdocument-18.04.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.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-qt/qtwebengine-5.7.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-18.04.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/parley-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a5140db5141a84a167ba9bc55be5486
diff --git a/metadata/md5-cache/kde-apps/parley-18.04.1 b/metadata/md5-cache/kde-apps/parley-18.04.1
new file mode 100644
index 000000000000..b8443ed7af66
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/parley-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/libkeduvocdocument-18.04.1:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.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-qt/qtwebengine-5.7.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A vocabulary trainer to help you memorize things
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/parley https://edu.kde.org/applications/school/parley
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-apps/libkeduvocdocument-18.04.1:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.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-qt/qtwebengine-5.7.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/parley-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3a5140db5141a84a167ba9bc55be5486
diff --git a/metadata/md5-cache/kde-apps/picmi-18.04.0 b/metadata/md5-cache/kde-apps/picmi-18.04.0
deleted file mode 100644
index 7cd940ff77b0..000000000000
--- a/metadata/md5-cache/kde-apps/picmi-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Nonogram logic game by KDE
-EAPI=6
-HOMEPAGE=https://games.kde.org/game.php?game=picmi
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/picmi-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=13b70da55158b7872324a3e69cf35268
diff --git a/metadata/md5-cache/kde-apps/picmi-18.04.1 b/metadata/md5-cache/kde-apps/picmi-18.04.1
new file mode 100644
index 000000000000..9f62cf117b3b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/picmi-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Nonogram logic game by KDE
+EAPI=6
+HOMEPAGE=https://games.kde.org/game.php?game=picmi
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1: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.44.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/18.04.1/src/picmi-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=13b70da55158b7872324a3e69cf35268
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.0 b/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.0
deleted file mode 100644
index 4cdc52b3d35e..000000000000
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/mailcommon-18.04.0:5 >=kde-apps/pimcommon-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to backup and archive PIM data and configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Backup_Options
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kidentitymanagement-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/kmime-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.0:5 >=kde-apps/mailcommon-18.04.0:5 >=kde-apps/pimcommon-18.04.0: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.44.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/18.04.0/src/pim-data-exporter-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d079eec90f0277247561f36175046cf0
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.1 b/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.1
new file mode 100644
index 000000000000..89e1614a90b0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant to backup and archive PIM data and configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Backup_Options
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/pimcommon-18.04.1: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.44.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/18.04.1/src/pim-data-exporter-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d079eec90f0277247561f36175046cf0
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.0 b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.0
deleted file mode 100644
index 0c309c34b96c..000000000000
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/libksieve-18.04.0:5 >=kde-apps/pimcommon-18.04.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant for editing IMAP Sieve filters
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/akonadi-mime-18.04.0:5 >=kde-apps/calendarsupport-18.04.0:5 >=kde-apps/kcalcore-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kmailtransport-18.04.0:5 >=kde-apps/libksieve-18.04.0:5 >=kde-apps/pimcommon-18.04.0: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.44.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/18.04.0/src/pim-sieve-editor-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=085e9e69472827265a2b2d9ed0a30151
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.1 b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.1
new file mode 100644
index 000000000000..c05b089e1959
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/libksieve-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant for editing IMAP Sieve filters
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/libksieve-18.04.1:5 >=kde-apps/pimcommon-18.04.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.44.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/18.04.1/src/pim-sieve-editor-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=085e9e69472827265a2b2d9ed0a30151
diff --git a/metadata/md5-cache/kde-apps/pimcommon-18.04.0 b/metadata/md5-cache/kde-apps/pimcommon-18.04.0
deleted file mode 100644
index 4427c9048d3a..000000000000
--- a/metadata/md5-cache/kde-apps/pimcommon-18.04.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.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kimap-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.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 dev-libs/grantlee:5 >=kde-frameworks/kiconthemes-5.44.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-18.04.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.0:5 >=kde-apps/akonadi-contacts-18.04.0:5 >=kde-apps/kcontacts-18.04.0:5 >=kde-apps/kimap-18.04.0:5 >=kde-apps/kpimtextedit-18.04.0:5 >=kde-apps/libkdepim-18.04.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 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/pimcommon-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca596193de7d85f965eb6c36048be753
diff --git a/metadata/md5-cache/kde-apps/pimcommon-18.04.1 b/metadata/md5-cache/kde-apps/pimcommon-18.04.1
new file mode 100644
index 000000000000..fbdca1a814cc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pimcommon-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kimap-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.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/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 >=kde-frameworks/kiconthemes-5.44.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-18.04.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kimap-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.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/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.44.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/18.04.1/src/pimcommon-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ca596193de7d85f965eb6c36048be753
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.0 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.0
deleted file mode 100644
index 2a9b67953c8f..000000000000
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Plasma Telepathy client
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=gstreamer
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
-RDEPEND=>=kde-apps/ktp-accounts-kcm-18.04.0 >=kde-apps/ktp-approver-18.04.0 >=kde-apps/ktp-auth-handler-18.04.0 >=kde-apps/ktp-common-internals-18.04.0 >=kde-apps/ktp-contact-list-18.04.0 >=kde-apps/ktp-contact-runner-18.04.0 >=kde-apps/ktp-desktop-applets-18.04.0 >=kde-apps/ktp-filetransfer-handler-18.04.0 >=kde-apps/ktp-kded-module-18.04.0 >=kde-apps/ktp-send-file-18.04.0 >=kde-apps/ktp-text-ui-18.04.0 gstreamer? ( >=kde-apps/ktp-call-ui-18.04.0 ) !kde-apps/plasma-telepathy-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=904dc6400b92235473f0dc2f82f19f90
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.1 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.1
new file mode 100644
index 000000000000..9334d35121bf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Plasma Telepathy client
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=gstreamer
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
+RDEPEND=>=kde-apps/ktp-accounts-kcm-18.04.1 >=kde-apps/ktp-approver-18.04.1 >=kde-apps/ktp-auth-handler-18.04.1 >=kde-apps/ktp-common-internals-18.04.1 >=kde-apps/ktp-contact-list-18.04.1 >=kde-apps/ktp-contact-runner-18.04.1 >=kde-apps/ktp-desktop-applets-18.04.1 >=kde-apps/ktp-filetransfer-handler-18.04.1 >=kde-apps/ktp-kded-module-18.04.1 >=kde-apps/ktp-send-file-18.04.1 >=kde-apps/ktp-text-ui-18.04.1 gstreamer? ( >=kde-apps/ktp-call-ui-18.04.1 ) !kde-apps/plasma-telepathy-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	1556eb322594eaaf87e5441e4e64052c	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=904dc6400b92235473f0dc2f82f19f90
diff --git a/metadata/md5-cache/kde-apps/poxml-18.04.0 b/metadata/md5-cache/kde-apps/poxml-18.04.0
deleted file mode 100644
index e9f5e8bcaa89..000000000000
--- a/metadata/md5-cache/kde-apps/poxml-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.7.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtxml-5.7.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/poxml-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6b1503f1d154b16c49d42dcfebaa049c
diff --git a/metadata/md5-cache/kde-apps/poxml-18.04.1 b/metadata/md5-cache/kde-apps/poxml-18.04.1
new file mode 100644
index 000000000000..69fac2f6bfe3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/poxml-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.7.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtxml-5.7.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/poxml-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6b1503f1d154b16c49d42dcfebaa049c
diff --git a/metadata/md5-cache/kde-apps/print-manager-18.04.0 b/metadata/md5-cache/kde-apps/print-manager-18.04.0
deleted file mode 100644
index dcf8882b488f..000000000000
--- a/metadata/md5-cache/kde-apps/print-manager-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Manage print jobs and printers in Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+gtk debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.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.11.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/print-manager-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fba5e7b15360395d7455521769b932c3
diff --git a/metadata/md5-cache/kde-apps/print-manager-18.04.1 b/metadata/md5-cache/kde-apps/print-manager-18.04.1
new file mode 100644
index 000000000000..385cd1714834
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/print-manager-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Manage print jobs and printers in Plasma
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+gtk debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.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.11.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/print-manager-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fba5e7b15360395d7455521769b932c3
diff --git a/metadata/md5-cache/kde-apps/rocs-18.04.0 b/metadata/md5-cache/kde-apps/rocs-18.04.0
deleted file mode 100644
index e83be3d73e2a..000000000000
--- a/metadata/md5-cache/kde-apps/rocs-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5[scripttools] >=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-qt/qtxmlpatterns-5.7.1:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interface to work with Graph Theory
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/rocs https://edu.kde.org/applications/mathematics/rocs
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5[scripttools] >=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-qt/qtxmlpatterns-5.7.1:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/rocs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/rocs-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d31e73b73003574ae3a1e0cb7593386a
diff --git a/metadata/md5-cache/kde-apps/rocs-18.04.1 b/metadata/md5-cache/kde-apps/rocs-18.04.1
new file mode 100644
index 000000000000..de837d9ee3e3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/rocs-18.04.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5[scripttools] >=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-qt/qtxmlpatterns-5.7.1:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interface to work with Graph Theory
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/rocs https://edu.kde.org/applications/mathematics/rocs
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5[scripttools] >=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-qt/qtxmlpatterns-5.7.1:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/rocs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/rocs-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d31e73b73003574ae3a1e0cb7593386a
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.0 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.0
deleted file mode 100644
index 3b8486010f1b..000000000000
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.44.0:5 net-libs/signond sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KWallet extension for signond
-EAPI=6
-HOMEPAGE=https://01.org/gsso/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kwallet-5.44.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/signon-kwallet-extension-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3445e773e29ae4c9ed2bf56169a9a404
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.1 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.1
new file mode 100644
index 000000000000..5838816b0082
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwallet-5.44.0:5 net-libs/signond sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KWallet extension for signond
+EAPI=6
+HOMEPAGE=https://01.org/gsso/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kwallet-5.44.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/signon-kwallet-extension-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3445e773e29ae4c9ed2bf56169a9a404
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.04.0 b/metadata/md5-cache/kde-apps/spectacle-18.04.0
deleted file mode 100644
index 04308d50e18f..000000000000
--- a/metadata/md5-cache/kde-apps/spectacle-18.04.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.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.0:5= ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screenshot capture utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=kipi share debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.0:5= ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/spectacle-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=11ecff6534c5e15b7f408d050ad7694c
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.04.1 b/metadata/md5-cache/kde-apps/spectacle-18.04.1
new file mode 100644
index 000000000000..66df0e4415c6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/spectacle-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.1:5= ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screenshot capture utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=kipi share debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-18.04.1:5= ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/spectacle-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=11ecff6534c5e15b7f408d050ad7694c
diff --git a/metadata/md5-cache/kde-apps/step-18.04.0 b/metadata/md5-cache/kde-apps/step-18.04.0
deleted file mode 100644
index 2301b532dbcb..000000000000
--- a/metadata/md5-cache/kde-apps/step-18.04.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.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0: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 >=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:= ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interactive physics simulator
-EAPI=6
-HOMEPAGE=https://edu.kde.org/step
-IUSE=+gsl nls +qalculate debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0: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 >=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.44.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/18.04.0/src/step-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3daf02a171516c0be2aa1791d7e620d
diff --git a/metadata/md5-cache/kde-apps/step-18.04.1 b/metadata/md5-cache/kde-apps/step-18.04.1
new file mode 100644
index 000000000000..9d0d62fec6fd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/step-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0: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 >=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:= ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interactive physics simulator
+EAPI=6
+HOMEPAGE=https://edu.kde.org/step
+IUSE=+gsl nls +qalculate debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0: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 >=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.44.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/18.04.1/src/step-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e3daf02a171516c0be2aa1791d7e620d
diff --git a/metadata/md5-cache/kde-apps/svgpart-18.04.0 b/metadata/md5-cache/kde-apps/svgpart-18.04.0
deleted file mode 100644
index bd30a2779743..000000000000
--- a/metadata/md5-cache/kde-apps/svgpart-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kpart for viewing SVGs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/svgpart-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4b738d75e994381ac5a06781bbfdb20f
diff --git a/metadata/md5-cache/kde-apps/svgpart-18.04.1 b/metadata/md5-cache/kde-apps/svgpart-18.04.1
new file mode 100644
index 000000000000..20254ed7b1f8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/svgpart-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0: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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kpart for viewing SVGs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/svgpart-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4b738d75e994381ac5a06781bbfdb20f
diff --git a/metadata/md5-cache/kde-apps/sweeper-18.04.0 b/metadata/md5-cache/kde-apps/sweeper-18.04.0
deleted file mode 100644
index 40b0cb10be0e..000000000000
--- a/metadata/md5-cache/kde-apps/sweeper-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-stats-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/sweeper https://utils.kde.org/projects/sweeper
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-stats-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/sweeper-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f7fafbcb069d65f11f99fdca3301ff9
diff --git a/metadata/md5-cache/kde-apps/sweeper-18.04.1 b/metadata/md5-cache/kde-apps/sweeper-18.04.1
new file mode 100644
index 000000000000..c19fe65ff2bd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/sweeper-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-stats-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/sweeper https://utils.kde.org/projects/sweeper
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-stats-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/sweeper-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f7fafbcb069d65f11f99fdca3301ff9
diff --git a/metadata/md5-cache/kde-apps/syndication-18.04.0 b/metadata/md5-cache/kde-apps/syndication-18.04.0
deleted file mode 100644
index b3296e99449b..000000000000
--- a/metadata/md5-cache/kde-apps/syndication-18.04.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.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for parsing RSS and Atom feeds
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/syndication-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=081cb63496f69616df6ec945cd609a17
diff --git a/metadata/md5-cache/kde-apps/syndication-18.04.1 b/metadata/md5-cache/kde-apps/syndication-18.04.1
new file mode 100644
index 000000000000..e5cb1676a50f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/syndication-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for parsing RSS and Atom feeds
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/syndication-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=081cb63496f69616df6ec945cd609a17
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-18.04.0 b/metadata/md5-cache/kde-apps/thumbnailers-18.04.0
deleted file mode 100644
index 804386a6c079..000000000000
--- a/metadata/md5-cache/kde-apps/thumbnailers-18.04.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 raw? ( >=kde-apps/libkdcraw-18.04.0:5 >=kde-apps/libkexiv2-18.04.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=raw debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 raw? ( >=kde-apps/libkdcraw-18.04.0:5 >=kde-apps/libkexiv2-18.04.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.0/src/kdegraphics-thumbnailers-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=64716ddb99b3563491aca9e0279479be
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-18.04.1 b/metadata/md5-cache/kde-apps/thumbnailers-18.04.1
new file mode 100644
index 000000000000..52e6595199b0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/thumbnailers-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 raw? ( >=kde-apps/libkdcraw-18.04.1:5 >=kde-apps/libkexiv2-18.04.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=raw debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.7.1:5 raw? ( >=kde-apps/libkdcraw-18.04.1:5 >=kde-apps/libkexiv2-18.04.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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/18.04.1/src/kdegraphics-thumbnailers-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=64716ddb99b3563491aca9e0279479be
diff --git a/metadata/md5-cache/kde-apps/umbrello-18.04.0 b/metadata/md5-cache/kde-apps/umbrello-18.04.0
deleted file mode 100644
index 730e315c40fb..000000000000
--- a/metadata/md5-cache/kde-apps/umbrello-18.04.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.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-frameworks/kdelibs4support-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE UML Modeller
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/umbrello https://umbrello.kde.org
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.0/src/umbrello-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7e4e6679c02dd84bdbc924c491323905
diff --git a/metadata/md5-cache/kde-apps/umbrello-18.04.1 b/metadata/md5-cache/kde-apps/umbrello-18.04.1
new file mode 100644
index 000000000000..01eb55ef36cd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/umbrello-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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-frameworks/kdelibs4support-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE UML Modeller
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/umbrello https://umbrello.kde.org
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.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.44.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/18.04.1/src/umbrello-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7e4e6679c02dd84bdbc924c491323905
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.0 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.0
deleted file mode 100644
index 9e5aa1dc92bf..000000000000
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.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.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtdbus-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtdbus-5.7.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.0/src/zeroconf-ioslave-18.04.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c98ee44fd9f62859ab908c4b17e25234
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.1 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.1
new file mode 100644
index 000000000000..cc894c6fec5a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtdbus-5.7.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtdbus-5.7.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.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.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.1/src/zeroconf-ioslave-18.04.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	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 3d1b5c7d84fd..6b76d0b0ab33 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/extra-cmake-modules-5.43.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.43.0
index 9b3b2da103d0..320f3fbb96bb 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.43.0
@@ -4,10 +4,10 @@ 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
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/extra-cmake-modules-5.43.0.tar.xz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00fb029824d31a2c8655de15a071ea34
+_md5_=7955dc9dae3166bfeff6ec2de1730278
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 9727c731ece6..59109c8296ea 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/kio-gdrive-1.2.1-r1 b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1-r1
deleted file mode 100644
index b05750f0a066..000000000000
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.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(+)] ) >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KIO Slave for Google Drive service
-EAPI=6
-HOMEPAGE=https://phabricator.kde.org/project/profile/72/
-IUSE=+kaccounts debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.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.43.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	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=adbe6acb11f2416283b571cf4f005b32
diff --git a/metadata/md5-cache/kde-misc/kshutdown-4.0 b/metadata/md5-cache/kde-misc/kshutdown-4.0
deleted file mode 100644
index 441702409110..000000000000
--- a/metadata/md5-cache/kde-misc/kshutdown-4.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 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 app-arch/unzip kde? ( kde-frameworks/extra-cmake-modules:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Shutdown manager for desktop environments like KDE Plasma
-EAPI=6
-HOMEPAGE=https://kshutdown.sourceforge.io
-IUSE=+kde debug
-KEYWORDS=amd64 x86
-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	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4a39509cb9091519abc31fc82db490eb
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta2 b/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta2
deleted file mode 100644
index 0fa751a268d7..000000000000
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/plasma-5.43.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 sys-devel/gettext x11-proto/xproto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KControl module for Wacom tablets
-EAPI=6
-HOMEPAGE=https://www.linux-apps.com/content/show.php?action=content&content=114856
-IUSE=test debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/plasma-5.43.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.43.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	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e2430eecfc6244f22522ef7ce9581a00
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2 b/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2
deleted file mode 100644
index ef9ee65e4ed6..000000000000
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwayland-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Quake-style terminal emulator based on konsole
-EAPI=6
-HOMEPAGE=https://yakuake.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwayland-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.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.43.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	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f8f43f90926b595be046999e07a981c
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 94e30f844593..9e51ebd756f0 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/plasma-desktop-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.5
index 1a1b7928dc82..46833e8aee3d 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.5
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.5
@@ -10,4 +10,4 @@ RDEPEND=>=kde-frameworks/attica-5.43.0:5 >=kde-frameworks/kactivities-5.43.0:5 >
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.5/plasma-desktop-5.12.5.tar.xz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a8b0bf5303e992e7ecdd5c067b5a7fd
+_md5_=0fe548d68474bd3f6d163161dec7fb72
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.12.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.12.5
index 9a546de9d68e..e24c861c8aae 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.12.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.12.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kauth-5.43.0:5[policykit] >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kidletime-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwayland-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=kde-plasma/libkscreen-5.12.5:5 >=kde-plasma/plasma-workspace-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.43.0:5 >=kde-frameworks/networkmanager-qt-5.43.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kauth-5.43.0:5[policykit] >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kidletime-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwayland-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=kde-plasma/libkscreen-5.12.5:5 >=kde-plasma/plasma-workspace-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.43.0:5 >=kde-frameworks/networkmanager-qt-5.43.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/powerdevil.git
-IUSE=brightness-control consolekit +wireless debug +handbook
+IUSE=consolekit +wireless debug +handbook
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kauth-5.43.0:5[policykit] >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kidletime-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwayland-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=kde-plasma/libkscreen-5.12.5:5 >=kde-plasma/plasma-workspace-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.43.0:5 >=kde-frameworks/networkmanager-qt-5.43.0:5 ) >=kde-plasma/kde-cli-tools-5.12.5:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kauth-5.43.0:5[policykit] >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kidletime-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwayland-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=kde-plasma/libkscreen-5.12.5:5 >=kde-plasma/plasma-workspace-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.43.0:5 >=kde-frameworks/networkmanager-qt-5.43.0:5 ) >=kde-plasma/kde-cli-tools-5.12.5:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.5/powerdevil-5.12.5.tar.xz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=96e86f41303c2c97fb2f3467d4103bf2
+_md5_=2786eb8098d9ed716820da03969a3bf2
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 2c3deac9e7b1..c012b615f098 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/mailfilter-0.8.4 b/metadata/md5-cache/mail-filter/mailfilter-0.8.4
index a141594f6838..58161da16743 100644
--- a/metadata/md5-cache/mail-filter/mailfilter-0.8.4
+++ b/metadata/md5-cache/mail-filter/mailfilter-0.8.4
@@ -4,8 +4,8 @@ DESCRIPTION=Mailfilter is a utility to get rid of unwanted spam mails
 EAPI=6
 HOMEPAGE=http://mailfilter.sourceforge.net/
 IUSE=+ssl
-KEYWORDS=amd64 ~ppc sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ppc sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mailfilter/mailfilter-0.8.4.tar.gz
-_md5_=3edcf3bef602a9b0c8202ab80b1c53a4
+_md5_=0f471bc941553c54e7fa60bbc23fe1b2
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index bde5bf5ef971..47e1d480b3c5 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/nanumfont-2.0-r1 b/metadata/md5-cache/media-fonts/nanumfont-2.0-r1
deleted file mode 100644
index d6dc993de97b..000000000000
--- a/metadata/md5-cache/media-fonts/nanumfont-2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=Korean monospace font distributed by NHN
-EAPI=2
-HOMEPAGE=http://dev.naver.com/projects/nanumfont
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=OFL-1.1
-RESTRICT=strip binchecks
-SLOT=0
-SRC_URI=http://dev.naver.com/frs/download.php/441/NanumGothicCoding-2.0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24d65690ae416ab9690c44e4f0178179
diff --git a/metadata/md5-cache/media-fonts/nanumfont-2.0-r2 b/metadata/md5-cache/media-fonts/nanumfont-2.0-r2
new file mode 100644
index 000000000000..db322402433e
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/nanumfont-2.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=Korean monospace font distributed by NHN
+EAPI=6
+HOMEPAGE=http://dev.naver.com/projects/nanumfont
+IUSE=X
+KEYWORDS=~amd64 ~x86
+LICENSE=OFL-1.1
+RESTRICT=strip binchecks
+SLOT=0
+SRC_URI=http://dev.naver.com/frs/download.php/441/NanumGothicCoding-2.0.zip
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=905b5c3cc7543e912aac381cdeb98ba6
diff --git a/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1 b/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1
new file mode 100644
index 000000000000..1813ac9d5f9d
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=SIL fonts for Myanmar script
+EAPI=6
+HOMEPAGE=http://scripts.sil.org/padauk
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=OFL
+SLOT=0
+SRC_URI=mirror://gentoo/padauk-2.8.zip
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=199203b1a239e0685a4a054f53ca707b
diff --git a/metadata/md5-cache/media-fonts/source-han-sans-1.004 b/metadata/md5-cache/media-fonts/source-han-sans-1.004
index 46dcfad3c7f0..42d91a53a5d0 100644
--- a/metadata/md5-cache/media-fonts/source-han-sans-1.004
+++ b/metadata/md5-cache/media-fonts/source-han-sans-1.004
@@ -4,11 +4,11 @@ DESCRIPTION=Pan-CJK OpenType/CFF font family
 EAPI=6
 HOMEPAGE=https://github.com/adobe-fonts/source-han-sans/
 IUSE=l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=Apache-2.0
 REQUIRED_USE=|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=l10n_ja? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansJP.zip -> source-han-sans-ja-1.004.zip ) l10n_ko? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansKR.zip -> source-han-sans-ko-1.004.zip ) l10n_zh-CN? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansCN.zip -> source-han-sans-zh_CN-1.004.zip ) l10n_zh-TW? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansTW.zip -> source-han-sans-zh_TW-1.004.zip )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=71be7ac4e38092b572979be42d1739bf
+_md5_=00c740af0b935cd7b3e2302782b7bda0
diff --git a/metadata/md5-cache/media-fonts/source-pro-20170111 b/metadata/md5-cache/media-fonts/source-pro-20170111
index ff81e37ca3ba..ec2d88c016ac 100644
--- a/metadata/md5-cache/media-fonts/source-pro-20170111
+++ b/metadata/md5-cache/media-fonts/source-pro-20170111
@@ -4,11 +4,11 @@ DESCRIPTION=Adobe's open source typeface family designed for UI environments
 EAPI=6
 HOMEPAGE=https://adobe-fonts.github.io/source-sans-pro/ https://adobe-fonts.github.io/source-serif-pro/ https://adobe-fonts.github.io/source-code-pro/
 IUSE=cjk X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=OFL-1.1
 RDEPEND=media-libs/fontconfig cjk? ( media-fonts/source-han-sans )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/adobe-fonts/source-sans-pro/archive/2.020R-ro/1.075R-it.tar.gz -> source-sans-pro-20170111.tar.gz https://github.com/adobe-fonts/source-serif-pro/archive/2.000R.tar.gz -> source-serif-pro-20170111.tar.gz https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.tar.gz -> source-code-pro-20170111.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4616a7d30dfb38c38887669c5fee04e4
+_md5_=411185efcc8ac919d212d366ea91eaa5
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index fe3d382d4da0..59e36fcaaeb2 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/engauge-10.6 b/metadata/md5-cache/media-gfx/engauge-10.6
new file mode 100644
index 000000000000..c24679051c55
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/engauge-10.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-libs/log4cpp sci-libs/fftw:3.0 jpeg2k? ( media-libs/openjpeg:2 ) pdf? ( app-text/poppler[qt5] ) >=sys-apps/sed-4
+DESCRIPTION=Convert an image file showing a graph or map into numbers
+EAPI=6
+HOMEPAGE=http://markummitchell.github.io/engauge-digitizer/
+IUSE=doc examples jpeg2k pdf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-libs/log4cpp sci-libs/fftw:3.0 jpeg2k? ( media-libs/openjpeg:2 ) pdf? ( app-text/poppler[qt5] )
+SLOT=0
+SRC_URI=https://github.com/markummitchell/engauge-digitizer/archive/v10.6.tar.gz -> engauge-digitizer-10.6.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e7396c696d25bfb4cdb2aa906c58eab3
diff --git a/metadata/md5-cache/media-gfx/fbgrab-1.0-r2 b/metadata/md5-cache/media-gfx/fbgrab-1.0-r2
index 78ebdd907207..9f36d30668e1 100644
--- a/metadata/md5-cache/media-gfx/fbgrab-1.0-r2
+++ b/metadata/md5-cache/media-gfx/fbgrab-1.0-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DEPEND=media-libs/libpng sys-libs/zlib
 DESCRIPTION=Framebuffer screenshot utility
 EAPI=5
-HOMEPAGE=http://hem.bredband.net/gmogmo/fbgrab/
+HOMEPAGE=https://hem.bredband.net/gmogmo/fbgrab/
 KEYWORDS=~alpha amd64 arm ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng sys-libs/zlib
 SLOT=0
-SRC_URI=http://hem.bredband.net/gmogmo/fbgrab/fbgrab-1.0.tar.gz
+SRC_URI=https://hem.bredband.net/gmogmo/fbgrab/fbgrab-1.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=95cd4eb84a2469f99a5c4c89bc7d0d18
+_md5_=a899522fc3f4e1a09e0ec61a3c22d5ee
diff --git a/metadata/md5-cache/media-gfx/fbgrab-1.3 b/metadata/md5-cache/media-gfx/fbgrab-1.3
index bf9123ff8ccf..96962c09ebb8 100644
--- a/metadata/md5-cache/media-gfx/fbgrab-1.3
+++ b/metadata/md5-cache/media-gfx/fbgrab-1.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DEPEND=media-libs/libpng:= sys-libs/zlib
 DESCRIPTION=Framebuffer screenshot utility
 EAPI=5
-HOMEPAGE=http://fbgrab.monells.se/
+HOMEPAGE=https://fbgrab.monells.se/
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:= sys-libs/zlib
 SLOT=0
-SRC_URI=http://fbgrab.monells.se/fbgrab-1.3.tar.gz
+SRC_URI=https://fbgrab.monells.se/fbgrab-1.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a22658f65449217fd767e3f997aa8184
+_md5_=2613965efb7fef42e96cc720e6af8319
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31 b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31
index d712a6163dac..fa6f21bec277 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare test
 DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
 DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
-HOMEPAGE=http://www.imagemagick.org/
+HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/6.9.9.31
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.9-31.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4da3a06f0da38fdfeb8286d5729f10c8
+_md5_=dc2c2c0480f36c98a9d6874ab1702d34
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.40 b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.40
index d9046f6b8ac0..be18654da2e1 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.40
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.40
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare test
 DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
 DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
-HOMEPAGE=http://www.imagemagick.org/
+HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/6.9.9.40
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.9-40.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8a9737b178cc6624a5c7ad8170c94949
+_md5_=f45da85e71830bcdf13c51a9f462f97c
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.43 b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.43
new file mode 100644
index 000000000000..464b0a330788
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.43
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+RESTRICT=perl? ( userpriv )
+SLOT=0/6.9.9.43
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.9-43.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6da5ac84cf723e724aa371f086f8d320
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19 b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19
index 747b4173c5a3..726b11e76a5e 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare test
 DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
 DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
-HOMEPAGE=http://www.imagemagick.org/
+HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/7.0.7.19
 SRC_URI=mirror://imagemagick/ImageMagick-7.0.7-19.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f42e10ab86dc2f70fa047ccfbb22a77a
+_md5_=95041709a02619b50eca4a351b28d91b
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.28 b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.28
index 4dce5d999539..bc840872b2b5 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.28
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.28
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare test
 DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
 DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
-HOMEPAGE=http://www.imagemagick.org/
+HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/7.0.7.28
 SRC_URI=mirror://imagemagick/ImageMagick-7.0.7-28.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4144f330ede8fcfb8a72eaacc0aad77d
+_md5_=7f9b09fe89f63a7c42c7f56f7d6b22a7
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.31 b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.31
new file mode 100644
index 000000000000..7c7eeaf93863
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.31
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+RESTRICT=perl? ( userpriv )
+SLOT=0/7.0.7.31
+SRC_URI=mirror://imagemagick/ImageMagick-7.0.7-31.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4251e8f3bc3b550fd52fc226d7cd82e2
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2 b/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2
index 85a89e420f17..001c547f6ac4 100644
--- a/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2
+++ b/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jy
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.gna.org/mypaint/mypaint-1.1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3444b22ef9f5b27447f71bb66cabd992
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.2.0 b/metadata/md5-cache/media-gfx/mypaint-1.2.0
index e1995a652f95..38c6b4f7fde0 100644
--- a/metadata/md5-cache/media-gfx/mypaint-1.2.0
+++ b/metadata/md5-cache/media-gfx/mypaint-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/mypaint/mypaint/releases/download/v1.2.0/mypaint-1.2.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=11033f81fa41e2a58a92c7b0e02d18d0
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.2.1 b/metadata/md5-cache/media-gfx/mypaint-1.2.1
index be1654d5d781..ee560a364857 100644
--- a/metadata/md5-cache/media-gfx/mypaint-1.2.1
+++ b/metadata/md5-cache/media-gfx/mypaint-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/mypaint/mypaint/releases/download/v1.2.1/mypaint-1.2.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c706102fe94be95892e4cbf1177c562c
diff --git a/metadata/md5-cache/media-gfx/scantailor-0.9.12.2 b/metadata/md5-cache/media-gfx/scantailor-0.9.12.2
deleted file mode 100644
index 2ff334d964d0..000000000000
--- a/metadata/md5-cache/media-gfx/scantailor-0.9.12.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libXrender opengl? ( dev-qt/qtopengl:4 ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A interactive post-processing tool for scanned pages
-EAPI=6
-HOMEPAGE=http://scantailor.org/ https://github.com/scantailor/scantailor
-IUSE=opengl test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 GPL-3 public-domain
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libXrender opengl? ( dev-qt/qtopengl:4 )
-SLOT=0
-SRC_URI=https://github.com/scantailor/scantailor/archive/RELEASE_0_9_12_2.tar.gz -> scantailor-0.9.12.2.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bfaaa20fd047474d87384d8ebd1c6d5c
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.28.3 b/metadata/md5-cache/media-gfx/shotwell-0.28.3
new file mode 100644
index 000000000000..9097dbf97bf3
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/shotwell-0.28.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-crypt/gcr-3[gtk] >=dev-db/sqlite-3.5.9:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 gnome-base/dconf >=media-libs/gexiv2-0.10.4 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.5:= >=media-libs/libraw-0.13.2:= media-plugins/gst-plugins-gdkpixbuf:1.0 >=net-libs/libsoup-2.42.0:2.4 net-libs/webkit-gtk:4 virtual/libgudev:=[introspection] >=x11-libs/gtk+-3.14.0:3[X] dev-libs/libgdata || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/itstool >=sys-devel/gettext-0.19.7 >=sys-devel/m4-1.4.13 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=Open source photo manager for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Shotwell
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=app-crypt/gcr-3[gtk] >=dev-db/sqlite-3.5.9:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 gnome-base/dconf >=media-libs/gexiv2-0.10.4 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.5:= >=media-libs/libraw-0.13.2:= media-plugins/gst-plugins-gdkpixbuf:1.0 >=net-libs/libsoup-2.42.0:2.4 net-libs/webkit-gtk:4 virtual/libgudev:=[introspection] >=x11-libs/gtk+-3.14.0:3[X] dev-libs/libgdata
+SLOT=0
+SRC_URI=mirror://gnome/sources/shotwell/0.28/shotwell-0.28.3.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7e37dddeb80a80e9732a2e803a61cc3c
diff --git a/metadata/md5-cache/media-gfx/zbar-0.10-r6 b/metadata/md5-cache/media-gfx/zbar-0.10-r6
deleted file mode 100644
index e5b254390406..000000000000
--- a/metadata/md5-cache/media-gfx/zbar-0.10-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg: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(+)] gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library and tools for reading barcodes from images or video
-EAPI=5
-HOMEPAGE=http://zbar.sourceforge.net/
-IUSE=gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv python_targets_python2_7
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg: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(+)] gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/zbar/zbar-0.10.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dc9562b569282fac6ccd096b18fd72bd
diff --git a/metadata/md5-cache/media-gfx/zbar-0.10_p20121015-r1 b/metadata/md5-cache/media-gfx/zbar-0.10_p20121015-r1
deleted file mode 100644
index 069084eb28b5..000000000000
--- a/metadata/md5-cache/media-gfx/zbar-0.10_p20121015-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare setup unpack
-DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg: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(+)] gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) java? ( >=virtual/jdk-1.4 ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Library and tools for reading barcodes from images or video
-EAPI=5
-HOMEPAGE=http://zbar.sourceforge.net/
-IUSE=gtk imagemagick java jpeg python qt4 static-libs +threads v4l X xv elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg: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(+)] gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2afb943fbb4c1df47d6c3cc8204a80a3
diff --git a/metadata/md5-cache/media-gfx/zbar-0.10_p20121015-r2 b/metadata/md5-cache/media-gfx/zbar-0.10_p20121015-r2
deleted file mode 100644
index feb906225829..000000000000
--- a/metadata/md5-cache/media-gfx/zbar-0.10_p20121015-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) qt4? ( dev-qt/qtcore:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-qt/qtgui:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jdk-1.4 test? ( dev-java/junit:4 dev-java/hamcrest-core:1.3 ) ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-arch/unzip sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Library and tools for reading barcodes from images or video
-EAPI=6
-HOMEPAGE=http://zbar.sourceforge.net/
-IUSE=gtk imagemagick java jpeg python qt4 static-libs test +threads v4l X xv elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) qt4? ( dev-qt/qtcore:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-qt/qtgui:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( X python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=5daca9521b8c2ce18ed42c8bfa3057df
diff --git a/metadata/md5-cache/media-gfx/zbar-0.10_p20121015-r3 b/metadata/md5-cache/media-gfx/zbar-0.10_p20121015-r3
new file mode 100644
index 000000000000..a5721cd33e19
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/zbar-0.10_p20121015-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+DEPEND=gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) X? ( x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jdk-1.4 test? ( dev-java/junit:4 dev-java/hamcrest-core:1.3 ) ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-arch/unzip sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Library and tools for reading barcodes from images or video
+EAPI=6
+HOMEPAGE=http://zbar.sourceforge.net/
+IUSE=gtk imagemagick java jpeg python static-libs test +threads v4l X xv elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 test
+KEYWORDS=amd64 ~arm x86
+LICENSE=LGPL-2.1
+RDEPEND=gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) X? ( x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( X python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=e53243490532cfe75ced4f01e48733ba
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index f478bbf25e74..6124f437100e 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/atlas-c++-0.6.3 b/metadata/md5-cache/media-libs/atlas-c++-0.6.3
deleted file mode 100644
index 045f3b6b751e..000000000000
--- a/metadata/md5-cache/media-libs/atlas-c++-0.6.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Atlas protocol, used in role playing games at worldforge
-EAPI=5
-HOMEPAGE=http://www.worldforge.org/dev/eng/libraries/atlas_cpp
-IUSE=doc
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://sourceforge/worldforge/Atlas-C++-0.6.3.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=36c4a05d18369d7d7960cb62f84740eb
diff --git a/metadata/md5-cache/media-libs/freetype-2.9.1-r1 b/metadata/md5-cache/media-libs/freetype-2.9.1-r1
index 5066cff27639..cfcfa023b7dc 100644
--- a/metadata/md5-cache/media-libs/freetype-2.9.1-r1
+++ b/metadata/md5-cache/media-libs/freetype-2.9.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A high-quality and portable font engine
 EAPI=6
 HOMEPAGE=https://www.freetype.org/
 IUSE=X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=|| ( FTL GPL-2+ )
 PDEPEND=infinality? ( media-libs/fontconfig-infinality )
 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(-)?] 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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[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(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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/libXau-1.0.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(-)?] >=x11-libs/libXdmcp-1.1.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(-)?] ) )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.9.1.tar.bz2 mirror://nongnu/freetype/freetype-2.9.1.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.9.1.tar.bz2 mirror://nongnu/freetype/ft2demos-2.9.1.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.9.1.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.9.1.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=99e37a90a17240a9109e6cdc591dcecb
+_md5_=c42819b657f288b0439a60025494d1c7
diff --git a/metadata/md5-cache/media-libs/freetype-2.9.1-r2 b/metadata/md5-cache/media-libs/freetype-2.9.1-r2
new file mode 100644
index 000000000000..5066cff27639
--- /dev/null
+++ b/metadata/md5-cache/media-libs/freetype-2.9.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[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(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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/libXau-1.0.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(-)?] >=x11-libs/libXdmcp-1.1.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(-)?] ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422
+DESCRIPTION=A high-quality and portable font engine
+EAPI=6
+HOMEPAGE=https://www.freetype.org/
+IUSE=X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=|| ( FTL GPL-2+ )
+PDEPEND=infinality? ( media-libs/fontconfig-infinality )
+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(-)?] 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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[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(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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/libXau-1.0.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(-)?] >=x11-libs/libXdmcp-1.1.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(-)?] ) )
+RESTRICT=!bindist? ( bindist )
+SLOT=2
+SRC_URI=mirror://sourceforge/freetype/freetype-2.9.1.tar.bz2 mirror://nongnu/freetype/freetype-2.9.1.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.9.1.tar.bz2 mirror://nongnu/freetype/ft2demos-2.9.1.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.9.1.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.9.1.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=99e37a90a17240a9109e6cdc591dcecb
diff --git a/metadata/md5-cache/media-libs/jasper-2.0.14 b/metadata/md5-cache/media-libs/jasper-2.0.14
index 8735e2f44466..b3f74a8b7d6e 100644
--- a/metadata/md5-cache/media-libs/jasper-2.0.14
+++ b/metadata/md5-cache/media-libs/jasper-2.0.14
@@ -4,10 +4,10 @@ DESCRIPTION=Implementation of the codec specified in the JPEG-2000 Part-1 standa
 EAPI=6
 HOMEPAGE=https://www.ece.uvic.ca/~mdadams/jasper/
 IUSE=doc jpeg opengl 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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=JasPer2.0
 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(-)?] ) opengl? ( >=virtual/opengl-7.0-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(-)?] >=media-libs/freeglut-2.8.1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/4
 SRC_URI=https://github.com/mdadams/jasper/archive/version-2.0.14.tar.gz -> jasper-2.0.14.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f15272aa47a9e2d75e372f1d4aa417a
+_md5_=616855fdeddac9bf2721d44a3dd590bf
diff --git a/metadata/md5-cache/media-libs/libffado-2.4.0 b/metadata/md5-cache/media-libs/libffado-2.4.0
index e1573d043506..939fc7a543cb 100644
--- a/metadata/md5-cache/media-libs/libffado-2.4.0
+++ b/metadata/md5-cache/media-libs/libffado-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_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=http://www.ffado.org/files/libffado-2.4.0.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182
 _md5_=45b7d5f4194bfdc141478d241f7677fa
diff --git a/metadata/md5-cache/media-libs/libmp3splt-0.9.2-r1 b/metadata/md5-cache/media-libs/libmp3splt-0.9.2-r1
index 980ec52ce335..4ec877f0ed64 100644
--- a/metadata/md5-cache/media-libs/libmp3splt-0.9.2-r1
+++ b/metadata/md5-cache/media-libs/libmp3splt-0.9.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=a library for mp3splt to split mp3 and ogg files without decoding
 EAPI=5
 HOMEPAGE=http://mp3splt.sourceforge.net
 IUSE=doc flac pcre
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag flac? ( >=media-libs/flac-1.2.1 ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/libmp3splt-0.9.2.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=04fac84d3cf74504428a249fe882dd8d
+_md5_=ddb8b16449798727be4af38450b40ead
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.34 b/metadata/md5-cache/media-libs/libpng-1.6.34
index 827ecb7ebf97..7e111ee7143a 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.34
+++ b/metadata/md5-cache/media-libs/libpng-1.6.34
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng cpu_flags_x86_sse neon static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=libpng
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.34.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.34-apng.patch.gz )
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=86b3e4873d1670c4d7291d19e271eb5e
+_md5_=c898c29f4bf42595847b2d942ad37a3b
diff --git a/metadata/md5-cache/media-libs/varconf-0.6.6 b/metadata/md5-cache/media-libs/varconf-0.6.6
deleted file mode 100644
index d8aa5d01d2fa..000000000000
--- a/metadata/md5-cache/media-libs/varconf-0.6.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-libs/libsigc++-2.0 virtual/pkgconfig
-DESCRIPTION=A configuration system designed for the STAGE server
-EAPI=0
-HOMEPAGE=http://www.worldforge.org/dev/eng/libraries/varconf
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/libsigc++-2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/worldforge/varconf-0.6.6.tar.bz2
-_md5_=7b74405a5733a0a4065045e6e532f8c1
diff --git a/metadata/md5-cache/media-libs/varconf-0.6.7 b/metadata/md5-cache/media-libs/varconf-0.6.7
deleted file mode 100644
index 30ad2da78f04..000000000000
--- a/metadata/md5-cache/media-libs/varconf-0.6.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-libs/libsigc++-2.0 virtual/pkgconfig
-DESCRIPTION=A configuration system designed for the STAGE server
-EAPI=0
-HOMEPAGE=http://www.worldforge.org/dev/eng/libraries/varconf
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/libsigc++-2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/worldforge/varconf-0.6.7.tar.bz2
-_md5_=9ea69df826ee663b3ef494c08e685059
diff --git a/metadata/md5-cache/media-libs/varconf-0.6.7-r1 b/metadata/md5-cache/media-libs/varconf-0.6.7-r1
deleted file mode 100644
index a26064d4fc19..000000000000
--- a/metadata/md5-cache/media-libs/varconf-0.6.7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/libsigc++-2.0 virtual/pkgconfig
-DESCRIPTION=A configuration system designed for the STAGE server
-EAPI=5
-HOMEPAGE=http://www.worldforge.org/dev/eng/libraries/varconf
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/libsigc++-2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/worldforge/varconf-0.6.7.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=28288f801b43657907aa0df4f29e8cb7
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.8 b/metadata/md5-cache/media-libs/xine-lib-1.2.8
deleted file mode 100644
index 35edaefc50d0..000000000000
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( 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 ) 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 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-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 !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 )
-REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
-SLOT=1
-SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.8.tar.xz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56d4aaeab51f41e0b21188e64b1d0d24
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.9 b/metadata/md5-cache/media-libs/xine-lib-1.2.9
deleted file mode 100644
index 4d1097feccf6..000000000000
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-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	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2ac7bee174d2872cb1eee897a74b43b7
diff --git a/metadata/md5-cache/media-libs/zimg-2.5 b/metadata/md5-cache/media-libs/zimg-2.5
index a710e4b0a268..ba840bcd0fd4 100644
--- a/metadata/md5-cache/media-libs/zimg-2.5
+++ b/metadata/md5-cache/media-libs/zimg-2.5
@@ -4,9 +4,9 @@ DESCRIPTION=Scaling, colorspace conversion, and dithering library
 EAPI=5
 HOMEPAGE=https://github.com/sekrit-twc/zimg
 IUSE=static-libs cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=https://github.com/sekrit-twc/zimg/archive/release-2.5.tar.gz -> zimg-2.5.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2980821a970532bcd431aa5a0b5a08e7
+_md5_=fb91c27d224f001b09d21725ca9aee17
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 9434d5e76cb1..dae586375dc3 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/vdr-epgsearch-1.0.0-r1 b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0-r1
deleted file mode 100644
index cdccf4d96abf..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm preinst prepare setup unpack
-DEPEND=>=media-video/vdr-1.3.45 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: Searchtimer and replacement of the VDR program menu
-EAPI=5
-HOMEPAGE=http://winni.vdr-developer.org/epgsearch
-IUSE=pcre tre l10n_de
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.3.45 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-REQUIRED_USE=pcre? ( !tre ) tre? ( !pcre )
-SLOT=0
-SRC_URI=http://winni.vdr-developer.org/epgsearch/downloads/vdr-epgsearch-1.0.0.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
-_md5_=dc62e068699f30e43e41fea6190514c9
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 81ee824cef17..9bc1d7273a26 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/gpredict-1.3-r1 b/metadata/md5-cache/media-radio/gpredict-1.3-r1
deleted file mode 100644
index 465859b4bb56..000000000000
--- a/metadata/md5-cache/media-radio/gpredict-1.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:2 x11-libs/goocanvas:0 net-misc/curl dev-util/intltool virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Real-time satellite tracking and orbit prediction application
-EAPI=5
-HOMEPAGE=http://gpredict.oz9aec.net
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:2 x11-libs/goocanvas:0 net-misc/curl
-SLOT=0
-SRC_URI=mirror://sourceforge/gpredict/gpredict-1.3.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=44a299a4c174ce2ca9be93fef6234c56
diff --git a/metadata/md5-cache/media-radio/gpredict-1.3-r2 b/metadata/md5-cache/media-radio/gpredict-1.3-r2
deleted file mode 100644
index 3d854191ba75..000000000000
--- a/metadata/md5-cache/media-radio/gpredict-1.3-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:2 x11-libs/goocanvas:0 net-misc/curl dev-util/intltool virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Real-time satellite tracking and orbit prediction application
-EAPI=5
-HOMEPAGE=http://gpredict.oz9aec.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:2 x11-libs/goocanvas:0 net-misc/curl
-SLOT=0
-SRC_URI=mirror://sourceforge/gpredict/gpredict-1.3.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=92af7e369abc6c59548f6a5cb243b9ac
diff --git a/metadata/md5-cache/media-radio/gpredict-2.0 b/metadata/md5-cache/media-radio/gpredict-2.0
deleted file mode 100644
index a1874c95180a..000000000000
--- a/metadata/md5-cache/media-radio/gpredict-2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 x11-libs/goocanvas:2.0 net-misc/curl dev-util/intltool virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=Real-time satellite tracking and orbit prediction application
-EAPI=6
-HOMEPAGE=http://gpredict.oz9aec.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 x11-libs/goocanvas:2.0 net-misc/curl
-SLOT=0
-SRC_URI=mirror://sourceforge/gpredict/gpredict-2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=070cac5f9528246c3087edc0388355ba
diff --git a/metadata/md5-cache/media-radio/gpredict-2.2 b/metadata/md5-cache/media-radio/gpredict-2.2
index 7f0075e5775c..76239cabdfa0 100644
--- a/metadata/md5-cache/media-radio/gpredict-2.2
+++ b/metadata/md5-cache/media-radio/gpredict-2.2
@@ -3,9 +3,9 @@ DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 x11-libs/goocan
 DESCRIPTION=Real-time satellite tracking and orbit prediction application
 EAPI=6
 HOMEPAGE=http://gpredict.oz9aec.net
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 x11-libs/goocanvas:2.0 net-misc/curl
 SLOT=0
 SRC_URI=mirror://sourceforge/gpredict/gpredict-2.2.tar.bz2
-_md5_=3cc09044e83af5d21e079aea97409648
+_md5_=093ccd6a608ef4762c0e6be08158f024
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 4e65d9e5016a..cff9d523adec 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/ardour-2.8.16-r1 b/metadata/md5-cache/media-sound/ardour-2.8.16-r1
index 03530368e04a..5ab85c120fa2 100644
--- a/metadata/md5-cache/media-sound/ardour-2.8.16-r1
+++ b/metadata/md5-cache/media-sound/ardour-2.8.16-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/aubio media-libs/liblo sci-libs/fftw:3.0 media-libs/freetype:2 >=dev-libs/glib-2.10.1:2 dev-cpp/glibmm:2 >=x11-libs/gtk+-2.8.1:2 >=dev-libs/libxml2-2.6:2 >=media-libs/libsndfile-1.0.18 >=media-libs/libsamplerate-0.1 >=media-libs/rubberband-1.6.0 >=media-libs/libsoundtouch-1.6.0 media-libs/flac media-libs/raptor:2 >=media-libs/liblrdf-0.4.0-r20 virtual/jack >=gnome-base/libgnomecanvas-2 media-libs/vamp-plugin-sdk dev-libs/libxslt dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 media-libs/alsa-lib x11-libs/pango x11-libs/cairo media-libs/libart_lgpl virtual/libusb:0 dev-libs/boost curl? ( net-misc/curl ) lv2? ( >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/suil )
 SLOT=2
 SRC_URI=mirror://gentoo/ardour-2.8.16.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=02eef9ae70af5db90d00b06ef9fd340c
diff --git a/metadata/md5-cache/media-sound/klick-0.12.2-r1 b/metadata/md5-cache/media-sound/klick-0.12.2-r1
index ff6968c5eec8..4ee5c46a7036 100644
--- a/metadata/md5-cache/media-sound/klick-0.12.2-r1
+++ b/metadata/md5-cache/media-sound/klick-0.12.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost media-libs/libsamplerate media-libs/libsndfile virtual/jack osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband )
 SLOT=0
 SRC_URI=http://das.nasophon.de/download/klick-0.12.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=995d6cc169176b5147dff1efe78f4298
diff --git a/metadata/md5-cache/media-sound/mixxx-2.0.0-r4 b/metadata/md5-cache/media-sound/mixxx-2.0.0-r4
deleted file mode 100644
index b25e9398cada..000000000000
--- a/metadata/md5-cache/media-sound/mixxx-2.0.0-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-db/sqlite dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= ) virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 dev-util/scons
-DESCRIPTION=Advanced Digital DJ tool based on Qt
-EAPI=6
-HOMEPAGE=https://www.mixxx.org/
-IUSE=aac debug doc ffmpeg hid mp3 mp4 shout wavpack
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-db/sqlite dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= )
-SLOT=0
-SRC_URI=https://downloads.mixxx.org/mixxx-2.0.0/mixxx-2.0.0-src.tar.gz https://github.com/mixxxdj/mixxx/commit/51d95ba58d99309f439cb7e2d1285cfb33aa0f63.patch -> mixxx-2.0.0-ffmpeg30.patch https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772afdfb79cbc3c.patch -> mixxx-2.0.0-ffmpeg31.patch
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=595f2f467a637fed589ae9fd586f49d4
diff --git a/metadata/md5-cache/media-sound/mixxx-2.0.0-r5 b/metadata/md5-cache/media-sound/mixxx-2.0.0-r5
new file mode 100644
index 000000000000..762e94df32a2
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mixxx-2.0.0-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-db/sqlite dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= ) virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 dev-util/scons
+DESCRIPTION=Advanced Digital DJ tool based on Qt
+EAPI=6
+HOMEPAGE=https://www.mixxx.org/
+IUSE=aac debug doc ffmpeg hid mp3 mp4 opus shout wavpack
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= )
+SLOT=0
+SRC_URI=https://downloads.mixxx.org/mixxx-2.0.0/mixxx-2.0.0-src.tar.gz https://github.com/mixxxdj/mixxx/commit/51d95ba58d99309f439cb7e2d1285cfb33aa0f63.patch -> mixxx-2.0.0-ffmpeg30.patch https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772afdfb79cbc3c.patch -> mixxx-2.0.0-ffmpeg31.patch
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0c6f7c16007b3061f2d76b4a9d1debd9
diff --git a/metadata/md5-cache/media-sound/mixxx-2.1.0 b/metadata/md5-cache/media-sound/mixxx-2.1.0
new file mode 100644
index 000000000000..833c8d448090
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mixxx-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= ) virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 dev-util/scons
+DESCRIPTION=Advanced Digital DJ tool based on Qt
+EAPI=6
+HOMEPAGE=https://www.mixxx.org/
+IUSE=aac doc ffmpeg hid mp3 mp4 opus shout wavpack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= )
+SLOT=0
+SRC_URI=https://github.com/mixxxdj/mixxx/archive/release-2.1.0.tar.gz -> mixxx-2.1.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9d47f16666e8d5e6974a71c42b1c7554
diff --git a/metadata/md5-cache/media-sound/mixxx-9999 b/metadata/md5-cache/media-sound/mixxx-9999
new file mode 100644
index 000000000000..d90f374cdeaa
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mixxx-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= ) virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 dev-util/scons >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Advanced Digital DJ tool based on Qt
+EAPI=6
+HOMEPAGE=https://www.mixxx.org/
+IUSE=aac doc ffmpeg hid mp3 mp4 opus shout wavpack
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= )
+SLOT=0
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=754f16cfc69a39dedca4dacb4ea9fb19
diff --git a/metadata/md5-cache/media-sound/mp3gain-1.6.1 b/metadata/md5-cache/media-sound/mp3gain-1.6.1
index b119dc6be5c9..d125a9459f9c 100644
--- a/metadata/md5-cache/media-sound/mp3gain-1.6.1
+++ b/metadata/md5-cache/media-sound/mp3gain-1.6.1
@@ -3,10 +3,10 @@ DEPEND=app-arch/unzip media-sound/mpg123
 DESCRIPTION=A program to analyze and adjust MP3 files to same volume
 EAPI=6
 HOMEPAGE=http://mp3gain.sourceforge.net/
-KEYWORDS=alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=app-arch/unzip media-sound/mpg123
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3gain/mp3gain-1_6_1-src.zip
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=c4172d6dc689179e57f969c8214adf6c
+_md5_=3385d783b64432d9792add97a7595cdf
diff --git a/metadata/md5-cache/media-sound/mpg123-1.25.6 b/metadata/md5-cache/media-sound/mpg123-1.25.6
index 339738b534db..3f20a7bc0980 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.25.6
+++ b/metadata/md5-cache/media-sound/mpg123-1.25.6
@@ -4,10 +4,10 @@ DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
 EAPI=6
 HOMEPAGE=https://www.mpg123.org/
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=https://www.mpg123.org/download/mpg123-1.25.6.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c74f8dadcf52d00eac1f137c1224935a
+_md5_=ad746265606d618ed2b71267609321b1
diff --git a/metadata/md5-cache/media-sound/teamspeak-server-bin-3.1.2 b/metadata/md5-cache/media-sound/teamspeak-server-bin-3.1.2
deleted file mode 100644
index f4ffda352aa7..000000000000
--- a/metadata/md5-cache/media-sound/teamspeak-server-bin-3.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=virtual/pkgconfig
-DESCRIPTION=TeamSpeak is software for quality voice communication via the Internet
-EAPI=6
-HOMEPAGE=https://www.teamspeak.com/
-IUSE=doc tsdns
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 teamspeak3
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/3.1.2/teamspeak3-server_linux_amd64-3.1.2.tar.bz2 ) x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/3.1.2/teamspeak3-server_linux_x86-3.1.2.tar.bz2 )
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b28061bef9bd9cfcf51a3b7ca8acf68a
diff --git a/metadata/md5-cache/media-sound/teamspeak-server-bin-3.1.3 b/metadata/md5-cache/media-sound/teamspeak-server-bin-3.1.3
new file mode 100644
index 000000000000..e26e3ba6c92e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/teamspeak-server-bin-3.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst setup unpack
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A server software for hosting quality voice communication via the internet
+EAPI=6
+HOMEPAGE=https://www.teamspeak.com/
+IUSE=doc mysql tsdns
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1 teamspeak3
+RDEPEND=mysql? ( <dev-libs/openssl-1.1:0= sys-libs/zlib:= )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/3.1.3/teamspeak3-server_linux_amd64-3.1.3.tar.bz2 ) x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/3.1.3/teamspeak3-server_linux_x86-3.1.3.tar.bz2 )
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=96fc11cb02860ac171cc892511a061ba
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 0e500cb5d329..8553c04d44ce 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/ffmpeg2theora-0.30 b/metadata/md5-cache/media-video/ffmpeg2theora-0.30
index ca7784806178..64f9c85c49c2 100644
--- a/metadata/md5-cache/media-video/ffmpeg2theora-0.30
+++ b/metadata/md5-cache/media-video/ffmpeg2theora-0.30
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!libav? ( media-video/ffmpeg:0=[postproc] ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] kate? ( >=media-libs/libkate-0.3.7 )
 SLOT=0
 SRC_URI=http://www.v2v.cc/~j/ffmpeg2theora/downloads/ffmpeg2theora-0.30.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5af9ff992bf86722abee7b5bf2ea8e58
diff --git a/metadata/md5-cache/media-video/gpac-0.7.1 b/metadata/md5-cache/media-video/gpac-0.7.1
index 139abc54da7c..69508f37fbd5 100644
--- a/metadata/md5-cache/media-video/gpac-0.7.1
+++ b/metadata/md5-cache/media-video/gpac-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=a52? ( media-libs/a52dec ) aac? ( >=media-libs/faad2-2.0 ) alsa? ( media-libs/alsa-lib ) dvb? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) mad? ( >=media-libs/libmad-0.15.1b ) opengl? ( virtual/opengl media-libs/freeglut virtual/glu ) >=media-libs/libogg-1.1 png? ( >=media-libs/libpng-1.4:0= ) vorbis? ( >=media-libs/libvorbis-1.1 ) theora? ( media-libs/libtheora ) truetype? ( >=media-libs/freetype-2.1.4:2 ) xml? ( >=dev-libs/libxml2-2.6.0:2 ) xvid? ( >=media-libs/xvid-1.0.1 ) sdl? ( media-libs/libsdl ) jpeg2k? ( media-libs/openjpeg:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXv x11-libs/libXext )
+DEPEND=a52? ( media-libs/a52dec ) aac? ( >=media-libs/faad2-2.0 ) alsa? ( media-libs/alsa-lib ) dvb? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) mad? ( >=media-libs/libmad-0.15.1b ) opengl? ( virtual/opengl media-libs/freeglut virtual/glu ) >=media-libs/libogg-1.1 png? ( >=media-libs/libpng-1.4:0= ) vorbis? ( >=media-libs/libvorbis-1.1 ) theora? ( media-libs/libtheora ) truetype? ( >=media-libs/freetype-2.1.4:2 ) xml? ( >=dev-libs/libxml2-2.6.0:2 ) xvid? ( >=media-libs/xvid-1.0.1 ) sdl? ( media-libs/libsdl ) jpeg2k? ( media-libs/openjpeg:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXv x11-libs/libXext ) virtual/pkgconfig
 DESCRIPTION=Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C
 EAPI=6
 HOMEPAGE=https://gpac.wp.imt.fr/
@@ -10,4 +10,4 @@ RDEPEND=a52? ( media-libs/a52dec ) aac? ( >=media-libs/faad2-2.0 ) alsa? ( media
 SLOT=0/7
 SRC_URI=https://github.com/gpac/gpac/archive/v0.7.1.tar.gz -> gpac-0.7.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0af14860db8bba010a1bf26017e98720
+_md5_=8cc1d273de0eb78c77d0de31ae3d8208
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-23.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-23.0.0
new file mode 100644
index 000000000000..e842233564ad
--- /dev/null
+++ b/metadata/md5-cache/media-video/mkvtoolnix-23.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend test
+DEPEND=>=dev-libs/boost-1.49.0:= >=dev-libs/libebml-1.3.5:= dev-libs/jsoncpp:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.8:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark ) dev-ruby/rake sys-devel/gettext virtual/pkgconfig dev-libs/libxslt app-text/docbook-xsl-stylesheets app-text/po4a test? ( dev-cpp/gtest ) >=sys-apps/sed-4
+DESCRIPTION=Tools to create, alter, and inspect Matroska files
+EAPI=6
+HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
+IUSE=debug pch test qt5
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/boost-1.49.0:= >=dev-libs/libebml-1.3.5:= dev-libs/jsoncpp:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.8:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark )
+SLOT=0
+SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-23.0.0.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bd6fe09dc6126d2534d7636199a2c34d
diff --git a/metadata/md5-cache/media-video/mplayer-1.3.0-r3 b/metadata/md5-cache/media-video/mplayer-1.3.0-r3
index a29143fbd149..c54747e7530b 100644
--- a/metadata/md5-cache/media-video/mplayer-1.3.0-r3
+++ b/metadata/md5-cache/media-video/mplayer-1.3.0-r3
@@ -12,4 +12,4 @@ RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=mirror://mplayer/releases/MPlayer-1.3.0.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aa3afd6f64e7226a0718e511c77628f4
+_md5_=6d3931e2ef3c42e92ddfdc69c5406285
diff --git a/metadata/md5-cache/media-video/mplayer-1.3.0-r5 b/metadata/md5-cache/media-video/mplayer-1.3.0-r5
index 7cb604925483..bd94d9aa73e1 100644
--- a/metadata/md5-cache/media-video/mplayer-1.3.0-r5
+++ b/metadata/md5-cache/media-video/mplayer-1.3.0-r5
@@ -12,4 +12,4 @@ RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=mirror://mplayer/releases/MPlayer-1.3.0.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b843152659837a4f8f14abb689eac4c6
+_md5_=d0de4ed0eef2bf76c9d40760689ea3ec
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index defc16cb5f30..5d283e2ecb6c 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!libav? ( >=media-video/ffmpeg-4.0:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( ~media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=dev-libs/wayland-protocols-1.12 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils virtual/pkgconfig doc? ( dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) v4l? ( virtual/os-headers ) zsh-completion? ( dev-lang/perl ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DEPEND=!libav? ( >=media-video/ffmpeg-4.0:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( ~media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=dev-libs/wayland-protocols-1.12 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils virtual/pkgconfig cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 ) doc? ( dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) v4l? ( virtual/os-headers ) zsh-completion? ( dev-lang/perl ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Media player based on MPlayer and mplayer2
 EAPI=6
 HOMEPAGE=https://mpv.io/
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav opengl ) egl? ( |
 SLOT=0
 SRC_URI=https://waf.io/waf-1.9.8
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48e10f2009101d7f9c97bf02d50b6f15
+_md5_=841720758d8a09151c93bd86d8e5a8bb
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 9da8c9e6b2f6..15593a7b06ad 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/arping-2.17 b/metadata/md5-cache/net-analyzer/arping-2.17
index e1f91f317d49..271f46c83a62 100644
--- a/metadata/md5-cache/net-analyzer/arping-2.17
+++ b/metadata/md5-cache/net-analyzer/arping-2.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)]
 SLOT=2
 SRC_URI=http://www.habets.pp.se/synscan/files/arping-2.17.tar.gz
-_eclasses_=fcaps	29a56915716950cd3d23630cede80d68
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16
 _md5_=7d3f87e747155bcb5c24cc98e7f7aebf
diff --git a/metadata/md5-cache/net-analyzer/arping-2.18 b/metadata/md5-cache/net-analyzer/arping-2.18
index a006dcf0109a..8fe9e47fa190 100644
--- a/metadata/md5-cache/net-analyzer/arping-2.18
+++ b/metadata/md5-cache/net-analyzer/arping-2.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)]
 SLOT=2
 SRC_URI=http://www.habets.pp.se/synscan/files/arping-2.18.tar.gz
-_eclasses_=fcaps	29a56915716950cd3d23630cede80d68
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16
 _md5_=2e684d5a60d73864d809e9749bea4603
diff --git a/metadata/md5-cache/net-analyzer/arping-2.19 b/metadata/md5-cache/net-analyzer/arping-2.19
index 1b58dfa92cb9..15e1ef193c81 100644
--- a/metadata/md5-cache/net-analyzer/arping-2.19
+++ b/metadata/md5-cache/net-analyzer/arping-2.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)]
 SLOT=2
 SRC_URI=http://www.habets.pp.se/synscan/files/arping-2.19.tar.gz
-_eclasses_=fcaps	29a56915716950cd3d23630cede80d68
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16
 _md5_=2e684d5a60d73864d809e9749bea4603
diff --git a/metadata/md5-cache/net-analyzer/arping-9999 b/metadata/md5-cache/net-analyzer/arping-9999
index afcbc8736ab8..e9fe7e9bb3d4 100644
--- a/metadata/md5-cache/net-analyzer/arping-9999
+++ b/metadata/md5-cache/net-analyzer/arping-9999
@@ -7,5 +7,5 @@ IUSE=+filecaps
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)]
 SLOT=2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	fcaps	29a56915716950cd3d23630cede80d68	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=b14bff6095a70737bd4ea5d68ae9192b
diff --git a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1 b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1
index d6ab10220155..a0b1080cb5c5 100644
--- a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1
+++ b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap gtk? ( x11-libs/gtk+:2 virtual/jpeg:0 media-libs/giflib:= media-libs/libpng:= ) mp3? ( media-sound/mpg123 )
 SLOT=0
 SRC_URI=mirror://github/rbu/driftnet/driftnet-0.1.6_p20090401.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=505e027fe97690df7f57beec9055788c
diff --git a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r2 b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r2
index 398b41849dbe..7026333c08cc 100644
--- a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r2
+++ b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu
 EAPI=6
 HOMEPAGE=https://www.monitoring-plugins.org/
 IUSE=gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl
-KEYWORDS=amd64 ~arm ~arm64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 sparc x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) !net-analyzer/nagios-plugins
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.monitoring-plugins.org/download/monitoring-plugins-2.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b403b6fd2ce48e9e520aa36d631742d
+_md5_=9052d19236b382c8922219f19ce34d9e
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.87 b/metadata/md5-cache/net-analyzer/mtr-0.87
index ea31e74ab9b5..8033a76e6a88 100644
--- a/metadata/md5-cache/net-analyzer/mtr-0.87
+++ b/metadata/md5-cache/net-analyzer/mtr-0.87
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=ftp://ftp.bitwizard.nl/mtr/mtr-0.87.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e4176f754fc06d78ddfc04f225de15a3
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.92-r1 b/metadata/md5-cache/net-analyzer/mtr-0.92-r1
index a59fcbe818c9..854f0c81c486 100644
--- a/metadata/md5-cache/net-analyzer/mtr-0.92-r1
+++ b/metadata/md5-cache/net-analyzer/mtr-0.92-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= )
 SLOT=0
 SRC_URI=ftp://ftp.bitwizard.nl/mtr/mtr-0.92.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=024f05dad14c1f8c56c08d9a382dfedc
diff --git a/metadata/md5-cache/net-analyzer/mtr-9999 b/metadata/md5-cache/net-analyzer/mtr-9999
index 7c92ab8e4376..0b66cbcaf0b7 100644
--- a/metadata/md5-cache/net-analyzer/mtr-9999
+++ b/metadata/md5-cache/net-analyzer/mtr-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= )
 SLOT=0
 SRC_URI=mirror://gentoo/gtk-2.0-for-mtr.m4.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b89ca4e7721ed8f2e713606d6cdf1e72
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.3.4 b/metadata/md5-cache/net-analyzer/nagios-core-4.3.4
index dcf070083cc1..4c44a9a4f4c1 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.3.4
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
 EAPI=6
 HOMEPAGE=http://www.nagios.org/
 IUSE=apache2 classicui lighttpd perl +web vim-syntax
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-devel/libtool virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
 REQUIRED_USE=apache2? ( !lighttpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nagios-4.3.4.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=7ae284c7f3089a49e5e30a70b55cb577
+_md5_=8dad6edfcc3ba2002a6ab3f301e4f688
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.10.0 b/metadata/md5-cache/net-analyzer/netdata-1.10.0
index 2850a497c574..1de7316851d7 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.10.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-shells/bash-4:0 || ( net-analyzer/netcat6 net-analyzer/netcat ) ne
 REQUIRED_USE=mysql? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/firehol/netdata/archive/v1.10.0.tar.gz -> netdata-1.10.0.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fcaps	29a56915716950cd3d23630cede80d68	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=6cdfe5c62b11e3a9b394c273f8d1df3b
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.8.0-r1 b/metadata/md5-cache/net-analyzer/netdata-1.8.0-r1
index 6b719dac76e3..27018903ee26 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.8.0-r1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-shells/bash-4:0 || ( net-analyzer/netcat6 net-analyzer/netcat ) ne
 REQUIRED_USE=mysql? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/firehol/netdata/archive/v1.8.0.tar.gz -> netdata-1.8.0.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fcaps	29a56915716950cd3d23630cede80d68	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=7656858e50597e5bb630a1c8b7596043
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.9.0 b/metadata/md5-cache/net-analyzer/netdata-1.9.0
index fb9474ba82ea..9c74ef216732 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.9.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-shells/bash-4:0 || ( net-analyzer/netcat6 net-analyzer/netcat ) ne
 REQUIRED_USE=mysql? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/firehol/netdata/archive/v1.9.0.tar.gz -> netdata-1.9.0.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fcaps	29a56915716950cd3d23630cede80d68	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=73a12b055c5d6ce8dacca0dc179cbdcf
diff --git a/metadata/md5-cache/net-analyzer/netdata-9999 b/metadata/md5-cache/net-analyzer/netdata-9999
index 9edefa95e0ca..4ff492cae71d 100644
--- a/metadata/md5-cache/net-analyzer/netdata-9999
+++ b/metadata/md5-cache/net-analyzer/netdata-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ MIT BSD
 RDEPEND=>=app-shells/bash-4:0 || ( net-analyzer/netcat6 net-analyzer/netcat ) net-analyzer/tcpdump net-analyzer/traceroute net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) 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(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] mysql? ( || ( dev-python/mysqlclient[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mysql-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(-)] ) ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) )
 REQUIRED_USE=mysql? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fcaps	29a56915716950cd3d23630cede80d68	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=73a12b055c5d6ce8dacca0dc179cbdcf
diff --git a/metadata/md5-cache/net-analyzer/suricata-4.0.3 b/metadata/md5-cache/net-analyzer/suricata-4.0.3
index 22cdfddfd3f0..c66ace18eef1 100644
--- a/metadata/md5-cache/net-analyzer/suricata-4.0.3
+++ b/metadata/md5-cache/net-analyzer/suricata-4.0.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( !luajit? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
 EAPI=5
 HOMEPAGE=http://suricata-ids.org/
 IUSE=+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( !luajit? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng
+RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng
 SLOT=0
 SRC_URI=http://www.openinfosecfoundation.org/download/suricata-4.0.3.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2d10cd99eb687e23a37e2bfd2fdc89ec
+_md5_=ce599d7322b036aa71c439d1c8442477
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.4.5 b/metadata/md5-cache/net-analyzer/wireshark-2.4.5
index df4f099270aa..5d6215ffd486 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.4.5
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3
 REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh )
 SLOT=0/2.4.5
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.4.5.tar.xz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2040de22f6c519ffeef9de2111f45548
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.4.6 b/metadata/md5-cache/net-analyzer/wireshark-2.4.6
index c8ffc452f936..f4dc499565ac 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.4.6
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.4.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3
 REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh )
 SLOT=0/2.4.6
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.4.6.tar.xz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aeb978957d66ab8524a6613dbf91e2ff
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.6.0 b/metadata/md5-cache/net-analyzer/wireshark-2.6.0
index 2caf445c44fd..52202e8df4dc 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.6.0
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3
 REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh )
 SLOT=0/2.6.0
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.6.0.tar.xz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=edd6f20a34dee5cb49dc99a5654dbe30
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.6.0-r1 b/metadata/md5-cache/net-analyzer/wireshark-2.6.0-r1
index eadbb4bdaf58..40c3be7e70b5 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.6.0-r1
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) caps? ( sys-libs/libcap ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=media-libs/speex-1.2.0 media-libs/speexdsp 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 )
 SLOT=0/2.6.0
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.6.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=db6d3d4d4568ad9dc436844352283355
diff --git a/metadata/md5-cache/net-analyzer/wireshark-99999999 b/metadata/md5-cache/net-analyzer/wireshark-99999999
index 4f02abf18c4d..48149f37a1bf 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-99999999
+++ b/metadata/md5-cache/net-analyzer/wireshark-99999999
@@ -7,5 +7,5 @@ IUSE=adns androiddump bcg729 +capinfos +caps +captype ciscodump +dftest doc +dum
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) caps? ( sys-libs/libcap ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=media-libs/speex-1.2.0 media-libs/speexdsp 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 )
 SLOT=0/99999999
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bcdc275c4048d99a23047412cad4c90f
diff --git a/metadata/md5-cache/net-analyzer/zmap-1.2.1 b/metadata/md5-cache/net-analyzer/zmap-1.2.1
index 409f65319e59..7ba3c049573c 100644
--- a/metadata/md5-cache/net-analyzer/zmap-1.2.1
+++ b/metadata/md5-cache/net-analyzer/zmap-1.2.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:0 net-libs/libpcap json? ( dev-libs/json-c:= ) redis? ( dev-libs/hiredis )
 SLOT=0
 SRC_URI=https://github.com/zmap/zmap/archive/v1.2.1.tar.gz -> zmap-1.2.1.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=debda5f2a7a1735f1d5da643fb6d9b87
diff --git a/metadata/md5-cache/net-analyzer/zmap-2.1.1 b/metadata/md5-cache/net-analyzer/zmap-2.1.1
index c2d065b0a0b5..e920fd24c8cb 100644
--- a/metadata/md5-cache/net-analyzer/zmap-2.1.1
+++ b/metadata/md5-cache/net-analyzer/zmap-2.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:0 net-libs/libpcap dev-libs/json-c:= mongo? ( dev-db/mongodb ) redis? ( dev-libs/hiredis )
 SLOT=0
 SRC_URI=https://github.com/zmap/zmap/archive/v2.1.1.tar.gz -> zmap-2.1.1.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ad602cac8a88671e76d304be124f5e51
diff --git a/metadata/md5-cache/net-analyzer/zmap-9999 b/metadata/md5-cache/net-analyzer/zmap-9999
index 61822f529e67..a98216cd64fc 100644
--- a/metadata/md5-cache/net-analyzer/zmap-9999
+++ b/metadata/md5-cache/net-analyzer/zmap-9999
@@ -7,5 +7,5 @@ IUSE=mongo redis +filecaps
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:0 net-libs/libpcap dev-libs/json-c:= mongo? ( dev-db/mongo ) redis? ( dev-libs/hiredis )
 SLOT=0
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=956e7faf76b95e75512784b74f90a396
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index b152923e21c9..28e8a84baa69 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.11 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.11
deleted file mode 100644
index 1225de4eb552..000000000000
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
-EAPI=6
-HOMEPAGE=https://github.com/jedisct1/dnscrypt-proxy
-IUSE=systemd +filecaps
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.11.tar.gz -> dnscrypt-proxy-2.0.11.tar.gz
-_eclasses_=fcaps	29a56915716950cd3d23630cede80d68	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=7177323dd84f8d047de58a216008238a
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.12 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.12
new file mode 100644
index 000000000000..0c04b6b02a19
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test
+DEPEND=filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
+EAPI=6
+HOMEPAGE=https://github.com/jedisct1/dnscrypt-proxy
+IUSE=+filecaps
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+SLOT=0
+SRC_URI=https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.12.tar.gz -> dnscrypt-proxy-2.0.12.tar.gz
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=e4517c5e2b113a3e0446fb169dee143f
diff --git a/metadata/md5-cache/net-dns/dnssec-system-tray-2.1 b/metadata/md5-cache/net-dns/dnssec-system-tray-2.1
deleted file mode 100644
index 3354913e4a6c..000000000000
--- a/metadata/md5-cache/net-dns/dnssec-system-tray-2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtcore:4
-DESCRIPTION=display DNSSEC resolver logs in system tray
-EAPI=4
-HOMEPAGE=http://www.dnssec-tools.org
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtcore:4
-SLOT=0
-SRC_URI=http://www.dnssec-tools.org/download/dnssec-system-tray-2.1.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=86f7dc907b95f67505ec9fa237f59153
diff --git a/metadata/md5-cache/net-dns/dnssec-tools-2.1 b/metadata/md5-cache/net-dns/dnssec-tools-2.1
deleted file mode 100644
index 3e64fa0b86c3..000000000000
--- a/metadata/md5-cache/net-dns/dnssec-tools-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-lang/perl dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple virtual/pkgconfig
-DESCRIPTION=tools to ease the deployment of DNSSEC related technologies
-EAPI=4
-HOMEPAGE=http://www.dnssec-tools.org/
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/perl dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple
-SLOT=0
-SRC_URI=http://www.dnssec-tools.org/download/dnssec-tools-2.1.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=372b0dd0d279894c6f0e0e2696eb810e
diff --git a/metadata/md5-cache/net-dns/dnssec-tools-2.2 b/metadata/md5-cache/net-dns/dnssec-tools-2.2
deleted file mode 100644
index 65843da24e3b..000000000000
--- a/metadata/md5-cache/net-dns/dnssec-tools-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-lang/perl dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple virtual/pkgconfig
-DESCRIPTION=tools to ease the deployment of DNSSEC related technologies
-EAPI=4
-HOMEPAGE=http://www.dnssec-tools.org/
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/perl dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple
-SLOT=0
-SRC_URI=http://www.dnssec-tools.org/download/dnssec-tools-2.2.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=372b0dd0d279894c6f0e0e2696eb810e
diff --git a/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1 b/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1
new file mode 100644
index 000000000000..0e3ec12d8ec5
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-lang/perl dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple virtual/pkgconfig
+DESCRIPTION=Tools to ease the deployment of DNSSEC related technologies
+EAPI=6
+HOMEPAGE=https://www.dnssec-tools.org/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/perl dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple
+SLOT=0
+SRC_URI=https://www.dnssec-tools.org/download/dnssec-tools-2.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=5427ef4eaba16dc08f092c3489b4b1b1
diff --git a/metadata/md5-cache/net-dns/getdns-1.4.1-r2 b/metadata/md5-cache/net-dns/getdns-1.4.1-r2
index 93b89672f0ed..bcc90664a686 100644
--- a/metadata/md5-cache/net-dns/getdns-1.4.1-r2
+++ b/metadata/md5-cache/net-dns/getdns-1.4.1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libbsd:= dev-libs/libyaml:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) idn? ( net-dns/libidn2:= ) unbound? ( >=net-dns/unbound-1.4.16:= ) libevent? ( dev-libs/libevent:= ) libev? ( dev-libs/libev:= ) libuv? ( dev-libs/libuv:= ) stubby? ( sys-libs/libcap:= )
 SLOT=0
 SRC_URI=https://getdnsapi.net/releases/getdns-1-4-1/getdns-1.4.1.tar.gz
-_eclasses_=fcaps	29a56915716950cd3d23630cede80d68	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=e05b0292e61bae60c46253a73c844bef
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index fca88ac95790..dff583489403 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/arptables-0.0.3.4-r2 b/metadata/md5-cache/net-firewall/arptables-0.0.3.4-r2
deleted file mode 100644
index 7458cb803569..000000000000
--- a/metadata/md5-cache/net-firewall/arptables-0.0.3.4-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=set up, maintain, and inspect the tables of ARP rules in the Linux kernel
-EAPI=2
-HOMEPAGE=http://ebtables.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/ebtables/arptables-v0.0.3-4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=af9fe2b51ddc5712ab03102c4367145a
diff --git a/metadata/md5-cache/net-firewall/arptables-0.0.4 b/metadata/md5-cache/net-firewall/arptables-0.0.4
index 5c061b8a5980..bddd140841c5 100644
--- a/metadata/md5-cache/net-firewall/arptables-0.0.4
+++ b/metadata/md5-cache/net-firewall/arptables-0.0.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=set up, maintain, and inspect the tables of ARP rules in the Linux kernel
 EAPI=6
 HOMEPAGE=http://ebtables.sourceforge.net/
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.netfilter.org/pub/arptables/arptables-v0.0.4.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=45c4ac8f23e62a8f2674e70f9def71fc
+_md5_=0fdac8fb37f4954f2ed05bb6223c38a0
diff --git a/metadata/md5-cache/net-firewall/ferm-2.4.1 b/metadata/md5-cache/net-firewall/ferm-2.4.1
index 0c7e0469ae6f..f99274121a4e 100644
--- a/metadata/md5-cache/net-firewall/ferm-2.4.1
+++ b/metadata/md5-cache/net-firewall/ferm-2.4.1
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Command line util for managing firewall rules
 EAPI=6
 HOMEPAGE=http://ferm.foo-projects.org/
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
 RDEPEND=dev-lang/perl:* net-firewall/iptables virtual/perl-File-Spec
 SLOT=0
 SRC_URI=http://ferm.foo-projects.org/download/2.4/ferm-2.4.1.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9b7f5b8360a535afe82c983e60732106
+_md5_=e698dfb83148a9f4b5f087512b7615ba
diff --git a/metadata/md5-cache/net-firewall/nftables-0.8.5 b/metadata/md5-cache/net-firewall/nftables-0.8.5
new file mode 100644
index 000000000000..44d511d588ff
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftables-0.8.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.0:0= >=app-text/docbook2X-0.8.8-r4 doc? ( >=app-text/dblatex-0.3.7 ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
+EAPI=6
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=debug doc +gmp +readline
+KEYWORDS=~amd64 ~arm ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.0:0=
+SLOT=0
+SRC_URI=https://git.netfilter.org/nftables/snapshot/v0.8.5.tar.gz -> nftables-0.8.5.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=53458ec4e7c8319aebabf83f3e659011
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index f7b39382854e..8f594aebe5c3 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/filezilla-3.30.0 b/metadata/md5-cache/net-ftp/filezilla-3.30.0
deleted file mode 100644
index 4ff502b79f76..000000000000
--- a/metadata/md5-cache/net-ftp/filezilla-3.30.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare pretend
-DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.10.0 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.0 >=x11-libs/wxGTK-3.0.3:3.0[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=FTP client with lots of useful features and an intuitive interface
-EAPI=6
-HOMEPAGE=https://filezilla-project.org/
-IUSE=dbus nls test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.10.0 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.0 >=x11-libs/wxGTK-3.0.3:3.0[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
-SLOT=0
-SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.30.0_src.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0c89afe05c05fd295caf2782ca363d62
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.30.0-r300 b/metadata/md5-cache/net-ftp/filezilla-3.30.0-r300
deleted file mode 100644
index 4cae243ce226..000000000000
--- a/metadata/md5-cache/net-ftp/filezilla-3.30.0-r300
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare pretend
-DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.10.0 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.0 >=x11-libs/wxGTK-3.0.3:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=FTP client with lots of useful features and an intuitive interface
-EAPI=6
-HOMEPAGE=https://filezilla-project.org/
-IUSE=dbus nls test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.10.0 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.0 >=x11-libs/wxGTK-3.0.3:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
-SLOT=0
-SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.30.0_src.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e97f46d8052b2f9adf6f67b6bc8a600d
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.33.0 b/metadata/md5-cache/net-ftp/filezilla-3.33.0
new file mode 100644
index 000000000000..a7362056e663
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/filezilla-3.33.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare pretend
+DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.12.2 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.15 >=x11-libs/wxGTK-3.0.4:3.0[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( >=dev-util/cppunit-1.13.0 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=FTP client with lots of useful features and an intuitive interface
+EAPI=6
+HOMEPAGE=https://filezilla-project.org/
+IUSE=dbus nls test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.12.2 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.15 >=x11-libs/wxGTK-3.0.4:3.0[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
+SLOT=0
+SRC_URI=https://dl2.cdn.filezilla-project.org/client/FileZilla_3.33.0_src.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dbf15ae64776bdfc507366636579b413
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.33.0-r300 b/metadata/md5-cache/net-ftp/filezilla-3.33.0-r300
new file mode 100644
index 000000000000..9d6bc6a4518d
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/filezilla-3.33.0-r300
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare pretend
+DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.12.2 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.15 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( >=dev-util/cppunit-1.13.0 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=FTP client with lots of useful features and an intuitive interface
+EAPI=6
+HOMEPAGE=https://filezilla-project.org/
+IUSE=dbus nls test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.12.2 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.15 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
+SLOT=0
+SRC_URI=https://dl2.cdn.filezilla-project.org/client/FileZilla_3.33.0_src.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dd0716ee5fc7a411ba2648c781d79838
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 77f885fcf723..5ad13a6441a3 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	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0c798c0e8e340d4036ce9fe34b1ec4a0
+_md5_=751c86e7923d8a3393656868ee3528b1
diff --git a/metadata/md5-cache/net-ftp/oftpd-0.3.7-r10 b/metadata/md5-cache/net-ftp/oftpd-0.3.7-r10
index 7f6b9c1cd1e9..44817ddbb89b 100644
--- a/metadata/md5-cache/net-ftp/oftpd-0.3.7-r10
+++ b/metadata/md5-cache/net-ftp/oftpd-0.3.7-r10
@@ -4,10 +4,10 @@ DESCRIPTION=Secure, small, anonymous only ftpd
 EAPI=4
 HOMEPAGE=http://www.time-travellers.org/oftpd
 IUSE=ipv6
-KEYWORDS=amd64 arm ~ppc ppc64 ~sh sparc x86
+KEYWORDS=amd64 arm ppc ppc64 sh sparc x86
 LICENSE=BSD-2
 RDEPEND=net-ftp/ftpbase
 SLOT=0
 SRC_URI=http://www.time-travellers.org/oftpd/oftpd-0.3.7.tar.gz ftp://ftp.deepspace6.net/pub/ds6/sources/oftpd/oftpd-0.3.6-ipv6rel2.patch.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9645ac58447f11daf1c804bd672e1db
+_md5_=f7a094d90d92450e14a484fd506dd505
diff --git a/metadata/md5-cache/net-ftp/oftpd-0.3.7-r7 b/metadata/md5-cache/net-ftp/oftpd-0.3.7-r7
deleted file mode 100644
index 94b2991e94f4..000000000000
--- a/metadata/md5-cache/net-ftp/oftpd-0.3.7-r7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-ftp/ftpbase >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Secure, small, anonymous only ftpd
-EAPI=2
-HOMEPAGE=http://www.time-travellers.org/oftpd
-IUSE=ipv6
-KEYWORDS=amd64 arm ppc ppc64 sh sparc x86
-LICENSE=BSD-2
-RDEPEND=net-ftp/ftpbase
-SLOT=0
-SRC_URI=http://www.time-travellers.org/oftpd/oftpd-0.3.7.tar.gz ftp://ftp.deepspace6.net/pub/ds6/sources/oftpd/oftpd-0.3.6-ipv6rel2.patch.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=97614e6645999fa1c94ebf2986435ab6
diff --git a/metadata/md5-cache/net-ftp/uftpd-2.4 b/metadata/md5-cache/net-ftp/uftpd-2.4
index a21dd570892d..4c821ca7cfe0 100644
--- a/metadata/md5-cache/net-ftp/uftpd-2.4
+++ b/metadata/md5-cache/net-ftp/uftpd-2.4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DEPEND=dev-libs/libite dev-libs/libuev !!net-misc/uftp
-DESCRIPTION=The no nonsense TFTP/FTP server.
+DESCRIPTION=The no nonsense TFTP/FTP server
 EAPI=6
 HOMEPAGE=https://github.com/troglobit/uftpd
 KEYWORDS=~amd64 ~x86
@@ -8,4 +8,4 @@ LICENSE=MIT
 RDEPEND=dev-libs/libite dev-libs/libuev !!net-misc/uftp
 SLOT=0
 SRC_URI=https://github.com/troglobit/uftpd/releases/download/v2.4/uftpd-2.4.tar.xz
-_md5_=9b1a6488a3a94bfc79e7a6dcf6c7986a
+_md5_=b9b16326a817af1858eb18763d5a328d
diff --git a/metadata/md5-cache/net-ftp/uftpd-2.4-r1 b/metadata/md5-cache/net-ftp/uftpd-2.4-r1
index b9a70d23f9fe..24d0833b031b 100644
--- a/metadata/md5-cache/net-ftp/uftpd-2.4-r1
+++ b/metadata/md5-cache/net-ftp/uftpd-2.4-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DEPEND=dev-libs/libite dev-libs/libuev
-DESCRIPTION=The no nonsense TFTP/FTP server.
+DESCRIPTION=The no nonsense TFTP/FTP server
 EAPI=6
 HOMEPAGE=https://github.com/troglobit/uftpd
 KEYWORDS=~amd64 ~x86
@@ -8,4 +8,4 @@ LICENSE=MIT
 RDEPEND=dev-libs/libite dev-libs/libuev
 SLOT=0
 SRC_URI=https://github.com/troglobit/uftpd/releases/download/v2.4/uftpd-2.4.tar.xz
-_md5_=c867d6c177866e588f9e865df29d8d00
+_md5_=bece8f1ea9231b949d204543b30b1afa
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index b30eed88e3ba..f24403b68524 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/kadu-4.3-r2 b/metadata/md5-cache/net-im/kadu-4.3-r2
index add6ded98ef8..77adb0655539 100644
--- a/metadata/md5-cache/net-im/kadu-4.3-r2
+++ b/metadata/md5-cache/net-im/kadu-4.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger
 EAPI=6
 HOMEPAGE=http://www.kadu.net
 IUSE=+gadu mpd otr sdk speech spell xmpp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-arch/libarchive-2.6[lzma] >=dev-libs/injeqt-1.1.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.12.2[threads] ) mpd? ( media-libs/libmpdclient ) otr? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/libotr-4.1.0 ) spell? ( app-text/enchant ) xmpp? ( net-dns/libidn >=net-libs/qxmpp-0.9.3-r1 sys-libs/zlib ) speech? ( app-accessibility/powiedz )
 REQUIRED_USE=|| ( gadu xmpp )
 SLOT=0
 SRC_URI=http://download.kadu.im/stable/kadu-4.3.tar.bz2
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6816bdd7a2496e75fda58fc18a329d6f
+_md5_=e40f68bf0aab9208a7a43a915ea0319d
diff --git a/metadata/md5-cache/net-im/libcommuni-3.5.0 b/metadata/md5-cache/net-im/libcommuni-3.5.0
new file mode 100644
index 000000000000..20a113121e82
--- /dev/null
+++ b/metadata/md5-cache/net-im/libcommuni-3.5.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5 dev-qt/qtdeclarative:5 uchardet? ( app-i18n/uchardet ) !uchardet? ( dev-libs/icu:= )
+DESCRIPTION=A cross-platform IRC framework written with Qt
+EAPI=6
+HOMEPAGE=http://communi.github.io/
+IUSE=qml test +uchardet
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 uchardet? ( app-i18n/uchardet ) !uchardet? ( dev-libs/icu:= )
+REQUIRED_USE=test? ( uchardet )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/communi/libcommuni/archive/v3.5.0.tar.gz -> libcommuni-3.5.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=97ad18a335885c7493d2301bab880086
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.10.0 b/metadata/md5-cache/net-im/signal-desktop-bin-1.10.0
new file mode 100644
index 000000000000..55d3e7d39e4c
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
+EAPI=6
+HOMEPAGE=https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop
+IUSE=ayatana
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=gnome-base/gconf:2 dev-libs/nss x11-libs/libXScrnSaver x11-libs/libXtst net-print/cups ayatana? ( dev-libs/libappindicator:3 )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.10.0_amd64.deb
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=955d9176b4ca2dbfb3d2bca5acade75d
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.8.0 b/metadata/md5-cache/net-im/signal-desktop-bin-1.8.0
deleted file mode 100644
index 966759253148..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
-EAPI=6
-HOMEPAGE=https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop
-IUSE=ayatana
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=gnome-base/gconf:2 dev-libs/nss x11-libs/libXScrnSaver x11-libs/libXtst net-print/cups ayatana? ( dev-libs/libappindicator:3 )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.8.0_amd64.deb
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=955d9176b4ca2dbfb3d2bca5acade75d
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index ff51c899ef4c..5b91ebd22083 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/gnutls-3.5.18 b/metadata/md5-cache/net-libs/gnutls-3.5.18
index 821a1251cdfd..e07642a9855b 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.5.18
+++ b/metadata/md5-cache/net-libs/gnutls-3.5.18
@@ -4,11 +4,11 @@ DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=6
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.5/gnutls-3.5.18.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=566e04d4710e44c88f613691486b67f6
+_md5_=d4935036f72b464312ef1f2a7c29713e
diff --git a/metadata/md5-cache/net-libs/libgadu-1.12.2 b/metadata/md5-cache/net-libs/libgadu-1.12.2
index 7e72981348c4..40c1906e0fbf 100644
--- a/metadata/md5-cache/net-libs/libgadu-1.12.2
+++ b/metadata/md5-cache/net-libs/libgadu-1.12.2
@@ -4,11 +4,11 @@ DESCRIPTION=This library implements the client side of the Gadu-Gadu protocol
 EAPI=5
 HOMEPAGE=http://toxygen.net/libgadu/
 IUSE=doc gnutls ssl static-libs test threads
-KEYWORDS=~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/protobuf-c-1.0.0 sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls:0 ) !gnutls? ( >=dev-libs/openssl-0.9.6m:0 ) ) !=net-im/kadu-0.6.0.2 !=net-im/kadu-0.6.0.1
 REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/wojtekka/libgadu/archive/1.12.2.tar.gz -> libgadu-1.12.2.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=931a5dceeee8391b2fd2204f7506a2ca
+_md5_=ba3816121ca324d346dfa1c45171303c
diff --git a/metadata/md5-cache/net-libs/libnfsidmap-0.24 b/metadata/md5-cache/net-libs/libnfsidmap-0.24
deleted file mode 100644
index 5cef8adea741..000000000000
--- a/metadata/md5-cache/net-libs/libnfsidmap-0.24
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=NFSv4 ID <-> name mapping library
-EAPI=2
-HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/
-IUSE=ldap static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=BSD
-RDEPEND=ldap? ( net-nds/openldap ) !<net-fs/nfs-utils-1.2.2 !net-fs/idmapd
-SLOT=0
-SRC_URI=http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-0.24.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dfebd11cb6f3796cd55d5d3a638591de
diff --git a/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1 b/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1
index 21b80c647938..0a4d3ccdbae3 100644
--- a/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1
+++ b/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1
@@ -4,10 +4,10 @@ DESCRIPTION=NFSv4 ID <-> name mapping library
 EAPI=4
 HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/
 IUSE=ldap static-libs
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=BSD
 RDEPEND=ldap? ( net-nds/openldap ) !<net-fs/nfs-utils-1.2.2 !net-fs/idmapd
 SLOT=0
 SRC_URI=http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-0.25.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f77f6d779f941b1d300f50fac0bbe307
+_md5_=93d6002f669d9785e7876f64e15d6cb1
diff --git a/metadata/md5-cache/net-libs/liboping-1.10.0 b/metadata/md5-cache/net-libs/liboping-1.10.0
index 2e99609637e7..20fac7564258 100644
--- a/metadata/md5-cache/net-libs/liboping-1.10.0
+++ b/metadata/md5-cache/net-libs/liboping-1.10.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses:0= ) dev-lang/perl:=
 SLOT=0/0.3
 SRC_URI=https://noping.cc/files/liboping-1.10.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	fcaps	29a56915716950cd3d23630cede80d68	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=a72171de81d85a46c651df280cd93860
diff --git a/metadata/md5-cache/net-libs/liboping-1.9.0 b/metadata/md5-cache/net-libs/liboping-1.9.0
index 261a38e20c0e..886096a4a7e7 100644
--- a/metadata/md5-cache/net-libs/liboping-1.9.0
+++ b/metadata/md5-cache/net-libs/liboping-1.9.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses:0= ) dev-lang/perl:=
 SLOT=0/0.2
 SRC_URI=https://noping.cc/files/liboping-1.9.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	fcaps	29a56915716950cd3d23630cede80d68	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=29439386170ba6931901c0c0f169fe6f
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.32.0 b/metadata/md5-cache/net-libs/nghttp2-1.32.0
new file mode 100644
index 000000000000..41836166c971
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.32.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=6
+HOMEPAGE=https://nghttp2.org/
+IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+LICENSE=MIT
+RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/1.14
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.32.0/nghttp2-1.32.0.tar.xz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=be873e92a3c62161a7637db3d6b7245a
diff --git a/metadata/md5-cache/net-libs/nodejs-10.0.0 b/metadata/md5-cache/net-libs/nodejs-10.0.0
index 9f228803645f..0a9bc20a8bd1 100644
--- a/metadata/md5-cache/net-libs/nodejs-10.0.0
+++ b/metadata/md5-cache/net-libs/nodejs-10.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0: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 )
+DEPEND=>=dev-libs/libuv-1.20.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0: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.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
+RDEPEND=>=dev-libs/libuv-1.20.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v10.0.0/node-v10.0.0.tar.xz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c93a3e56c8567a2cf58b709d5ebc2537
+_md5_=8652a45e3a155f63258d8500351b810c
diff --git a/metadata/md5-cache/net-libs/nodejs-10.1.0 b/metadata/md5-cache/net-libs/nodejs-10.1.0
new file mode 100644
index 000000000000..691814e37daa
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-10.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0: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.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v10.1.0/node-v10.1.0.tar.xz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c93a3e56c8567a2cf58b709d5ebc2537
diff --git a/metadata/md5-cache/net-libs/nodejs-6.14.2 b/metadata/md5-cache/net-libs/nodejs-6.14.2
new file mode 100644
index 000000000000..089c62a368e2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-6.14.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.7.0:= sys-libs/zlib icu? ( >=dev-libs/icu-58.2:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=6
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.7.0:= sys-libs/zlib icu? ( >=dev-libs/icu-58.2:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v6.14.2/node-v6.14.2.tar.xz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=692e3d8e47e3d973cc0392e45f81ee2d
diff --git a/metadata/md5-cache/net-libs/serf-1.3.8 b/metadata/md5-cache/net-libs/serf-1.3.8
index 710d617b1abf..d9e825040d27 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.8
+++ b/metadata/md5-cache/net-libs/serf-1.3.8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 )
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.8.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=02e5162f8bdd69dcec7e54587d733998
diff --git a/metadata/md5-cache/net-libs/serf-1.3.8-r1 b/metadata/md5-cache/net-libs/serf-1.3.8-r1
index d7989d983a8f..f5204f236231 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.8-r1
+++ b/metadata/md5-cache/net-libs/serf-1.3.8-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0= kerberos? ( virtual/krb5 )
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.8.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e9e8b289c95653860dc09113ef8dd7f3
diff --git a/metadata/md5-cache/net-libs/serf-1.3.9 b/metadata/md5-cache/net-libs/serf-1.3.9
index d19c14d8665d..73ad5762f596 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.9
+++ b/metadata/md5-cache/net-libs/serf-1.3.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0= kerberos? ( virtual/krb5 )
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.9.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf28f114d32889d99cf51b6ec993d1c4
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 1a2a336b4673..12b3de3e8cbe 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/ipsorcery-2.0.9-r1 b/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r1
deleted file mode 100644
index cb139bc2f9c4..000000000000
--- a/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packets
-EAPI=2
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/ipsorc-2.0.9.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=ea74009c4de51349f4f4feff411c3dc3
diff --git a/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r2 b/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r2
index 7839634bc9f6..9a281bc94329 100644
--- a/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r2
+++ b/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packet
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
 IUSE=gtk
-KEYWORDS=amd64 ~ppc ~sparc x86
+KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=gtk? ( dev-libs/glib:2= x11-libs/gtk+:2= )
 SLOT=0
 SRC_URI=mirror://gentoo/ipsorc-2.0.9.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=942a14d818a66eb6895fe2ae76f77f34
+_md5_=02dea6f2efaf1f412e815d76908eac6a
diff --git a/metadata/md5-cache/net-misc/iputils-20121221-r1 b/metadata/md5-cache/net-misc/iputils-20121221-r1
index b8f4cc39173a..bbf0e6ee31c8 100644
--- a/metadata/md5-cache/net-misc/iputils-20121221-r1
+++ b/metadata/md5-cache/net-misc/iputils-20121221-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+ rdisc
 RDEPEND=!net-misc/rarpd !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gnutls? ( net-libs/gnutls[openssl(+)] net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) ) )
 SLOT=0
 SRC_URI=http://www.skbuff.net/iputils/iputils-s20121221.tar.bz2 mirror://gentoo/iputils-s20121221-manpages.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=70e6527f5aa96473a86955754f7d713c
diff --git a/metadata/md5-cache/net-misc/iputils-20121221-r2 b/metadata/md5-cache/net-misc/iputils-20121221-r2
index 515abe714b60..867d814a1df3 100644
--- a/metadata/md5-cache/net-misc/iputils-20121221-r2
+++ b/metadata/md5-cache/net-misc/iputils-20121221-r2
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+ rdisc
 RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gnutls? ( net-libs/gnutls[openssl(+)] net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl ) ) ) ) )
 SLOT=0
 SRC_URI=http://www.skbuff.net/iputils/iputils-s20121221.tar.bz2 mirror://gentoo/iputils-s20121221-manpages.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b5c6c0fa4ac46a81764d77b8d532da5a
diff --git a/metadata/md5-cache/net-misc/iputils-20151218 b/metadata/md5-cache/net-misc/iputils-20151218
index 038516ef4845..0124d39242ed 100644
--- a/metadata/md5-cache/net-misc/iputils-20151218
+++ b/metadata/md5-cache/net-misc/iputils-20151218
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+ rdisc
 RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) ) )
 SLOT=0
 SRC_URI=http://www.skbuff.net/iputils/iputils-s20151218.tar.bz2 https://dev.gentoo.org/~polynomial-c/iputils-s20151218-manpages.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5a78a9d7e09248ff250390b18af30eb0
diff --git a/metadata/md5-cache/net-misc/iputils-20160308 b/metadata/md5-cache/net-misc/iputils-20160308
index 55116af312f0..9d3057cb25d6 100644
--- a/metadata/md5-cache/net-misc/iputils-20160308
+++ b/metadata/md5-cache/net-misc/iputils-20160308
@@ -10,5 +10,5 @@ RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !n
 REQUIRED_USE=ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/s20160308.tar.gz -> iputils-20160308.tar.gz https://dev.gentoo.org/~polynomial-c/iputils-s20160308-manpages.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=78442766e0e1e567f63668c228afb37a
diff --git a/metadata/md5-cache/net-misc/iputils-20161105 b/metadata/md5-cache/net-misc/iputils-20161105
index 484f25728869..ef05820c1532 100644
--- a/metadata/md5-cache/net-misc/iputils-20161105
+++ b/metadata/md5-cache/net-misc/iputils-20161105
@@ -10,5 +10,5 @@ RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !n
 REQUIRED_USE=ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/s20161105.tar.gz -> iputils-20161105.tar.gz https://dev.gentoo.org/~polynomial-c/iputils-s20161105-manpages.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1a727a03e8a01f4317658ca9760a183a
diff --git a/metadata/md5-cache/net-misc/iputils-20171016_pre b/metadata/md5-cache/net-misc/iputils-20171016_pre
index 2b4ffc4365b8..2adfa5d78195 100644
--- a/metadata/md5-cache/net-misc/iputils-20171016_pre
+++ b/metadata/md5-cache/net-misc/iputils-20171016_pre
@@ -10,5 +10,5 @@ RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !n
 REQUIRED_USE=ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.tar.gz -> iputils-20171016_pre.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20171016_pre.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99dde6978246436a330fc8c523c96674
diff --git a/metadata/md5-cache/net-misc/iputils-20171016_pre-r1 b/metadata/md5-cache/net-misc/iputils-20171016_pre-r1
index d020925409e1..1a956ed81f10 100644
--- a/metadata/md5-cache/net-misc/iputils-20171016_pre-r1
+++ b/metadata/md5-cache/net-misc/iputils-20171016_pre-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+ rdisc
 RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( nettle? ( dev-libs/nettle ) !nettle? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) ) ) ) )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.tar.gz -> iputils-20171016_pre.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20171016_pre.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9bc9bb8ce5a04cbc6e266507b9969d51
diff --git a/metadata/md5-cache/net-misc/iputils-99999999 b/metadata/md5-cache/net-misc/iputils-99999999
index 25adda15ddfe..c11c94286e6b 100644
--- a/metadata/md5-cache/net-misc/iputils-99999999
+++ b/metadata/md5-cache/net-misc/iputils-99999999
@@ -7,5 +7,5 @@ IUSE=+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECU
 LICENSE=BSD GPL-2+ rdisc
 RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2 ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( nettle? ( dev-libs/nettle ) !nettle? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) ) ) ) )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9d618f48866a3d38b1a245f9b0241832
diff --git a/metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r2 b/metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r2
deleted file mode 100644
index 436c3ac8d608..000000000000
--- a/metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=!<=net-misc/netkit-bootpd-0.17-r2
-DESCRIPTION=Netkit - bootparamd
-EAPI=0
-HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
-KEYWORDS=~hppa ~mips ppc sparc x86
-LICENSE=BSD
-RDEPEND=!<=net-misc/netkit-bootpd-0.17-r2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/n/netkit-bootparamd/netkit-bootparamd_0.17.orig.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b890ca7491b01049e268255c2b636a6d
diff --git a/metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r3 b/metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r3
deleted file mode 100644
index 2c6c41f9d72f..000000000000
--- a/metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!<=net-misc/netkit-bootpd-0.17-r2
-DESCRIPTION=Netkit - bootparamd
-EAPI=2
-HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
-KEYWORDS=amd64 ~hppa ~mips ppc sparc x86
-LICENSE=BSD
-RDEPEND=!<=net-misc/netkit-bootpd-0.17-r2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/n/netkit-bootparamd/netkit-bootparamd_0.17.orig.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e1ad5f58917f53c319245aa6ac09f45
diff --git a/metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r4 b/metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r4
index c4e91eafe685..8d42d1206e9d 100644
--- a/metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r4
+++ b/metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Netkit - bootparamd
 EAPI=6
 HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
 IUSE=+libtirpc
-KEYWORDS=amd64 ~hppa ~mips ~ppc sparc x86
+KEYWORDS=amd64 ~hppa ~mips ppc sparc x86
 LICENSE=BSD
 RDEPEND=!<=net-misc/netkit-bootpd-0.17-r2 libtirpc? ( net-libs/rpcsvc-proto net-libs/libtirpc ) !libtirpc? ( sys-libs/glibc[rpc(-)] )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/n/netkit-bootparamd/netkit-bootparamd_0.17.orig.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=19357fb566474b1d41745793313258e5
+_md5_=ac9fb6c5f194f523b36ba030bc3aa19a
diff --git a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r10 b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r10
index 97c43c368822..68e0d0388a5a 100644
--- a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r10
+++ b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.2 pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rsh-0.17.tar.gz mirror://gentoo/rexec-1.5.tar.gz mirror://gentoo/netkit-rsh-0.17-patches-3.tar.lzma
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2b1dd010cc6ad7bd1ad4a4b5b1b9daaf
diff --git a/metadata/md5-cache/net-misc/openssh-7.7_p1-r3 b/metadata/md5-cache/net-misc/openssh-7.7_p1-r3
new file mode 100644
index 000000000000..f37e65abc19a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-7.7_p1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare pretend test
+DEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3:=[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Port of OpenBSD's free SSH release
+EAPI=6
+HOMEPAGE=https://www.openssh.com/
+IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD GPL-2
+RDEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
+REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.7p1.tar.gz https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-patches-1.0.tar.xz sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-sctp-1.0.patch.xz ) hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-hpnssh14v15-gentoo1.patch.xz ) X509? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-x509-11.3.1.patch.xz )
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ab71f15b67e47b783c94a779b3483800
diff --git a/metadata/md5-cache/net-misc/ubridge-0.9.14 b/metadata/md5-cache/net-misc/ubridge-0.9.14
index a55ee49202e4..309a9ec2201a 100644
--- a/metadata/md5-cache/net-misc/ubridge-0.9.14
+++ b/metadata/md5-cache/net-misc/ubridge-0.9.14
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-libs/libpcap dev-libs/iniparser:=
 SLOT=0
 SRC_URI=https://github.com/GNS3/ubridge/archive/v0.9.14.tar.gz -> ubridge-0.9.14.tar.gz
-_eclasses_=fcaps	29a56915716950cd3d23630cede80d68	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=b596dca5f3d15740f5068a56878def76
diff --git a/metadata/md5-cache/net-misc/wget-1.19.5 b/metadata/md5-cache/net-misc/wget-1.19.5
index d9887a4f5f72..fe5f9cbe567a 100644
--- a/metadata/md5-cache/net-misc/wget-1.19.5
+++ b/metadata/md5-cache/net-misc/wget-1.19.5
@@ -4,11 +4,11 @@ DESCRIPTION=Network utility to retrieve files from the WWW
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/wget/
 IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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=GPL-3
 RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.19.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e46d55845cd63fa61b1e2e24b1648076
+_md5_=710233b1fca7f205aa762fd58a70d411
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.04.25 b/metadata/md5-cache/net-misc/youtube-dl-2018.04.25
deleted file mode 100644
index f86dad2496ff..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2018.04.25
+++ /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 ~arm64 ~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.04.25/youtube-dl-2018.04.25.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=31e1b5039d70c0829fe39d5512ab45ea
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.05.09 b/metadata/md5-cache/net-misc/youtube-dl-2018.05.09
new file mode 100644
index 000000000000..567265e6003f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.05.09
@@ -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 ~arm64 ~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.05.09/youtube-dl-2018.05.09.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=31e1b5039d70c0829fe39d5512ab45ea
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 170398af34c5..6a9fe12727bc 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/ldapvi-1.7-r1 b/metadata/md5-cache/net-nds/ldapvi-1.7-r1
deleted file mode 100644
index b1f641b3924d..000000000000
--- a/metadata/md5-cache/net-nds/ldapvi-1.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses >=net-nds/openldap-2.2 dev-libs/popt >=dev-libs/glib-2 sys-libs/readline ssl? ( dev-libs/openssl ) virtual/pkgconfig
-DESCRIPTION=Manage LDAP entries with a text editor
-EAPI=2
-HOMEPAGE=http://www.lichteblau.com/ldapvi/
-IUSE=ssl
-KEYWORDS=amd64 hppa ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses >=net-nds/openldap-2.2 dev-libs/popt >=dev-libs/glib-2 sys-libs/readline ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=http://www.lichteblau.com/download/ldapvi-1.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b11d392121adc0b610d08455c8c4c55e
diff --git a/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214 b/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214
index 435e2f5a192d..388e496d91a1 100644
--- a/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214
+++ b/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214
@@ -4,10 +4,10 @@ DESCRIPTION=Manage LDAP entries with a text editor
 EAPI=5
 HOMEPAGE=http://www.lichteblau.com/ldapvi/
 IUSE=gnutls sasl
-KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
+KEYWORDS=amd64 ~hppa ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0 net-nds/openldap dev-libs/popt dev-libs/glib:2 sys-libs/readline gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) sasl? ( dev-libs/cyrus-sasl:2 )
 SLOT=0
 SRC_URI=mirror://gentoo/ldapvi-1.7_p20101214.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=bf27d0eaf1568a0ca5a0206b51b166e1
+_md5_=17bf63352c9b00a98518d599bbbde3b7
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index a05f004ed6fa..b2572f0056eb 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
index b92a77200872..4bdf034e46d3 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
@@ -4,11 +4,11 @@ DESCRIPTION=An end-user Qt GUI for the Bitcoin crypto-currency
 EAPI=6
 HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
 IUSE=+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode +http test +tor upnp +wallet zeromq l10n_sl l10n_en-US l10n_ar l10n_ru l10n_pt-BR l10n_uk l10n_hu l10n_es-UY l10n_nl l10n_nb l10n_ky l10n_gl l10n_es-CO l10n_de l10n_be l10n_hr l10n_es-CL l10n_et l10n_es l10n_hu l10n_el l10n_de l10n_da l10n_zh-TW l10n_pam l10n_ko l10n_pt-PT l10n_ne l10n_ka l10n_es-VE l10n_eo l10n_eu l10n_en l10n_zh-CN l10n_lv l10n_el l10n_sr-Latn l10n_ru l10n_ms l10n_af l10n_nl l10n_et l10n_ro l10n_id l10n_en-AU l10n_es-MX l10n_he l10n_nb l10n_am l10n_th l10n_af l10n_si l10n_fr l10n_cy l10n_bg l10n_sk l10n_kk l10n_ur-PK l10n_fr l10n_fa l10n_es-419 l10n_ca l10n_pt l10n_ms l10n_ja l10n_la l10n_zh-HK l10n_zh l10n_sn l10n_bn l10n_hi l10n_cs l10n_vi l10n_fr-CA l10n_en-GB l10n_tr l10n_my l10n_id l10n_lt l10n_es-DO l10n_ku l10n_es-AR l10n_tr l10n_fa l10n_th l10n_ro l10n_bs l10n_bg l10n_sq l10n_is l10n_ca l10n_te l10n_mn l10n_it l10n_ca-valencia l10n_vi l10n_sr l10n_fi l10n_pl l10n_uz-Cyrl l10n_ta l10n_sv l10n_pl l10n_mk l10n_ja l10n_it l10n_he l10n_es-ES
-KEYWORDS=amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) libevent? ( dev-libs/libevent ) >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)] upnp? ( >=net-libs/miniupnpc-1.9.20150916 ) wallet? ( sys-libs/db:4.8[cxx] ) zeromq? ( net-libs/zeromq ) virtual/bitcoin-leveldb bip70? ( dev-libs/protobuf ) qrcode? ( media-gfx/qrencode ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 )
 REQUIRED_USE=http? ( libevent ) tor? ( libevent ) libevent? ( http tor ) l10n_am? ( knots ) l10n_pt? ( knots ) l10n_sn? ( knots ) l10n_is? ( knots )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz https://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=68d3f90708b93015120095e6196abdae
+_md5_=8da278a7a74cd03a061cef5150e95bd9
diff --git a/metadata/md5-cache/net-p2p/mktorrent-1.1 b/metadata/md5-cache/net-p2p/mktorrent-1.1
deleted file mode 100644
index 875396b0edfb..000000000000
--- a/metadata/md5-cache/net-p2p/mktorrent-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=Simple command line utility to create BitTorrent metainfo files
-EAPI=6
-HOMEPAGE=https://github.com/Rudde/mktorrent
-IUSE=threads +ssl debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=https://github.com/Rudde/mktorrent/archive/v1.1.tar.gz -> mktorrent-1.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=c2bf66ae8e5b97fae6ff8b3814de2a41
diff --git a/metadata/md5-cache/net-p2p/mktorrent-1.1_p20180502 b/metadata/md5-cache/net-p2p/mktorrent-1.1_p20180502
new file mode 100644
index 000000000000..b51023530707
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/mktorrent-1.1_p20180502
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=Simple command line utility to create BitTorrent metainfo files
+EAPI=6
+HOMEPAGE=https://github.com/Rudde/mktorrent
+IUSE=threads +ssl debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=https://github.com/Rudde/mktorrent/archive/96090fb175f3cef17ae2499e98c2868363106927.tar.gz -> mktorrent-96090fb175f3cef17ae2499e98c2868363106927.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=9cc3fe19c64612653209719f81184390
diff --git a/metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2_p20180326 b/metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2_p20180326
deleted file mode 100644
index 66669ad010f9..000000000000
--- a/metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2_p20180326
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare 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_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=Reference client for Bitmessage: a P2P communications protocol
-EAPI=6
-HOMEPAGE=https://bitmessage.org
-IUSE=debug libnotify libressl ncurses opencl qrcode sound python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-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_python2_7(-)] || ( dev-python/msgpack[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/u-msgpack[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/PyQt5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/QtPy[gui,pyqt5,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] debug? ( dev-python/python-prctl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libnotify? ( dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/notify2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-themes/hicolor-icon-theme ) !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ncurses? ( dev-python/pythondialog[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opencl? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopencl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qrcode? ( dev-python/qrcode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sound? ( || ( dev-python/gst-python:1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-sound/gst123 media-libs/gst-plugins-base:1.0 media-sound/mpg123 media-sound/alsa-utils ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/g1itch/PyBitmessage/archive/b210fd84d1053d3a57a888ecc8444f580d4b0651.tar.gz -> pybitmessage-0.6.3.2_p20180326.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce9805ab4cba063bab81346a012f28cf
diff --git a/metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2_p20180326-r1 b/metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2_p20180326-r1
new file mode 100644
index 000000000000..3cb6c14106b8
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2_p20180326-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
+DESCRIPTION=Reference client for Bitmessage: a P2P communications protocol
+EAPI=6
+HOMEPAGE=https://bitmessage.org
+IUSE=debug libnotify libressl ncurses opencl qrcode sound python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+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_python2_7(-)] || ( dev-python/msgpack[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/u-msgpack[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/PyQt5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/QtPy-1.3.1[gui,pyqt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] debug? ( dev-python/python-prctl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libnotify? ( dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/notify2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-themes/hicolor-icon-theme ) !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ncurses? ( dev-python/pythondialog[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opencl? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopencl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qrcode? ( dev-python/qrcode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sound? ( || ( dev-python/gst-python:1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-sound/gst123 media-libs/gst-plugins-base:1.0 media-sound/mpg123 media-sound/alsa-utils ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/g1itch/PyBitmessage/archive/b210fd84d1053d3a57a888ecc8444f580d4b0651.tar.gz -> pybitmessage-0.6.3.2_p20180326.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a0d69eef60a19db9f246d074c3fc5337
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 7ddf94c37b95..4f8571953991 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-2.2.7 b/metadata/md5-cache/net-print/cups-2.2.7
index e95118315f66..de445aa4f284 100644
--- a/metadata/md5-cache/net-print/cups-2.2.7
+++ b/metadata/md5-cache/net-print/cups-2.2.7
@@ -4,7 +4,7 @@ DESCRIPTION=The Common Unix Printing System
 EAPI=6
 HOMEPAGE=https://www.cups.org/
 IUSE=acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf abi_x86_32 abi_x86_64 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 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
 LICENSE=GPL-2
 PDEPEND=>=net-print/cups-filters-1.0.43
 RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) 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(+)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,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 ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sec-policy/selinux-cups ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/cups/releases/download/v2.2.7/cups-2.2.7-source.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36f03af5eecb81cf0c81479ff80773c2
+_md5_=42625efaa3edfba09d1678e956652c48
diff --git a/metadata/md5-cache/net-print/gutenprint-5.2.13 b/metadata/md5-cache/net-print/gutenprint-5.2.13
index 8dcabb773be9..f5ab15bd22c7 100644
--- a/metadata/md5-cache/net-print/gutenprint-5.2.13
+++ b/metadata/md5-cache/net-print/gutenprint-5.2.13
@@ -4,7 +4,7 @@ DESCRIPTION=Ghostscript and cups printer drivers
 EAPI=6
 HOMEPAGE=http://gutenprint.sourceforge.net
 IUSE=cups gimp gtk nls readline ppds static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl readline? ( sys-libs/readline:0= ) cups? ( >=net-print/cups-1.1.14 ) gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl )
 REQUIRED_USE=gimp? ( gtk )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/gimp-print/gutenprint-5.2.13.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=b4500053e942f57617bb0b9cb745ecc8
+_md5_=9982750e201882fa634f72bdf8fdd957
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 4bdf5599f63b..3e5a958b228a 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.1 b/metadata/md5-cache/net-vpn/freelan-2.1
index d1a2d74482d0..dc6f3e31c2cf 100644
--- a/metadata/md5-cache/net-vpn/freelan-2.1
+++ b/metadata/md5-cache/net-vpn/freelan-2.1
@@ -9,5 +9,5 @@ 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	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=88329cf1b0de5f0e0ee719095dc3d617
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.5.0 b/metadata/md5-cache/net-vpn/openfortivpn-1.5.0
deleted file mode 100644
index 8cd80728b192..000000000000
--- a/metadata/md5-cache/net-vpn/openfortivpn-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-dialup/ppp >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A Fortinet compatible VPN client
-EAPI=6
-HOMEPAGE=https://github.com/adrienverge/openfortivpn
-IUSE=libressl
-KEYWORDS=~amd64
-LICENSE=GPL-3-with-openssl-exception openssl
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-dialup/ppp
-SLOT=0
-SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.5.0.tar.gz -> openfortivpn-1.5.0.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4b149ca11de2420e12dc7e855c7d17bd
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index f45226ed3c48..a3bf344dd0e2 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/gnuradio-3.7.11-r2 b/metadata/md5-cache/net-wireless/gnuradio-3.7.11-r2
deleted file mode 100644
index c1079f04a508..000000000000
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.11-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm 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-lang/orc-0.4.12 dev-libs/boost: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(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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/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(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(+)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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(+)] 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/wxpython:3.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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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 doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
-EAPI=6
-HOMEPAGE=http://gnuradio.org/
-IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost: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(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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/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(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(+)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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(+)] 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/wxpython:3.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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
-REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
-RESTRICT=test
-SLOT=0/3.7.11
-SRC_URI=http://gnuradio.org/releases/gnuradio/gnuradio-3.7.11.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5aec717eb4628183089d2b6c5726c501
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.11-r3 b/metadata/md5-cache/net-wireless/gnuradio-3.7.11-r3
new file mode 100644
index 000000000000..86af7940b195
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.11-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm 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-lang/orc-0.4.12 dev-libs/boost: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(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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/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(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(-)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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(+)] 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/wxpython:3.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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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 doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
+EAPI=6
+HOMEPAGE=http://gnuradio.org/
+IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost: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(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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/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(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(-)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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(+)] 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/wxpython:3.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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
+REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
+RESTRICT=test
+SLOT=0/3.7.11
+SRC_URI=http://gnuradio.org/releases/gnuradio/gnuradio-3.7.11.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=508579cab0d53c8ed08fa718c5d6079c
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.9999 b/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
index f128c8027f36..dfd134137204 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-lang/orc-0.4.12 dev-libs/boost: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(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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/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(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(+)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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(+)] 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/wxpython:3.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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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 doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+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-lang/orc-0.4.12 dev-libs/boost: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(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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/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(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(-)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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(+)] 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/wxpython:3.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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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 doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
 EAPI=6
 HOMEPAGE=http://gnuradio.org/
 IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq python_targets_python2_7
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost: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(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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/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(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(+)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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(+)] 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/wxpython:3.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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
+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-lang/orc-0.4.12 dev-libs/boost: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(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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/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(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(-)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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(+)] 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/wxpython:3.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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
 REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
 SLOT=0/3.7.9999
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c80bab8dfa8d7cfd774c881af9a0f6e9
+_md5_=c79488757169503a07b4baf8d1695cb1
diff --git a/metadata/md5-cache/net-wireless/gnuradio-9999 b/metadata/md5-cache/net-wireless/gnuradio-9999
index d017d4ff8566..f98ff0e70684 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-lang/orc-0.4.12 dev-libs/boost: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(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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/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(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(+)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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(+)] 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/wxpython:3.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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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 doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+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-lang/orc-0.4.12 dev-libs/boost: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(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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/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(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(-)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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(+)] 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/wxpython:3.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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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 doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
 EAPI=6
 HOMEPAGE=http://gnuradio.org/
 IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq python_targets_python2_7
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost: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(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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/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(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(+)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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(+)] 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/wxpython:3.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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
+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-lang/orc-0.4.12 dev-libs/boost: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(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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/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(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(-)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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(+)] 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/wxpython:3.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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
 REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
 SLOT=0/9999
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c80bab8dfa8d7cfd774c881af9a0f6e9
+_md5_=c79488757169503a07b4baf8d1695cb1
diff --git a/metadata/md5-cache/net-wireless/wireless-regdb-20160502 b/metadata/md5-cache/net-wireless/wireless-regdb-20160502
deleted file mode 100644
index 2f7851ff7c2a..000000000000
--- a/metadata/md5-cache/net-wireless/wireless-regdb-20160502
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Binary regulatory database for CRDA
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/developers/Regulatory
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2016.05.02.tar.xz
-_md5_=99945b10048b53e26849eac8f81c8bb2
diff --git a/metadata/md5-cache/net-wireless/wireless-regdb-20160610 b/metadata/md5-cache/net-wireless/wireless-regdb-20160610
deleted file mode 100644
index 1f22a7997e4b..000000000000
--- a/metadata/md5-cache/net-wireless/wireless-regdb-20160610
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Binary regulatory database for CRDA
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/developers/Regulatory
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2016.06.10.tar.xz
-_md5_=99945b10048b53e26849eac8f81c8bb2
diff --git a/metadata/md5-cache/net-wireless/wireless-regdb-20170307 b/metadata/md5-cache/net-wireless/wireless-regdb-20170307
deleted file mode 100644
index c97469bbbe3c..000000000000
--- a/metadata/md5-cache/net-wireless/wireless-regdb-20170307
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Binary regulatory database for CRDA
-EAPI=6
-HOMEPAGE=https://wireless.kernel.org/en/developers/Regulatory
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2017.03.07.tar.xz
-_md5_=e6e28b732e4464a5fb9485731a9b8c08
diff --git a/metadata/md5-cache/net-wireless/wireless-regdb-20180509 b/metadata/md5-cache/net-wireless/wireless-regdb-20180509
new file mode 100644
index 000000000000..cfe0f1ea4b8b
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/wireless-regdb-20180509
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Binary regulatory database for CRDA
+EAPI=6
+HOMEPAGE=https://wireless.kernel.org/en/developers/Regulatory
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86
+LICENSE=ISC
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2018.05.09.tar.xz
+_md5_=8f8820e45d7717c25fef3dc4122d10c5
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index a008c3dd98ab..7f6a38619e2b 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/audio_common-0.2.10 b/metadata/md5-cache/ros-meta/audio_common-0.2.10
deleted file mode 100644
index 9062ef3194b4..000000000000
--- a/metadata/md5-cache/ros-meta/audio_common-0.2.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Common code for working with audio in ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/audio_common
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.10.tar.gz -> audio_common-0.2.10.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74e4e209f1b4fe3d64cdff3f800d43a7
diff --git a/metadata/md5-cache/ros-meta/audio_common-0.2.11 b/metadata/md5-cache/ros-meta/audio_common-0.2.11
deleted file mode 100644
index 40a47423b871..000000000000
--- a/metadata/md5-cache/ros-meta/audio_common-0.2.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Common code for working with audio in ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/audio_common
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.11.tar.gz -> audio_common-0.2.11.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74e4e209f1b4fe3d64cdff3f800d43a7
diff --git a/metadata/md5-cache/ros-meta/audio_common-0.2.12 b/metadata/md5-cache/ros-meta/audio_common-0.2.12
deleted file mode 100644
index 7e2116bbc91c..000000000000
--- a/metadata/md5-cache/ros-meta/audio_common-0.2.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Common code for working with audio in ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/audio_common
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.12.tar.gz -> audio_common-0.2.12.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74e4e209f1b4fe3d64cdff3f800d43a7
diff --git a/metadata/md5-cache/ros-meta/audio_common-0.2.7 b/metadata/md5-cache/ros-meta/audio_common-0.2.7
deleted file mode 100644
index f6aed5cce101..000000000000
--- a/metadata/md5-cache/ros-meta/audio_common-0.2.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Common code for working with audio in ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/audio_common
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.7.tar.gz -> audio_common-0.2.7.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74e4e209f1b4fe3d64cdff3f800d43a7
diff --git a/metadata/md5-cache/ros-meta/audio_common-0.2.8 b/metadata/md5-cache/ros-meta/audio_common-0.2.8
deleted file mode 100644
index d6dfe7a4634d..000000000000
--- a/metadata/md5-cache/ros-meta/audio_common-0.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Common code for working with audio in ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/audio_common
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.8.tar.gz -> audio_common-0.2.8.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74e4e209f1b4fe3d64cdff3f800d43a7
diff --git a/metadata/md5-cache/ros-meta/audio_common-0.2.9 b/metadata/md5-cache/ros-meta/audio_common-0.2.9
deleted file mode 100644
index 0890d6760351..000000000000
--- a/metadata/md5-cache/ros-meta/audio_common-0.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Common code for working with audio in ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/audio_common
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.9.tar.gz -> audio_common-0.2.9.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74e4e209f1b4fe3d64cdff3f800d43a7
diff --git a/metadata/md5-cache/ros-meta/audio_common-0.3.2 b/metadata/md5-cache/ros-meta/audio_common-0.3.2
new file mode 100644
index 000000000000..f7346e3acb86
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/audio_common-0.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Common code for working with audio in ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/audio_common
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.3.2.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=809d417aee1fb635c2dbf1c1471cdbde
diff --git a/metadata/md5-cache/ros-meta/diagnostics-1.9.3 b/metadata/md5-cache/ros-meta/diagnostics-1.9.3
new file mode 100644
index 000000000000..22ffd908edad
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/diagnostics-1.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Packages related to gathering, viewing, and analyzing diagnostics data from robots
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/diagnostics
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator python_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/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f0417aa25a80821135c4bfe8b722eaac
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-1.3.0 b/metadata/md5-cache/ros-meta/perception_pcl-1.3.0
deleted file mode 100644
index 5b9b6108bd0d..000000000000
--- a/metadata/md5-cache/ros-meta/perception_pcl-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pcl_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/perception_pcl
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/pcl_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.3.0.tar.gz -> perception_pcl-1.3.0.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ae8dcc74ba3d174a0662033137cc3df
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-1.4.0 b/metadata/md5-cache/ros-meta/perception_pcl-1.4.0
deleted file mode 100644
index 0b4811c4ffec..000000000000
--- a/metadata/md5-cache/ros-meta/perception_pcl-1.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pcl_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/perception_pcl
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/pcl_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.4.0.tar.gz -> perception_pcl-1.4.0.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ae8dcc74ba3d174a0662033137cc3df
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-1.4.1 b/metadata/md5-cache/ros-meta/perception_pcl-1.4.1
deleted file mode 100644
index 6d39c3662f9e..000000000000
--- a/metadata/md5-cache/ros-meta/perception_pcl-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pcl_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/perception_pcl
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/pcl_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.4.1.tar.gz -> perception_pcl-1.4.1.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ae8dcc74ba3d174a0662033137cc3df
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-1.5.1 b/metadata/md5-cache/ros-meta/perception_pcl-1.5.1
deleted file mode 100644
index 9cebc6533e70..000000000000
--- a/metadata/md5-cache/ros-meta/perception_pcl-1.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pcl_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/perception_pcl
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/pcl_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.5.1.tar.gz -> perception_pcl-1.5.1.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f917468612adfb2b86ef8570d51d5fb
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-1.5.2 b/metadata/md5-cache/ros-meta/perception_pcl-1.5.2
deleted file mode 100644
index 2079970b4366..000000000000
--- a/metadata/md5-cache/ros-meta/perception_pcl-1.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pcl_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/perception_pcl
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/pcl_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.5.2.tar.gz -> perception_pcl-1.5.2.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f917468612adfb2b86ef8570d51d5fb
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-1.5.3 b/metadata/md5-cache/ros-meta/perception_pcl-1.5.3
deleted file mode 100644
index 58ae2edd0e6b..000000000000
--- a/metadata/md5-cache/ros-meta/perception_pcl-1.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pcl_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/perception_pcl
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/pcl_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.5.3.tar.gz -> perception_pcl-1.5.3.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f917468612adfb2b86ef8570d51d5fb
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-1.6.1 b/metadata/md5-cache/ros-meta/perception_pcl-1.6.1
new file mode 100644
index 000000000000..314be0856219
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/perception_pcl-1.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/perception_pcl
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.6.1.tar.gz -> perception_pcl-1.6.1.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=799ed24577a434df42d84e1891df11ee
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-9999 b/metadata/md5-cache/ros-meta/perception_pcl-9999
index 9ae4116e6a6d..f7529a5ae9b0 100644
--- a/metadata/md5-cache/ros-meta/perception_pcl-9999
+++ b/metadata/md5-cache/ros-meta/perception_pcl-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/pcl_ros >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/perception_pcl
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/pcl_ros python_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/pcl_conversions dev-ros/pcl_ros python_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	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ae8dcc74ba3d174a0662033137cc3df
+_md5_=799ed24577a434df42d84e1891df11ee
diff --git a/metadata/md5-cache/ros-meta/ros-1.14.4 b/metadata/md5-cache/ros-meta/ros-1.14.4
new file mode 100644
index 000000000000..53d95343a5f3
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/ros-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS packaging system
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/ros
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=85c22302dd537fac53c98b81ad3eb171
diff --git a/metadata/md5-cache/ros-meta/roscpp_core-0.6.10 b/metadata/md5-cache/ros-meta/roscpp_core-0.6.10
new file mode 100644
index 000000000000..60c88bf68d67
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/roscpp_core-0.6.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Underlying data libraries for roscpp messages
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/roscpp_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_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/roscpp_core/archive/0.6.10.tar.gz -> roscpp_core-0.6.10.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=13bb679b63620a008e46fe65b53a5203
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index bc455796ad3d..bfa64af6a56d 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/pdb2pqr-1.9.0-r1 b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1
index 8b4fe5fba92a..93030c4e14e1 100644
--- a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1
+++ b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1
@@ -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=0
 SRC_URI=https://github.com/Electrostatics/apbs-pdb2pqr/releases/download/pdb2pqr-1.9.0/pdb2pqr-src-1.9.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=787e26e15fbbe6ccc3debd3915e303dc
diff --git a/metadata/md5-cache/sci-chemistry/relax-4.0.0-r1 b/metadata/md5-cache/sci-chemistry/relax-4.0.0-r1
index 1b66048ef46c..f4e6d27ab939 100644
--- a/metadata/md5-cache/sci-chemistry/relax-4.0.0-r1
+++ b/metadata/md5-cache/sci-chemistry/relax-4.0.0-r1
@@ -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=0
 SRC_URI=http://download.gna.org/relax/relax-4.0.0.src.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
 _md5_=a93ba0d630c6f9c5966b92003e43adad
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index aa1f0fbe0f04..45fd9582f7fe 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1 b/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
index 982be7ea26bd..f8dff27a59ae 100644
--- a/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
+++ b/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 x11-libs/gtk+:2 gnome-base/libglade:2.0 gnome-base/libgnome >=gnome-base/libgnomeui-2.12 >=gnome-base/libgnomecanvas-2.12 >=x11-libs/cairo-1.2 x11-libs/gtksourceview:2.0 sci-electronics/electronics-menu
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/oregano/oregano_0.69.1.orig.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=84990bb942c376fc2651ca4f694e7682
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 6707d50dae57..7d67d2d361e1 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 c787c501a64a..4e5d76761bd2 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2
@@ -10,5 +10,5 @@ RDEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-gl
 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	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b3fe4914c5e3b731f28511a76c943823
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index ba44fe9cc957..9baef866744b 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -8,5 +8,5 @@ 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/pygtk:2[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
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-2	45ff482316b52b3f96ff6b7309b77f03	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-2	45ff482316b52b3f96ff6b7309b77f03	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=afc626a8f2a187e5e1ac2b5c70cbecf0
diff --git a/metadata/md5-cache/sci-geosciences/mapnik-3.0.9 b/metadata/md5-cache/sci-geosciences/mapnik-3.0.9
index 5d6f3ab766b8..2ca72460a36c 100644
--- a/metadata/md5-cache/sci-geosciences/mapnik-3.0.9
+++ b/metadata/md5-cache/sci-geosciences/mapnik-3.0.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/boost-1.48[threads] dev-libs/icu:= sys-libs/zlib media-libs/freetype media-libs/harfbuzz dev-libs/libxml2 media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= media-libs/libwebp sci-libs/proj media-fonts/dejavu x11-libs/agg[truetype] cairo? ( x11-libs/cairo dev-cpp/cairomm ) postgres? ( >=dev-db/postgresql-8.3:* ) gdal? ( sci-libs/gdal ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=https://github.com/mapnik/mapnik/archive/v3.0.9.tar.gz -> mapnik-3.0.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c3b6072934ea683c96d52ecfd0567df5
diff --git a/metadata/md5-cache/sci-geosciences/mapnik-3.0.9-r1 b/metadata/md5-cache/sci-geosciences/mapnik-3.0.9-r1
index fc17059cad13..6b6fc5f8ef06 100644
--- a/metadata/md5-cache/sci-geosciences/mapnik-3.0.9-r1
+++ b/metadata/md5-cache/sci-geosciences/mapnik-3.0.9-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/boost-1.48[threads] dev-libs/icu:= sys-libs/zlib media-libs/freetype media-libs/harfbuzz dev-libs/libxml2 media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= media-libs/libwebp sci-libs/proj media-fonts/dejavu x11-libs/agg[truetype] cairo? ( x11-libs/cairo dev-cpp/cairomm ) postgres? ( >=dev-db/postgresql-8.3:* ) gdal? ( sci-libs/gdal ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=https://github.com/mapnik/mapnik/archive/v3.0.9.tar.gz -> mapnik-3.0.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ce0e0587ecdd8af76235195283ae0203
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index bd087b5554eb..0680fa59106f 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/freesteam-2.0 b/metadata/md5-cache/sci-libs/freesteam-2.0
index 51e9aab7ca18..0c48788e2991 100644
--- a/metadata/md5-cache/sci-libs/freesteam-2.0
+++ b/metadata/md5-cache/sci-libs/freesteam-2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/gsl
 SLOT=0
 SRC_URI=mirror://sourceforge/freesteam/freesteam-2.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0df924731939ee9a796d57e4aa45c317
diff --git a/metadata/md5-cache/sci-libs/freesteam-9999 b/metadata/md5-cache/sci-libs/freesteam-9999
index 2b3a282a8ad3..7065585435b3 100644
--- a/metadata/md5-cache/sci-libs/freesteam-9999
+++ b/metadata/md5-cache/sci-libs/freesteam-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://freesteam.sourceforge.net/
 LICENSE=GPL-2
 RDEPEND=sci-libs/gsl
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7843bb9462d4a6e6d24153b3918733c2
diff --git a/metadata/md5-cache/sci-libs/pcl-1.8.0 b/metadata/md5-cache/sci-libs/pcl-1.8.0
deleted file mode 100644
index 4eea9d5da802..000000000000
--- a/metadata/md5-cache/sci-libs/pcl-1.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads] dev-cpp/eigen:3 opengl? ( virtual/opengl media-libs/freeglut ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtopengl:5 ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) !!dev-cpp/metslib doc? ( app-doc/doxygen ) tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink ) test? ( >=dev-cpp/gtest-1.6.0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=2D/3D image and point cloud processing
-EAPI=5
-HOMEPAGE=http://pointclouds.org/
-IUSE=cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads] dev-cpp/eigen:3 opengl? ( virtual/opengl media-libs/freeglut ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtopengl:5 ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-REQUIRED_USE=openni? ( usb ) openni2? ( usb ) tutorials? ( doc )
-SLOT=0/1.8
-SRC_URI=https://github.com/PointCloudLibrary/pcl/archive/pcl-1.8.0.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=564ebb1091b2e6eea7784cfc48dd33c7
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 68e810ce0fa6..9f1b406e6466 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/gnuplot-5.0.1-r1 b/metadata/md5-cache/sci-visualization/gnuplot-5.0.1-r1
deleted file mode 100644
index c5da6f6a25fc..000000000000
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) qt4? ( >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtsvg-4.5:4 ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:3.0[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra app-text/ghostscript-gpl ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Command-line driven interactive plotting program
-EAPI=5
-HOMEPAGE=http://www.gnuplot.info/
-IUSE=aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=gnuplot bitmap? ( free-noncomm )
-RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) qt4? ( >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtsvg-4.5:4 ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:3.0[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
-SLOT=0
-SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.0.1.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=238006e73ac3dca6f923b1b966a07d47
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.2.2 b/metadata/md5-cache/sci-visualization/gnuplot-5.2.2
index 1eb50b007f7a..a82608171253 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.2.2
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line driven interactive plotting program
 EAPI=6
 HOMEPAGE=http://www.gnuplot.info/
 IUSE=aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis svga wxwidgets X
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~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 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gnuplot bitmap? ( free-noncomm )
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:3.0[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.2.2.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=dce38edfbe0288aa10d9c02b3bdbe081
+_md5_=05d0849c56e640cc5da6351c4bd7c539
diff --git a/metadata/md5-cache/sci-visualization/nonolith-connect-1.1 b/metadata/md5-cache/sci-visualization/nonolith-connect-1.1
index 2b98046f36bd..f09d308f1032 100644
--- a/metadata/md5-cache/sci-visualization/nonolith-connect-1.1
+++ b/metadata/md5-cache/sci-visualization/nonolith-connect-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost virtual/udev
 SLOT=0
 SRC_URI=http://apps.nonolithlabs.com/download/source/nonolith-connect-1.1.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=e36236fb3fd5c14d4f2352810071ee64
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index dfd98c7d922f..f2a8e1675da8 100644
--- a/metadata/md5-cache/sec-policy/Manifest.gz
+++ b/metadata/md5-cache/sec-policy/Manifest.gz
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r2
new file mode 100644
index 000000000000..735d8f3b3c1b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for redis
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_md5_=ad46b468b0d1e59bd4337029e8f6da89
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-9999 b/metadata/md5-cache/sec-policy/selinux-redis-9999
new file mode 100644
index 000000000000..c9d265d59540
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-redis-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=dev-vcs/git-1.8.2.1 >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for redis
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
+SLOT=0
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_md5_=ad46b468b0d1e59bd4337029e8f6da89
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 397a0a067ad1..b83f981db27e 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/dmidecode-3.0 b/metadata/md5-cache/sys-apps/dmidecode-3.0
deleted file mode 100644
index fbedb146d568..000000000000
--- a/metadata/md5-cache/sys-apps/dmidecode-3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile postinst prepare
-DESCRIPTION=DMI (Desktop Management Interface) table related utilities
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/dmidecode/
-IUSE=selinux
-KEYWORDS=-* amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-dmidecode )
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/dmidecode/dmidecode-3.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=10d9ac8c6183821640a3edd0e80ada54
diff --git a/metadata/md5-cache/sys-apps/dmidecode-3.1 b/metadata/md5-cache/sys-apps/dmidecode-3.1
index 82208eb82281..8c6315c8d6f9 100644
--- a/metadata/md5-cache/sys-apps/dmidecode-3.1
+++ b/metadata/md5-cache/sys-apps/dmidecode-3.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile postinst prepare
 DESCRIPTION=DMI (Desktop Management Interface) table related utilities
 EAPI=5
-HOMEPAGE=http://www.nongnu.org/dmidecode/
+HOMEPAGE=https://www.nongnu.org/dmidecode/
 IUSE=selinux
-KEYWORDS=-* amd64 arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris
+KEYWORDS=-* amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-dmidecode )
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/dmidecode/dmidecode-3.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=025044314048b5568cfc93f17a1dbbbc
+_md5_=faef3ed2333faf4518a986189ed35e61
diff --git a/metadata/md5-cache/sys-apps/gawk-3.1.8 b/metadata/md5-cache/sys-apps/gawk-3.1.8
deleted file mode 100644
index 6eab9fd3248e..000000000000
--- a/metadata/md5-cache/sys-apps/gawk-3.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!>=virtual/awk-1 nls? ( sys-devel/gettext )
-DESCRIPTION=GNU awk pattern-matching language
-EAPI=2
-HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
-IUSE=nls
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=!>=virtual/awk-1
-SLOT=0
-SRC_URI=mirror://gnu/gawk/gawk-3.1.8.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b695605fc295d4028e07482a6f137585
diff --git a/metadata/md5-cache/sys-apps/gawk-4.1.4 b/metadata/md5-cache/sys-apps/gawk-4.1.4
index 5078cbe8be57..09dc29b1c301 100644
--- a/metadata/md5-cache/sys-apps/gawk-4.1.4
+++ b/metadata/md5-cache/sys-apps/gawk-4.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=GNU awk pattern-matching language
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
 IUSE=mpfr nls readline
-KEYWORDS=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=GPL-2
 RDEPEND=mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-4.1.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=65a7a07aeea6788e6a382732375bd7a3
+_md5_=0300e07c450287009212ae101f605d52
diff --git a/metadata/md5-cache/sys-apps/help2man-1.47.4 b/metadata/md5-cache/sys-apps/help2man-1.47.4
index f93e9966f119..c8c94ae6dc0c 100644
--- a/metadata/md5-cache/sys-apps/help2man-1.47.4
+++ b/metadata/md5-cache/sys-apps/help2man-1.47.4
@@ -4,10 +4,10 @@ DESCRIPTION=GNU utility to convert program --help output to a man page
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/help2man/
 IUSE=nls
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
 SLOT=0
 SRC_URI=mirror://gnu/help2man/help2man-1.47.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=77848d77e398bf5644e2159508982a61
+_md5_=c0d8a35b2f2a131ec9bdc820e3f812c1
diff --git a/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.10 b/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.10
index 2b851c5b463b..30bc9cc917d4 100644
--- a/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.10
+++ b/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=sys-devel/gcc-4:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~idella4/distfiles/IntelPerformanceCounterMonitor-PCM-V2.10.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	fcaps	29a56915716950cd3d23630cede80d68	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	fcaps	9445d60c1eb084a91c38ef4c070b2f16	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e4439d45183ea80c915cc16e03ef1640
diff --git a/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.8 b/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.8
index 280723785055..5072c742a668 100644
--- a/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.8
+++ b/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=sys-devel/gcc-4:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dlan/distfiles/IntelPerformanceCounterMonitorV2.8.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	fcaps	29a56915716950cd3d23630cede80d68	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	fcaps	9445d60c1eb084a91c38ef4c070b2f16	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=93c64741a5d4e3d9623a3bc30d972a5c
diff --git a/metadata/md5-cache/sys-apps/lcdtest-1.18 b/metadata/md5-cache/sys-apps/lcdtest-1.18
index 0d597252d37d..cdbc286c13a1 100644
--- a/metadata/md5-cache/sys-apps/lcdtest-1.18
+++ b/metadata/md5-cache/sys-apps/lcdtest-1.18
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=media-libs/libsdl-1.2.7-r2[X,video] >=media-libs/sdl-image-1.2.3-r1 >=media-libs/sdl-ttf-2.0.9 media-fonts/liberation-fonts
 SLOT=0
 SRC_URI=http://www.brouhaha.com/~eric/software/lcdtest/download/lcdtest-1.18.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2868fafe721490d7e4e45a8675d9580c
diff --git a/metadata/md5-cache/sys-apps/likwid-4.1.1 b/metadata/md5-cache/sys-apps/likwid-4.1.1
index ebff7abe1ee0..39b6eb9c04fe 100644
--- a/metadata/md5-cache/sys-apps/likwid-4.1.1
+++ b/metadata/md5-cache/sys-apps/likwid-4.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=https://github.com/RRZE-HPC/likwid/archive/likwid-4.1.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=8136877429c476e0249fcf570c8660d2
diff --git a/metadata/md5-cache/sys-apps/likwid-4.1.2 b/metadata/md5-cache/sys-apps/likwid-4.1.2
index 3786491e1413..701c31e46f86 100644
--- a/metadata/md5-cache/sys-apps/likwid-4.1.2
+++ b/metadata/md5-cache/sys-apps/likwid-4.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=https://ftp.fau.de/pub/likwid/likwid-4.1.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=6f26e29b2c13d7d52d4ff0d5d9acddf6
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index d028910caf87..784f1b6b7993 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -6,8 +6,8 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-10 app-crypt/gentoo-keys >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-10 app-crypt/openpgp-keys-gentoo-release >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e660b6eeb3724ba054bd04d398c5883d
+_md5_=3917df49dc7c2b992938c6b485add0a9
diff --git a/metadata/md5-cache/sys-apps/usbutils-009 b/metadata/md5-cache/sys-apps/usbutils-009
index 5013ab3e9bf8..6846c1309cba 100644
--- a/metadata/md5-cache/sys-apps/usbutils-009
+++ b/metadata/md5-cache/sys-apps/usbutils-009
@@ -4,11 +4,11 @@ DESCRIPTION=USB enumeration utilities
 EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/usb/usbutils/ https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/
 IUSE=python python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1= virtual/libudev:= sys-apps/hwids 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? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/usb/usbutils/usbutils-009.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=3ae7dd7529b0a70483be7dfbb6ec87e6
+_md5_=f0541cd0db1773715ff46127908d5df2
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index f615dc19ef2c..22399677420d 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/polkit-0.114 b/metadata/md5-cache/sys-auth/polkit-0.114
new file mode 100644
index 000000000000..c69d8fa596ea
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/polkit-0.114
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-lang/spidermonkey:52[-debug] dev-libs/glib:2 dev-libs/expat elogind? ( sys-auth/elogind ) introspection? ( dev-libs/gobject-introspection ) pam? ( sys-auth/pambase virtual/pam ) systemd? ( sys-apps/systemd:0= ) app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-libs/gobject-introspection-common dev-libs/libxslt dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Policy framework for controlling privileges for system-wide services
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/polkit
+IUSE=elogind examples gtk +introspection jit kde nls pam selinux systemd test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2
+PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 >=lxde-base/lxsession-0.5.2 ) ) kde? ( kde-plasma/polkit-kde-agent ) !systemd? ( !elogind? ( sys-auth/consolekit[policykit] ) )
+RDEPEND=dev-lang/spidermonkey:52[-debug] dev-libs/glib:2 dev-libs/expat elogind? ( sys-auth/elogind ) introspection? ( dev-libs/gobject-introspection ) pam? ( sys-auth/pambase virtual/pam ) systemd? ( sys-apps/systemd:0= ) selinux? ( sec-policy/selinux-policykit )
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.114.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eb8c18380ad634d522a1fec0720663d3
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index a1edcbf63d17..074388875555 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/galera-25.3.20 b/metadata/md5-cache/sys-cluster/galera-25.3.20
index a2fe31dfcc9a..81432f9f3fdd 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.20
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.20
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 SLOT=0
 SRC_URI=http://releases.galeracluster.com/source/galera-3-25.3.20.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8a3185a82d1c74523dc9f9a67e7bc13
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.21 b/metadata/md5-cache/sys-cluster/galera-25.3.21
index 51355f196a32..d066c74c241c 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.21
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.21
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 SLOT=0
 SRC_URI=http://releases.galeracluster.com/galera-3/source/galera-3-25.3.21.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=62784da03bbb5a6ef6567d257647a246
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.22 b/metadata/md5-cache/sys-cluster/galera-25.3.22
index e2742948adf4..6934c422d9fd 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.22
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 SLOT=0
 SRC_URI=http://releases.galeracluster.com/galera-3/source/galera-3-25.3.22.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eb7769dd36846765122bd11ce618410f
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.23 b/metadata/md5-cache/sys-cluster/galera-25.3.23
index 4ceaeb820e9c..92446803dc78 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.23
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.23
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 SLOT=0
 SRC_URI=http://releases.galeracluster.com/galera-3/source/galera-3-25.3.23.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	3790b47674a03f79525a1a517bd2191f	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=96be9ea1e396381f9b8cc685139f3750
diff --git a/metadata/md5-cache/sys-cluster/heat-10.0.1 b/metadata/md5-cache/sys-cluster/heat-10.0.1
new file mode 100644
index 000000000000..447d7277f429
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/heat-10.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration engine.
+EAPI=6
+HOMEPAGE=https://launchpad.net/heat
+IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/openstacksdk-0.9.19[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/aodhclient-0.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-heatclient-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-magnumclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-manilaclient-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-mistralclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-mistralclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-monascaclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-octaviaclient-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-saharaclient-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zunclient-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/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/yaql-1.1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.queens -> heat.conf.sample-10.0.1 https://tarballs.openstack.org/heat/heat-10.0.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eae9aa133b60c56278218fcb674b2e77
diff --git a/metadata/md5-cache/sys-cluster/keepalived-1.4.3 b/metadata/md5-cache/sys-cluster/keepalived-1.4.3
new file mode 100644
index 000000000000..3b752a8aa2e1
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/keepalived-1.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libnl:= dev-libs/openssl:= dev-libs/popt net-libs/libnfnetlink sys-apps/iproute2 dbus? ( sys-apps/dbus ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp ) >=sys-kernel/linux-headers-4.4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server project
+EAPI=6
+HOMEPAGE=http://www.keepalived.org/
+IUSE=dbus debug ipv6 -json snmp
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libnl:= dev-libs/openssl:= dev-libs/popt net-libs/libnfnetlink sys-apps/iproute2 dbus? ( sys-apps/dbus ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp )
+SLOT=0
+SRC_URI=http://www.keepalived.org/software/keepalived-1.4.3.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=90c75184a345ff11dd1803261c8349ec
diff --git a/metadata/md5-cache/sys-cluster/neutron-11.0.4 b/metadata/md5-cache/sys-cluster/neutron-11.0.4
new file mode 100644
index 000000000000..78050f68e5bf
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/neutron-11.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare pretend setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A virtual network service for Openstack
+EAPI=6
+HOMEPAGE=https://launchpad.net/neutron
+IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres python_targets_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0 dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pecan-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/neutron-lib-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ryu-4.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-privsep-1.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ovs-2.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ovsdbapp-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyroute2-0.4.21[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/weakrefmethod-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-9.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/os-xenapi-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( <=net-misc/openvswitch-2.8.9999 ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) python_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=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/configs.tar.gz -> neutron-configs-11.0.4.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/ml2_plugins.tar.gz -> neutron-ml2-plugins-11.0.4.tar.gz https://tarballs.openstack.org/neutron/neutron-11.0.4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bc180deadec750e922c40f9d1935cc07
diff --git a/metadata/md5-cache/sys-cluster/neutron-12.0.2 b/metadata/md5-cache/sys-cluster/neutron-12.0.2
new file mode 100644
index 000000000000..34231a9e7094
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/neutron-12.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare pretend setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-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_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=A virtual network service for Openstack
+EAPI=6
+HOMEPAGE=https://launchpad.net/neutron
+IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pecan-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pecan-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pecan-1.0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pecan-1.0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pecan-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/neutron-lib-1.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/ryu-4.14[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-privsep-1.23.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/ovs-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/ovsdbapp-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pyroute2-0.4.21[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/weakrefmethod-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( <=net-misc/openvswitch-2.8.9999 ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) 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=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-12.0.2.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-12.0.2.tar.gz https://tarballs.openstack.org/neutron/neutron-12.0.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5a3169eebc2feeb6b76e9f982e741859
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 21de14db7010..fc66728fa1e6 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/crossdev-20180105 b/metadata/md5-cache/sys-devel/crossdev-20180105
deleted file mode 100644
index 722654cb39f7..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20180105
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions !sys-devel/crossdev-wrappers
-SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20180105.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20180105.tar.xz
-_md5_=33881926ca6449480eb215848e961acc
diff --git a/metadata/md5-cache/sys-devel/crossdev-20180120 b/metadata/md5-cache/sys-devel/crossdev-20180120
deleted file mode 100644
index 2351a61b087a..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20180120
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions !sys-devel/crossdev-wrappers
-SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20180120.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20180120.tar.xz
-_md5_=33881926ca6449480eb215848e961acc
diff --git a/metadata/md5-cache/sys-devel/crossdev-20180302-r1 b/metadata/md5-cache/sys-devel/crossdev-20180302-r1
deleted file mode 100644
index 01f392db7eb9..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20180302-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=|| ( >=sys-apps/portage-2.1 sys-apps/portage-mgorny ) >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions !sys-devel/crossdev-wrappers
-SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20180302.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20180302.tar.xz
-_md5_=d39f94b89012fc75c2dbd56fbc6a658f
diff --git a/metadata/md5-cache/sys-devel/crossdev-20180508 b/metadata/md5-cache/sys-devel/crossdev-20180508
new file mode 100644
index 000000000000..248326804aa2
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/crossdev-20180508
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Gentoo Cross-toolchain generator
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=|| ( >=sys-apps/portage-2.1 sys-apps/portage-mgorny ) >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions !sys-devel/crossdev-wrappers
+SLOT=0
+SRC_URI=mirror://gentoo/crossdev-20180508.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20180508.tar.xz
+_md5_=d39f94b89012fc75c2dbd56fbc6a658f
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index b6b3cd000e86..2066594e8f57 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/eudev-3.2.5 b/metadata/md5-cache/sys-fs/eudev-3.2.5
index 93837a5c585f..bd59ca26c8c5 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.5
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/eudev
 IUSE=+hwdb +kmod introspection rule-generator selinux static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.5.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=00a57993bfa60003f0a62bb5091e1f9b
+_md5_=78fc8d7ba7bec21f54fa1a59309e565d
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.171 b/metadata/md5-cache/sys-fs/lvm2-2.02.171
index aa030852fe12..415f3875d4c7 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.171
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.171
@@ -11,4 +11,4 @@ REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initr
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.171.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.171.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7ed8ee7e3736051722b52c206507ec20
+_md5_=c40f3e7677d83f431369426e2e8f9722
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.172 b/metadata/md5-cache/sys-fs/lvm2-2.02.172
index 366432120257..e45adb0e998f 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.172
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.172
@@ -11,4 +11,4 @@ REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initr
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.172.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.172.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e9abd3837fa36cfe14a73cded398b743
+_md5_=f45799a0e6a921c7903cab78530eb8ad
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.173 b/metadata/md5-cache/sys-fs/lvm2-2.02.173
index 3c814fa42d34..196bbb4f9547 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.173
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.173
@@ -11,4 +11,4 @@ REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initr
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e9abd3837fa36cfe14a73cded398b743
+_md5_=f45799a0e6a921c7903cab78530eb8ad
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.15 b/metadata/md5-cache/sys-fs/mtools-4.0.15
deleted file mode 100644
index b94d9f9f90e6..000000000000
--- a/metadata/md5-cache/sys-fs/mtools-4.0.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
-EAPI=2
-HOMEPAGE=http://mtools.linux.lu/
-IUSE=X
-KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86
-LICENSE=GPL-3
-RDEPEND=X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-SLOT=0
-SRC_URI=mirror://gnu/mtools/mtools-4.0.15.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=0637c429bb7150a8f09f662c536dff05
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.17 b/metadata/md5-cache/sys-fs/mtools-4.0.17
deleted file mode 100644
index 41abeab85e2e..000000000000
--- a/metadata/md5-cache/sys-fs/mtools-4.0.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
-EAPI=4
-HOMEPAGE=http://mtools.linux.lu/
-IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-SLOT=0
-SRC_URI=mirror://gnu/mtools/mtools-4.0.17.tar.bz2
-_md5_=58aa15a4a77da103e222ce469bd2b85e
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.18 b/metadata/md5-cache/sys-fs/mtools-4.0.18
deleted file mode 100644
index f43a8f822470..000000000000
--- a/metadata/md5-cache/sys-fs/mtools-4.0.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
-EAPI=4
-HOMEPAGE=http://mtools.linux.lu/
-IUSE=X elibc_glibc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris
-LICENSE=GPL-3
-RDEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-SLOT=0
-SRC_URI=mirror://gnu/mtools/mtools-4.0.18.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7012064792b50c90f43de62cd45446ba
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.18-r2 b/metadata/md5-cache/sys-fs/mtools-4.0.18-r2
index 1a7589e33276..5d7a8579a8e1 100644
--- a/metadata/md5-cache/sys-fs/mtools-4.0.18-r2
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.18-r2
@@ -4,10 +4,10 @@ DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
 IUSE=X elibc_glibc
-KEYWORDS=alpha amd64 arm ~hppa ~ppc ppc64 sparc x86 ~x64-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://gnu/mtools/mtools-4.0.18.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=41d1ddcdeadc85522de8dde948353b9d
+_md5_=57a4dc90aa55843e73fe50032d1fa72c
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.9 b/metadata/md5-cache/sys-fs/zfs-0.7.9
new file mode 100644
index 000000000000..921545f35630
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170422 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Userland utilities for ZFS Linux kernel module
+EAPI=5
+HOMEPAGE=http://zfsonlinux.org/
+IUSE=custom-cflags debug kernel-builtin +rootfs test-suite static-libs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=BSD-2 CDDL MIT
+RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.7.9* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 !<sys-kernel/genkernel-3.5.1.1 !<sys-kernel/genkernel-next-67 !<sys-kernel/bliss-initramfs-7.1.0 !<sys-kernel/dracut-044-r1 ) sys-fs/udev-init-scripts
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=07a20a3a62c8f51a8ee1649de6afb7c1
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9 b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9
new file mode 100644
index 000000000000..671731c09efd
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND==sys-kernel/spl-0.7.9* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) >=app-portage/elt-patches-20170422
+DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
+EAPI=5
+HOMEPAGE=http://zfsonlinux.org/
+IUSE=custom-cflags debug +rootfs kernel_linux
+KEYWORDS=~amd64
+LICENSE=CDDL debug? ( GPL-2+ )
+RDEPEND==sys-kernel/spl-0.7.9* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RESTRICT=debug? ( strip ) test
+SLOT=0
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=10e49aa6679f9f41e850b2bcbbf8c17c
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 60b08c7127c5..84b106361753 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.14.22 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.22
deleted file mode 100644
index 45c1864ea874..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.22
+++ /dev/null
@@ -1,14 +0,0 @@
-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.14
-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=experimental symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.22
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-27.base.tar.xz mirror://gentoo/genpatches-4.14-27.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-27.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=65abda91df6f3023b57f4f8aafaf4128
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.23 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.23
deleted file mode 100644
index dbb7d7e2dc73..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.23
+++ /dev/null
@@ -1,14 +0,0 @@
-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.14
-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=experimental symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.23
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-28.base.tar.xz mirror://gentoo/genpatches-4.14-28.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-28.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=584a4d4682baf69da03d2432d9dc92a1
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.26 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.26
deleted file mode 100644
index e8ea3dc28e4b..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.26
+++ /dev/null
@@ -1,14 +0,0 @@
-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.14
-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=experimental symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.26
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-31.base.tar.xz mirror://gentoo/genpatches-4.14-31.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-31.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dca2070a09c82373531791f90e53355f
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.29 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.29
deleted file mode 100644
index fcc73f2cc548..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.29
+++ /dev/null
@@ -1,14 +0,0 @@
-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.14
-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=experimental symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.29
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-34.base.tar.xz mirror://gentoo/genpatches-4.14-34.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-34.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c18d1d21cb865c4a3c617e2d9ef0fb95
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.31 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.31
deleted file mode 100644
index d9831e896278..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.31
+++ /dev/null
@@ -1,14 +0,0 @@
-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.14
-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=experimental symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.31
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-36.base.tar.xz mirror://gentoo/genpatches-4.14-36.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-36.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bbfd076014be8b2b752be499fbae3dc0
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.32 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.32
deleted file mode 100644
index 0b816d4adcca..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.32
+++ /dev/null
@@ -1,14 +0,0 @@
-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.14
-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=experimental symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.32
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-37.base.tar.xz mirror://gentoo/genpatches-4.14-37.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-37.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3c0fb2e2df26ad85a6f49d1b7a861035
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.40 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.40
new file mode 100644
index 000000000000..cb604c1bfdbd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.40
@@ -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.14
+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=experimental symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.40
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-45.base.tar.xz mirror://gentoo/genpatches-4.14-45.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-45.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c79728ac5c283e2952ecf1546edce069
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.15.12 b/metadata/md5-cache/sys-kernel/ck-sources-4.15.12
deleted file mode 100644
index b861817afa59..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.15.12
+++ /dev/null
@@ -1,14 +0,0 @@
-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.15
-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=experimental symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.12
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.15-gnu/deblob-4.15 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.15-gnu/deblob-check -> deblob-check-4.15 ) mirror://gentoo/genpatches-4.15-15.base.tar.xz mirror://gentoo/genpatches-4.15-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-15.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.15/4.15-ck1/patch-4.15-ck1.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b58cbdc80e4bcb58dd74eeb8fdb985a9
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.15.14 b/metadata/md5-cache/sys-kernel/ck-sources-4.15.14
deleted file mode 100644
index e68b6e36b526..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.15.14
+++ /dev/null
@@ -1,14 +0,0 @@
-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.15
-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=experimental symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.14
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.15-gnu/deblob-4.15 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.15-gnu/deblob-check -> deblob-check-4.15 ) mirror://gentoo/genpatches-4.15-17.base.tar.xz mirror://gentoo/genpatches-4.15-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-17.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.15/4.15-ck1/patch-4.15-ck1.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cb387a77b7d026b07c30a80018f94758
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.15.15 b/metadata/md5-cache/sys-kernel/ck-sources-4.15.15
deleted file mode 100644
index 66b479e9410c..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.15.15
+++ /dev/null
@@ -1,14 +0,0 @@
-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.15
-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=experimental symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.15
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.15-gnu/deblob-4.15 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.15-gnu/deblob-check -> deblob-check-4.15 ) mirror://gentoo/genpatches-4.15-18.base.tar.xz mirror://gentoo/genpatches-4.15-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-18.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.15/4.15-ck1/patch-4.15-ck1.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e86a394e54314e868fd976fe07b87e21
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.15.6 b/metadata/md5-cache/sys-kernel/ck-sources-4.15.6
deleted file mode 100644
index 9b1dbb6e3c76..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.15.6
+++ /dev/null
@@ -1,14 +0,0 @@
-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.15
-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=experimental symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.6
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.15-gnu/deblob-4.15 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.15-gnu/deblob-check -> deblob-check-4.15 ) mirror://gentoo/genpatches-4.15-7.base.tar.xz mirror://gentoo/genpatches-4.15-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-7.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.15/4.15-ck1/patch-4.15-ck1.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c7f32845ec6f191b4a29a09b661265ec
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.15.7 b/metadata/md5-cache/sys-kernel/ck-sources-4.15.7
deleted file mode 100644
index 5af3bc5fc073..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.15.7
+++ /dev/null
@@ -1,14 +0,0 @@
-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.15
-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=experimental symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.7
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.15-gnu/deblob-4.15 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.15-gnu/deblob-check -> deblob-check-4.15 ) mirror://gentoo/genpatches-4.15-9.base.tar.xz mirror://gentoo/genpatches-4.15-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-9.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.15/4.15-ck1/patch-4.15-ck1.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2d6e2d1c76c5f5d5c3acceb5bd88e3c8
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.15.9 b/metadata/md5-cache/sys-kernel/ck-sources-4.15.9
deleted file mode 100644
index de940c36f029..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.15.9
+++ /dev/null
@@ -1,14 +0,0 @@
-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.15
-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=experimental symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.9
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.15-gnu/deblob-4.15 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.15-gnu/deblob-check -> deblob-check-4.15 ) mirror://gentoo/genpatches-4.15-12.base.tar.xz mirror://gentoo/genpatches-4.15-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-12.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.15/4.15-ck1/patch-4.15-ck1.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c7d6be0e74da9d2f000df95594b6f40b
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.16.8 b/metadata/md5-cache/sys-kernel/ck-sources-4.16.8
new file mode 100644
index 000000000000..ddd309b2bb75
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.16.8
@@ -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.16
+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=experimental symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.8
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.16-gnu/deblob-4.16 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.16-gnu/deblob-check -> deblob-check-4.16 ) mirror://gentoo/genpatches-4.16-9.base.tar.xz mirror://gentoo/genpatches-4.16-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-9.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.16/4.16-ck1/patch-4.16-ck1.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2d6e2d1c76c5f5d5c3acceb5bd88e3c8
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.84 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.84
deleted file mode 100644
index b820358ad094..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.84
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.84
-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-87.base.tar.xz mirror://gentoo/genpatches-4.9-87.extras.tar.xz mirror://gentoo/genpatches-4.9-87.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	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6276db8dde749b8657a410a3b42a8788
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.85 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.85
deleted file mode 100644
index aefacb9bae03..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.85
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.85
-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-88.base.tar.xz mirror://gentoo/genpatches-4.9-88.extras.tar.xz mirror://gentoo/genpatches-4.9-88.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	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=19ce5b018287c377629c52ae5d73ef9a
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.87 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.87
deleted file mode 100644
index c94d7b47683d..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.87
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.87
-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-90.base.tar.xz mirror://gentoo/genpatches-4.9-90.extras.tar.xz mirror://gentoo/genpatches-4.9-90.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	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=678ea422944a08fe3eddb541d1716468
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.89 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.89
deleted file mode 100644
index d60b4820af2d..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.89
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.89
-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-92.base.tar.xz mirror://gentoo/genpatches-4.9-92.extras.tar.xz mirror://gentoo/genpatches-4.9-92.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	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4b2c083609dd44e23baa7074f514faa7
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.91 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.91
deleted file mode 100644
index a20a05e2b4f2..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.91
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.91
-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-94.base.tar.xz mirror://gentoo/genpatches-4.9-94.extras.tar.xz mirror://gentoo/genpatches-4.9-94.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	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9f928159ed2b6ed379df850fec08d683
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.92 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.92
deleted file mode 100644
index c7085abecaba..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.92
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.92
-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-95.base.tar.xz mirror://gentoo/genpatches-4.9-95.extras.tar.xz mirror://gentoo/genpatches-4.9-95.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	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ca487443ab6f3909e741de037033fd10
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.99 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.99
new file mode 100644
index 000000000000..e9a3740edfe3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.99
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.99
+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-102.base.tar.xz mirror://gentoo/genpatches-4.9-102.extras.tar.xz mirror://gentoo/genpatches-4.9-102.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	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e771a15cd7d11003b9ddab6ef07ce4b1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.40 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.40
new file mode 100644
index 000000000000..4ba249cab658
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.40
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.40
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-45.base.tar.xz mirror://gentoo/genpatches-4.14-45.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-45.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d2dc658898b6cc4dceb4e74a7f803832
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.16.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.16.8
new file mode 100644
index 000000000000..a8c249c2691e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.16.8
@@ -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.16 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.8
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz mirror://gentoo/genpatches-4.16-9.base.tar.xz mirror://gentoo/genpatches-4.16-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-9.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=543d660fdd06d635ae8d29e99fd093ad
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.99 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.99
new file mode 100644
index 000000000000..8679073d94bd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.99
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.99
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-102.base.tar.xz mirror://gentoo/genpatches-4.9-102.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-102.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=83923d3cf6088b43581393ddb8562dc9
diff --git a/metadata/md5-cache/sys-kernel/spl-0.7.9 b/metadata/md5-cache/sys-kernel/spl-0.7.9
new file mode 100644
index 000000000000..891e5708ddf7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/spl-0.7.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) >=app-portage/elt-patches-20170422
+DESCRIPTION=The Solaris Porting Layer provides many of the Solaris kernel APIs
+EAPI=5
+HOMEPAGE=http://zfsonlinux.org/
+IUSE=custom-cflags debug kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
+RESTRICT=debug? ( strip ) test
+SLOT=0
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/spl-0.7.9.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f40972d04a0a283e934935504b4f6648
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.39 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.39
deleted file mode 100644
index 02f64f349cd3..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.39
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.39
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.39.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.40 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.40
new file mode 100644
index 000000000000..b0dbf4a24f17
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.40
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.40
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.40.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.7 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.7
deleted file mode 100644
index 7d9b152d55a5..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.16.7
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.7.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.8 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.8
new file mode 100644
index 000000000000..6c5eabd3798e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.8
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.8.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.98 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.98
deleted file mode 100644
index 2b0e442f5270..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.98
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.98
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.98.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.99 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.99
new file mode 100644
index 000000000000..3d774b1c14dd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.99
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.99
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.99.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index f5ac20e9af1d..f161e44926fa 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/pam-1.2.1-r2 b/metadata/md5-cache/sys-libs/pam-1.2.1-r2
index 2bae865230a2..b720221d1d67 100644
--- a/metadata/md5-cache/sys-libs/pam-1.2.1-r2
+++ b/metadata/md5-cache/sys-libs/pam-1.2.1-r2
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cracklib? ( >=sys-libs/cracklib-2.9.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(-)?] ) audit? ( >=sys-process/audit-2.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(-)?] ) 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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( >=net-libs/libtirpc-0.2.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(-)?] ) !<sys-apps/openrc-0.11.8 !sys-auth/openpam !sys-auth/pam_userdb
 SLOT=0
 SRC_URI=http://www.linux-pam.org/library/Linux-PAM-1.2.1.tar.bz2 http://www.linux-pam.org/documentation/Linux-PAM-1.2.0-docs.tar.bz2
-_eclasses_=db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=364312bc7fb5259af9a30df4abd0b546
diff --git a/metadata/md5-cache/sys-libs/pam-1.3.0-r2 b/metadata/md5-cache/sys-libs/pam-1.3.0-r2
index f786f88fa207..343f098ab0d8 100644
--- a/metadata/md5-cache/sys-libs/pam-1.3.0-r2
+++ b/metadata/md5-cache/sys-libs/pam-1.3.0-r2
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase vim-syntax? ( app-editors/vim )
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cracklib? ( >=sys-libs/cracklib-2.9.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(-)?] ) audit? ( >=sys-process/audit-2.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(-)?] ) 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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( >=net-libs/libtirpc-0.2.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(-)?] ) !<sys-apps/openrc-0.11.8 !sys-auth/openpam !sys-auth/pam_userdb
 SLOT=0
 SRC_URI=http://www.linux-pam.org/library/Linux-PAM-1.3.0.tar.bz2 http://www.linux-pam.org/library/Linux-PAM-1.3.0-docs.tar.bz2
-_eclasses_=db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=03cb3597b4480a50bc09e7fed784efaf
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index b1f7abcc7705..42c7b72fc602 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/acpid-2.0.29-r1 b/metadata/md5-cache/sys-power/acpid-2.0.29-r1
new file mode 100644
index 000000000000..efddd2ef205d
--- /dev/null
+++ b/metadata/md5-cache/sys-power/acpid-2.0.29-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst pretend setup
+DEPEND=>=sys-kernel/linux-headers-3 virtual/pkgconfig
+DESCRIPTION=Daemon for Advanced Configuration and Power Interface
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/acpid2
+IUSE=selinux
+KEYWORDS=~amd64 ~arm64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( sec-policy/selinux-apm )
+SLOT=0
+SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.29.tar.xz https://dev.gentoo.org/~andrey_utkin/distfiles/sys-power_acpid_2.0.29-r1_extras.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=84fcdd9bb5f2fda1fe72278d2fce60c4
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 05803ef3e2ed..1f127799c53f 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/grafana-bin-5.1.1 b/metadata/md5-cache/www-apps/grafana-bin-5.1.1
deleted file mode 100644
index 7de3d7c5c3d8..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-5.1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=5
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.1.1.linux-x64.tar.gz -> grafana-bin-5.1.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=86241239850506b72aa1c53a12ad40a1
diff --git a/metadata/md5-cache/www-apps/grafana-bin-5.1.2 b/metadata/md5-cache/www-apps/grafana-bin-5.1.2
new file mode 100644
index 000000000000..acde04af6409
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-5.1.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=5
+HOMEPAGE=https://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.1.2.linux-x64.tar.gz -> grafana-bin-5.1.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=86241239850506b72aa1c53a12ad40a1
diff --git a/metadata/md5-cache/www-apps/otrs-5.0.25 b/metadata/md5-cache/www-apps/otrs-5.0.25
index d581ac0019b8..4c5ea5cdac64 100644
--- a/metadata/md5-cache/www-apps/otrs-5.0.25
+++ b/metadata/md5-cache/www-apps/otrs-5.0.25
@@ -1,6 +1,6 @@
 DEFINED_PHASES=config install postinst prepare setup
 DEPEND=media-libs/libpng:0 virtual/pkgconfig
-DESCRIPTION=OTRS is an Open source Ticket Request System
+DESCRIPTION=An Open source Ticket Request System
 EAPI=6
 HOMEPAGE=https://www.otrs.com/
 IUSE=apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres )
 SLOT=0
 SRC_URI=https://ftp.otrs.org/pub/otrs/otrs-5.0.25.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=1058127987a3cab27504540f48dd14e1
+_md5_=8cc5abc4c34a6440a3ff0721dd0762a6
diff --git a/metadata/md5-cache/www-apps/otrs-6.0.3 b/metadata/md5-cache/www-apps/otrs-6.0.3
index 5ac3de2e6e45..b6f5b4df409e 100644
--- a/metadata/md5-cache/www-apps/otrs-6.0.3
+++ b/metadata/md5-cache/www-apps/otrs-6.0.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=config install postinst prepare setup
 DEPEND=media-libs/libpng:0 virtual/pkgconfig
-DESCRIPTION=OTRS is an Open source Ticket Request System
+DESCRIPTION=An Open source Ticket Request System
 EAPI=6
 HOMEPAGE=https://www.otrs.com/
 IUSE=apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres )
 SLOT=0
 SRC_URI=https://ftp.otrs.org/pub/otrs/otrs-6.0.3.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=6762beb9709a90ed8a1419fd08d07ed7
+_md5_=23c8bc622480bd643e2bcfd9dc4624c6
diff --git a/metadata/md5-cache/www-apps/otrs-6.0.4 b/metadata/md5-cache/www-apps/otrs-6.0.4
index 7741a1d727c3..207e5ca9d14f 100644
--- a/metadata/md5-cache/www-apps/otrs-6.0.4
+++ b/metadata/md5-cache/www-apps/otrs-6.0.4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=config install postinst prepare setup
 DEPEND=media-libs/libpng:0 virtual/pkgconfig
-DESCRIPTION=OTRS is an Open source Ticket Request System
+DESCRIPTION=An Open source Ticket Request System
 EAPI=6
 HOMEPAGE=https://www.otrs.com/
 IUSE=apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres )
 SLOT=0
 SRC_URI=https://ftp.otrs.org/pub/otrs/otrs-6.0.4.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=6762beb9709a90ed8a1419fd08d07ed7
+_md5_=23c8bc622480bd643e2bcfd9dc4624c6
diff --git a/metadata/md5-cache/www-apps/otrs-6.0.5 b/metadata/md5-cache/www-apps/otrs-6.0.5
index 7bd9be38a7f7..2433fdcee5e0 100644
--- a/metadata/md5-cache/www-apps/otrs-6.0.5
+++ b/metadata/md5-cache/www-apps/otrs-6.0.5
@@ -1,6 +1,6 @@
 DEFINED_PHASES=config install postinst prepare setup
 DEPEND=media-libs/libpng:0 virtual/pkgconfig
-DESCRIPTION=OTRS is an Open source Ticket Request System
+DESCRIPTION=An Open source Ticket Request System
 EAPI=6
 HOMEPAGE=https://www.otrs.com/
 IUSE=apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres )
 SLOT=0
 SRC_URI=https://ftp.otrs.org/pub/otrs/otrs-6.0.5.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=6762beb9709a90ed8a1419fd08d07ed7
+_md5_=23c8bc622480bd643e2bcfd9dc4624c6
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 9364b2e65573..deb6d855ced9 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-66.0.3359.139 b/metadata/md5-cache/www-client/chromium-66.0.3359.139
index 5b27c0aefe82..d333acd319d1 100644
--- a/metadata/md5-cache/www-client/chromium-66.0.3359.139
+++ b/metadata/md5-cache/www-client/chromium-66.0.3359.139
@@ -11,4 +11,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-66.0.3359.139.tar.xz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b8d341d0680d1797c6056d136bfeeb5b
+_md5_=0a19c9688108c89a39ef47bb897ae27a
diff --git a/metadata/md5-cache/www-client/chromium-67.0.3396.18 b/metadata/md5-cache/www-client/chromium-67.0.3396.18
deleted file mode 100644
index 2aef0551cf10..000000000000
--- a/metadata/md5-cache/www-client/chromium-67.0.3396.18
+++ /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.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-4:= || ( 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 >=sys-devel/clang-5 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 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 ~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-4:= || ( 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 )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-67.0.3396.18.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4fa1836e04f6e0a9ad640b35e4f71afa
diff --git a/metadata/md5-cache/www-client/chromium-67.0.3396.30 b/metadata/md5-cache/www-client/chromium-67.0.3396.30
index 0daba1f577f2..2c1827575517 100644
--- a/metadata/md5-cache/www-client/chromium-67.0.3396.30
+++ b/metadata/md5-cache/www-client/chromium-67.0.3396.30
@@ -3,12 +3,12 @@ DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups
 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 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
+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 ~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-4:= || ( 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 )
+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-4:= || ( 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-67.0.3396.30.tar.xz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4fa1836e04f6e0a9ad640b35e4f71afa
+_md5_=c073c9bc90a44e5b9db615fd5ccf322b
diff --git a/metadata/md5-cache/www-client/chromium-67.0.3396.40 b/metadata/md5-cache/www-client/chromium-67.0.3396.40
new file mode 100644
index 000000000000..e57ab836e51e
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-67.0.3396.40
@@ -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-4:= || ( 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 >=sys-devel/clang-5 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 ~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-4:= || ( 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-67.0.3396.40.tar.xz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c073c9bc90a44e5b9db615fd5ccf322b
diff --git a/metadata/md5-cache/www-client/chromium-68.0.3409.2 b/metadata/md5-cache/www-client/chromium-68.0.3409.2
index 33e79568c476..a9d23d994412 100644
--- a/metadata/md5-cache/www-client/chromium-68.0.3409.2
+++ b/metadata/md5-cache/www-client/chromium-68.0.3409.2
@@ -3,12 +3,12 @@ DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups
 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 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
+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 ~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-4:= || ( 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 )
+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-4:= || ( 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-68.0.3409.2.tar.xz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dc202d0dbb6416c46bb4ecb1213687c0
+_md5_=043c2c671cde18264b1d8c598d79f0fb
diff --git a/metadata/md5-cache/www-client/falkon-3.0.1 b/metadata/md5-cache/www-client/falkon-3.0.1
new file mode 100644
index 000000000000..423de32285e2
--- /dev/null
+++ b/metadata/md5-cache/www-client/falkon-3.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.43.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= x11-libs/xcb-util ) >=dev-qt/linguist-tools-5.9.2:5 >=dev-qt/qtconcurrent-5.9.2:5 gnome-keyring? ( virtual/pkgconfig ) >=kde-frameworks/ki18n-5.43.0 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 test? ( >=dev-qt/qttest-5.9.2:5 ) >=dev-qt/qtcore-5.9.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Cross-platform web browser using QtWebEngine
+EAPI=6
+HOMEPAGE=https://www.falkon.org/
+IUSE=dbus gnome-keyring kwallet libressl +X test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.43.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= x11-libs/xcb-util ) !www-client/qupzilla >=dev-qt/qtsvg-5.9.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.2:5
+SLOT=0
+SRC_URI=mirror://kde/stable/falkon/3.0.1/falkon-3.0.1.tar.xz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	3a3fabf7d35bc04d9617cdf1ecb07fcd	kde5-functions	1556eb322594eaaf87e5441e4e64052c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7e7d2af5767ef67ceb1bb2acbb594cfb
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-67.0.3396.30 b/metadata/md5-cache/www-client/google-chrome-beta-67.0.3396.30
deleted file mode 100644
index 679c73a6e8d5..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-67.0.3396.30
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_67.0.3396.30-1_amd64.deb
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a2fdea3123145b076af657b483bb997
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-67.0.3396.40 b/metadata/md5-cache/www-client/google-chrome-beta-67.0.3396.40
new file mode 100644
index 000000000000..b98a74a47577
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-67.0.3396.40
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_67.0.3396.40-1_amd64.deb
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8a2fdea3123145b076af657b483bb997
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-68.0.3418.2 b/metadata/md5-cache/www-client/google-chrome-unstable-68.0.3418.2
deleted file mode 100644
index 21f35fde79d3..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-68.0.3418.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_68.0.3418.2-1_amd64.deb
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f3bf237a83ecd802a636b64a7996448
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-68.0.3423.2 b/metadata/md5-cache/www-client/google-chrome-unstable-68.0.3423.2
new file mode 100644
index 000000000000..d2de562c0f4c
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-68.0.3423.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_68.0.3423.2-1_amd64.deb
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f3bf237a83ecd802a636b64a7996448
diff --git a/metadata/md5-cache/www-client/opera-52.0.2871.97 b/metadata/md5-cache/www-client/opera-52.0.2871.97
deleted file mode 100644
index a3b7c17ddfcb..000000000000
--- a/metadata/md5-cache/www-client/opera-52.0.2871.97
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=http://www.opera.com/
-IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=http://download1.operacdn.com/pub/opera/desktop/52.0.2871.97/linux/opera-stable_52.0.2871.97_amd64.deb http://download2.operacdn.com/pub/opera/desktop/52.0.2871.97/linux/opera-stable_52.0.2871.97_amd64.deb http://download3.operacdn.com/pub/opera/desktop/52.0.2871.97/linux/opera-stable_52.0.2871.97_amd64.deb http://download4.operacdn.com/pub/opera/desktop/52.0.2871.97/linux/opera-stable_52.0.2871.97_amd64.deb
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f8be215632c60a14d3dfee846ca70e1
diff --git a/metadata/md5-cache/www-client/opera-53.0.2907.37 b/metadata/md5-cache/www-client/opera-53.0.2907.37
new file mode 100644
index 000000000000..4e29f5820ae5
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-53.0.2907.37
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=http://download1.operacdn.com/pub/opera/desktop/53.0.2907.37/linux/opera-stable_53.0.2907.37_amd64.deb http://download2.operacdn.com/pub/opera/desktop/53.0.2907.37/linux/opera-stable_53.0.2907.37_amd64.deb http://download3.operacdn.com/pub/opera/desktop/53.0.2907.37/linux/opera-stable_53.0.2907.37_amd64.deb http://download4.operacdn.com/pub/opera/desktop/53.0.2907.37/linux/opera-stable_53.0.2907.37_amd64.deb
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4f8be215632c60a14d3dfee846ca70e1
diff --git a/metadata/md5-cache/www-client/opera-beta-53.0.2907.21 b/metadata/md5-cache/www-client/opera-beta-53.0.2907.21
deleted file mode 100644
index bcc91a2acd2d..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-53.0.2907.21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=http://www.opera.com/
-IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-beta/53.0.2907.21/linux/opera-beta_53.0.2907.21_amd64.deb http://download2.operacdn.com/pub/opera-beta/53.0.2907.21/linux/opera-beta_53.0.2907.21_amd64.deb http://download3.operacdn.com/pub/opera-beta/53.0.2907.21/linux/opera-beta_53.0.2907.21_amd64.deb http://download4.operacdn.com/pub/opera-beta/53.0.2907.21/linux/opera-beta_53.0.2907.21_amd64.deb )
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=70606416ac2911b0691c3d0d0018e07a
diff --git a/metadata/md5-cache/www-client/opera-developer-54.0.2934.0 b/metadata/md5-cache/www-client/opera-developer-54.0.2934.0
deleted file mode 100644
index cf75a9b6d14d..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-54.0.2934.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=http://www.opera.com/
-IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/54.0.2934.0/linux/opera-developer_54.0.2934.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/54.0.2934.0/linux/opera-developer_54.0.2934.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/54.0.2934.0/linux/opera-developer_54.0.2934.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/54.0.2934.0/linux/opera-developer_54.0.2934.0_amd64.deb )
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa0a012555bec1bb5e09a23f4458261d
diff --git a/metadata/md5-cache/www-client/opera-developer-54.0.2949.0 b/metadata/md5-cache/www-client/opera-developer-54.0.2949.0
new file mode 100644
index 000000000000..1b8158c49a0e
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-54.0.2949.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/54.0.2949.0/linux/opera-developer_54.0.2949.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/54.0.2949.0/linux/opera-developer_54.0.2949.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/54.0.2949.0/linux/opera-developer_54.0.2949.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/54.0.2949.0/linux/opera-developer_54.0.2949.0_amd64.deb )
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fa0a012555bec1bb5e09a23f4458261d
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1177.5_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1177.5_p1
new file mode 100644
index 000000000000..0ce932226bc8
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1177.5_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv >=sys-apps/sed-4
+DESCRIPTION=A new browser for our friends
+EAPI=5
+HOMEPAGE=http://vivaldi.com/
+IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1177.5-1_amd64.deb -> vivaldi-snapshot-1.16.1177.5_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1177.5-1_armhf.deb -> vivaldi-snapshot-1.16.1177.5_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1177.5-1_i386.deb -> vivaldi-snapshot-1.16.1177.5_p1-i386.deb )
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=616ce77bbc4678d8da6e1c745fa323b4
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 4ccd13bd349c..bec4159a9ace 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-29.0.0.140 b/metadata/md5-cache/www-plugins/adobe-flash-29.0.0.140
deleted file mode 100644
index ffc64f287eff..000000000000
--- a/metadata/md5-cache/www-plugins/adobe-flash-29.0.0.140
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test unpack
-DEPEND=>=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Adobe Flash Player
-EAPI=6
-HOMEPAGE=https://www.adobe.com/products/flashplayer.html https://get.adobe.com/flashplayer/ https://helpx.adobe.com/security/products/flash-player.html
-IUSE=+nsplugin +ppapi abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 x86
-LICENSE=AdobeFlash-11.x
-RDEPEND=!www-plugins/chrome-binary-plugins[flash(-)] nsplugin? ( dev-libs/atk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nss[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/glibc-2.4 x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !www-plugins/adobe-flash:0 )
-REQUIRED_USE=|| ( nsplugin ppapi )
-RESTRICT=strip mirror
-SLOT=22
-SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/29.0.0.140/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-29.0.0.140-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/29.0.0.140/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-29.0.0.140-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/29.0.0.140/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-29.0.0.140-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/29.0.0.140/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-29.0.0.140-ppapi.x86_64.tar.gz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=493fc181efb99a52f53329878f9e5958
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-29.0.0.171 b/metadata/md5-cache/www-plugins/adobe-flash-29.0.0.171
new file mode 100644
index 000000000000..6827af65aec8
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/adobe-flash-29.0.0.171
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm test unpack
+DEPEND=>=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Adobe Flash Player
+EAPI=6
+HOMEPAGE=https://www.adobe.com/products/flashplayer.html https://get.adobe.com/flashplayer/ https://helpx.adobe.com/security/products/flash-player.html
+IUSE=+nsplugin +ppapi abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=-* amd64 x86
+LICENSE=AdobeFlash-11.x
+RDEPEND=!www-plugins/chrome-binary-plugins[flash(-)] nsplugin? ( dev-libs/atk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nss[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/glibc-2.4 x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !www-plugins/adobe-flash:0 )
+REQUIRED_USE=|| ( nsplugin ppapi )
+RESTRICT=strip mirror
+SLOT=22
+SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/29.0.0.171/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-29.0.0.171-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/29.0.0.171/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-29.0.0.171-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/29.0.0.171/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-29.0.0.171-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/29.0.0.171/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-29.0.0.171-ppapi.x86_64.tar.gz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=493fc181efb99a52f53329878f9e5958
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.30_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.30_beta
deleted file mode 100644
index 83c8592b70a1..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.30_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_67.0.3396.30-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=867413b03b94a7908f0373ccd5ea7ea1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.40_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.40_beta
new file mode 100644
index 000000000000..26e28efbc51d
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.40_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_67.0.3396.40-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=867413b03b94a7908f0373ccd5ea7ea1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3418.2_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3418.2_alpha
deleted file mode 100644
index 7de7d98f2f31..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3418.2_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=5
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
-RESTRICT=bindist mirror strip
-SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_68.0.3418.2-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=867413b03b94a7908f0373ccd5ea7ea1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3423.2_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3423.2_alpha
new file mode 100644
index 000000000000..558aea699d77
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3423.2_alpha
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=5
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
+RESTRICT=bindist mirror strip
+SLOT=unstable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_68.0.3423.2-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=867413b03b94a7908f0373ccd5ea7ea1
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index f2f8f26df623..2ba15850a8d8 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/h2o-2.2.4 b/metadata/md5-cache/www-servers/h2o-2.2.4
index 5be2e7a55464..05561cc751ee 100644
--- a/metadata/md5-cache/www-servers/h2o-2.2.4
+++ b/metadata/md5-cache/www-servers/h2o-2.2.4
@@ -10,4 +10,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/h2o/h2o/archive/v2.2.4.tar.gz -> h2o-2.2.4.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=865d9b59235c32f9b0ecb464a25af8f9
+_md5_=32e74329a82b9ba5226a7e5a01b4ab8c
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.45 b/metadata/md5-cache/www-servers/lighttpd-1.4.45
deleted file mode 100644
index 4cea526226c1..000000000000
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.45
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) virtual/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Lightweight high-performance web server
-EAPI=6
-HOMEPAGE=https://www.lighttpd.net/
-IUSE=bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
-LICENSE=BSD GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
-REQUIRED_USE=kerberos? ( ssl !libressl )
-SLOT=0
-SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.45.tar.xz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a4614d76a6f69c732576612d0066c434
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.45-r1 b/metadata/md5-cache/www-servers/lighttpd-1.4.45-r1
index 74761a09908b..95b0f9452097 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.45-r1
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.45-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) virtual/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=Lightweight high-performance web server
 EAPI=6
-HOMEPAGE=https://www.lighttpd.net/
+HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
 IUSE=bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=BSD GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=kerberos? ( ssl !libressl )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.45.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5c63ebe53f7f983e194cac1b8215af98
+_md5_=50bee2a811b43e947662d8b994b7ec20
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.49 b/metadata/md5-cache/www-servers/lighttpd-1.4.49
index 49cdb5fef59b..c7dddb0ec20f 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.49
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.49
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) virtual/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=Lightweight high-performance web server
 EAPI=6
-HOMEPAGE=https://www.lighttpd.net/
+HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
 IUSE=bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=kerberos? ( ssl !libressl ) webdav? ( sqlite )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.49.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee7a90e7df24710451a3d3e48950e2ef
+_md5_=b3cfec1b163a2e14d79c47a9ba79c519
diff --git a/metadata/md5-cache/www-servers/lighttpd-9999 b/metadata/md5-cache/www-servers/lighttpd-9999
index 206f80885a4e..12585d7b3130 100644
--- a/metadata/md5-cache/www-servers/lighttpd-9999
+++ b/metadata/md5-cache/www-servers/lighttpd-9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) virtual/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Lightweight high-performance web server
 EAPI=6
-HOMEPAGE=https://www.lighttpd.net/
+HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
 IUSE=bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib
 LICENSE=BSD GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
 REQUIRED_USE=kerberos? ( ssl !libressl )
 SLOT=0
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8dbebaaabcedcff1ee263f68fa7f2b84
+_md5_=d39a08a263c0b420c5b8c650f11c2f1b
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 2eae3f6beeee..8b469a87d318 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.15 b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.15
index d995ea5de86e..fc4b6ccbee41 100644
--- a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.15
+++ b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.15
@@ -4,11 +4,11 @@ DESCRIPTION=Intel GPU userland tools
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
 IUSE=test-programs unwind video_cards_nouveau
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 >=x11-libs/cairo-1.12.0 >=x11-libs/libdrm-2.4.64[video_cards_intel,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 unwind? ( sys-libs/libunwind )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/intel-gpu-tools-1.15.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	eb955306a9e6a3d4eae89e689718d4f0
-_md5_=cb42810b2a0d4a2bbe8276fc7a468d43
+_md5_=053e339b893fd2cbc50d5508a2a212ec
diff --git a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.20 b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.20
index 46be55571441..9f5cc5b6282b 100644
--- a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.20
+++ b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.20
@@ -4,7 +4,7 @@ DESCRIPTION=Intel GPU userland tools
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
 IUSE=alsa glib gsl sound test-programs udev unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv
-KEYWORDS=amd64 ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=sys-apps/kmod:= sys-process/procps:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 alsa? ( media-libs/alsa-lib:= ) glib? ( dev-libs/glib:2 ) gsl? ( sci-libs/gsl ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) video_cards_intel? ( sys-libs/zlib:= ) xrandr? ( >=x11-libs/libXrandr-1.3 ) amd64? ( xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) x86? ( xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) )
 REQUIRED_USE=test-programs? ( sound? ( alsa gsl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/intel-gpu-tools-1.20.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	eb955306a9e6a3d4eae89e689718d4f0
-_md5_=5afaf5b82b2baf084bd24d92f5c49ab6
+_md5_=ff27122ba03dbb964b0be54a00d43dbf
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 4b73bb34155c..7aea74bd1d1a 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-1.20 b/metadata/md5-cache/x11-base/xorg-drivers-1.20
new file mode 100644
index 000000000000..2e0c966e6b9f
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-drivers-1.20
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package containing deps on all xorg drivers
+EAPI=5
+HOMEPAGE=https://www.gentoo.org/
+IUSE=video_cards_amdgpu video_cards_ast video_cards_dummy video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i915 video_cards_i965 video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_siliconmotion video_cards_tdfx video_cards_tegra video_cards_vc4 video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_nvidia input_devices_elographics input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=metapackage
+PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_freedreno? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omap? ( x11-drivers/xf86-video-omap ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tegra? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( || ( x11-drivers/xf86-video-vboxvideo x11-drivers/xf86-video-virtualbox ) ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-apm !x11-drivers/xf86-video-ark !x11-drivers/xf86-video-chips !x11-drivers/xf86-video-cirrus !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-i128 !x11-drivers/xf86-video-i740 !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-mach64 !x11-drivers/xf86-video-neomagic !x11-drivers/xf86-video-newport !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-rendition !x11-drivers/xf86-video-s3 !x11-drivers/xf86-video-s3virge !x11-drivers/xf86-video-savage !x11-drivers/xf86-video-sis !x11-drivers/xf86-video-sisusb !x11-drivers/xf86-video-sunbw2 !x11-drivers/xf86-video-suncg14 !x11-drivers/xf86-video-suncg3 !x11-drivers/xf86-video-suncg6 !x11-drivers/xf86-video-sunffb !x11-drivers/xf86-video-sunleo !x11-drivers/xf86-video-suntcx !x11-drivers/xf86-video-tga !x11-drivers/xf86-video-trident !x11-drivers/xf86-video-tseng !<x11-drivers/xf86-input-evdev-2.10.4 !<x11-drivers/xf86-input-joystick-1.6.3 !<x11-drivers/xf86-input-libinput-0.20.0 !<x11-drivers/xf86-input-wacom-0.34.0 !<x11-drivers/xf86-video-amdgpu-1.2.0 !<x11-drivers/xf86-video-ati-7.8.0 !<x11-drivers/xf86-video-glint-1.2.9 !<x11-drivers/xf86-video-intel-2.99.917_p20160122 !<x11-drivers/xf86-video-mga-1.6.5 !<x11-drivers/xf86-video-nouveau-1.0.13 !<x11-drivers/xf86-video-nv-2.1.21 !<x11-drivers/xf86-video-omap-0.4.5 !<x11-drivers/xf86-video-r128-6.10.2 !<x11-drivers/xf86-video-siliconmotion-1.7.9 !<x11-drivers/xf86-video-tdfx-1.4.7 !<x11-drivers/xf86-video-virtualbox-5.1.14 !<x11-drivers/xf86-video-vmware-13.2.1
+SLOT=0
+_md5_=f94299710774fe2570b83243f8176144
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.19.99.904 b/metadata/md5-cache/x11-base/xorg-server-1.19.99.904
deleted file mode 100644
index 97a0b19a3113..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.19.99.904
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) sys-devel/flex >=x11-base/xorg-proto-2018.3 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org X servers
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.19 )
-RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
-REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xephyr? ( kdrive )
-SLOT=0/1.19.99.904
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.19.99.904.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xorg-2	eb955306a9e6a3d4eae89e689718d4f0
-_md5_=ba503263685b58d66406bc8cb6e5f7c8
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.19.99.905 b/metadata/md5-cache/x11-base/xorg-server-1.19.99.905
deleted file mode 100644
index 243388c32786..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.19.99.905
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) sys-devel/flex >=x11-base/xorg-proto-2018.3 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org X servers
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.19 )
-RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
-REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xephyr? ( kdrive )
-SLOT=0/1.19.99.905
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.19.99.905.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xorg-2	eb955306a9e6a3d4eae89e689718d4f0
-_md5_=844a9beec8d6fe1fc1b60df39a9784fa
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.0 b/metadata/md5-cache/x11-base/xorg-server-1.20.0
new file mode 100644
index 000000000000..50607f8eaa7d
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) sys-devel/flex >=x11-base/xorg-proto-2018.3 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DESCRIPTION=X.Org X servers
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/
+IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity static-libs doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=MIT
+PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
+RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
+REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xephyr? ( kdrive )
+SLOT=0/1.20.0
+SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.0.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xorg-2	eb955306a9e6a3d4eae89e689718d4f0
+_md5_=844a9beec8d6fe1fc1b60df39a9784fa
diff --git a/metadata/md5-cache/x11-base/xorg-x11-7.4-r2 b/metadata/md5-cache/x11-base/xorg-x11-7.4-r2
deleted file mode 100644
index 310e338f8a3f..000000000000
--- a/metadata/md5-cache/x11-base/xorg-x11-7.4-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst preinst
-DEPEND=x11-base/xorg-server[-minimal] x11-apps/appres x11-apps/bitmap x11-apps/iceauth x11-apps/luit x11-apps/mkfontdir x11-apps/mkfontscale x11-apps/sessreg x11-apps/setxkbmap x11-apps/smproxy x11-apps/x11perf x11-apps/xauth x11-apps/xbacklight x11-apps/xcmsdb x11-apps/xcursorgen x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xev x11-apps/xf86dga x11-apps/xgamma x11-apps/xhost x11-apps/xinput x11-apps/xkbcomp x11-apps/xkbevd x11-apps/xkbutils x11-apps/xkill x11-apps/xlsatoms x11-apps/xlsclients x11-apps/xmodmap x11-apps/xpr x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xrefresh x11-apps/xset x11-apps/xsetroot x11-apps/xvinfo x11-apps/xwd x11-apps/xwininfo x11-apps/xwud x11-misc/xbitmaps x11-themes/xcursor-themes x11-misc/makedepend x11-misc/util-macros media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-adobe-utopia-100dpi media-fonts/font-adobe-utopia-75dpi media-fonts/font-adobe-utopia-type1 media-fonts/font-alias media-fonts/font-arabic-misc media-fonts/font-bh-100dpi media-fonts/font-bh-75dpi media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi media-fonts/font-bh-ttf media-fonts/font-bh-type1 media-fonts/font-bitstream-100dpi media-fonts/font-bitstream-75dpi media-fonts/font-bitstream-speedo media-fonts/font-bitstream-type1 media-fonts/font-cronyx-cyrillic media-fonts/font-cursor-misc media-fonts/font-daewoo-misc media-fonts/font-dec-misc media-fonts/font-ibm-type1 media-fonts/font-isas-misc media-fonts/font-jis-misc media-fonts/font-micro-misc media-fonts/font-misc-cyrillic media-fonts/font-misc-ethiopic media-fonts/font-misc-meltho media-fonts/font-misc-misc media-fonts/font-mutt-misc media-fonts/font-schumacher-misc media-fonts/font-screen-cyrillic media-fonts/font-sony-misc media-fonts/font-sun-misc media-fonts/font-util media-fonts/font-winitzki-cyrillic media-fonts/font-xfree86-type1 media-fonts/font-alias media-fonts/font-util media-fonts/encodings
-DESCRIPTION=An X11 implementation maintained by the X.Org Foundation (meta package)
-EAPI=2
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=metapackage
-RDEPEND=x11-base/xorg-server[-minimal] x11-apps/appres x11-apps/bitmap x11-apps/iceauth x11-apps/luit x11-apps/mkfontdir x11-apps/mkfontscale x11-apps/sessreg x11-apps/setxkbmap x11-apps/smproxy x11-apps/x11perf x11-apps/xauth x11-apps/xbacklight x11-apps/xcmsdb x11-apps/xcursorgen x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xev x11-apps/xf86dga x11-apps/xgamma x11-apps/xhost x11-apps/xinput x11-apps/xkbcomp x11-apps/xkbevd x11-apps/xkbutils x11-apps/xkill x11-apps/xlsatoms x11-apps/xlsclients x11-apps/xmodmap x11-apps/xpr x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xrefresh x11-apps/xset x11-apps/xsetroot x11-apps/xvinfo x11-apps/xwd x11-apps/xwininfo x11-apps/xwud x11-misc/xbitmaps x11-themes/xcursor-themes x11-misc/makedepend x11-misc/util-macros media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-adobe-utopia-100dpi media-fonts/font-adobe-utopia-75dpi media-fonts/font-adobe-utopia-type1 media-fonts/font-alias media-fonts/font-arabic-misc media-fonts/font-bh-100dpi media-fonts/font-bh-75dpi media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi media-fonts/font-bh-ttf media-fonts/font-bh-type1 media-fonts/font-bitstream-100dpi media-fonts/font-bitstream-75dpi media-fonts/font-bitstream-speedo media-fonts/font-bitstream-type1 media-fonts/font-cronyx-cyrillic media-fonts/font-cursor-misc media-fonts/font-daewoo-misc media-fonts/font-dec-misc media-fonts/font-ibm-type1 media-fonts/font-isas-misc media-fonts/font-jis-misc media-fonts/font-micro-misc media-fonts/font-misc-cyrillic media-fonts/font-misc-ethiopic media-fonts/font-misc-meltho media-fonts/font-misc-misc media-fonts/font-mutt-misc media-fonts/font-schumacher-misc media-fonts/font-screen-cyrillic media-fonts/font-sony-misc media-fonts/font-sun-misc media-fonts/font-util media-fonts/font-winitzki-cyrillic media-fonts/font-xfree86-type1 media-fonts/font-alias media-fonts/font-util media-fonts/encodings
-SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9d40a87c5007e0396735657efd4d7951
diff --git a/metadata/md5-cache/x11-base/xorg-x11-7.4-r3 b/metadata/md5-cache/x11-base/xorg-x11-7.4-r3
new file mode 100644
index 000000000000..20542fcd6c83
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-x11-7.4-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DEPEND=x11-base/xorg-server[-minimal] x11-apps/appres x11-apps/bitmap x11-apps/iceauth x11-apps/luit x11-apps/mkfontdir x11-apps/mkfontscale x11-apps/sessreg x11-apps/setxkbmap x11-apps/smproxy x11-apps/x11perf x11-apps/xauth || ( x11-apps/xbacklight sys-power/acpilight ) x11-apps/xcmsdb x11-apps/xcursorgen x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xev x11-apps/xf86dga x11-apps/xgamma x11-apps/xhost x11-apps/xinput x11-apps/xkbcomp x11-apps/xkbevd x11-apps/xkbutils x11-apps/xkill x11-apps/xlsatoms x11-apps/xlsclients x11-apps/xmodmap x11-apps/xpr x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xrefresh x11-apps/xset x11-apps/xsetroot x11-apps/xvinfo x11-apps/xwd x11-apps/xwininfo x11-apps/xwud x11-misc/xbitmaps x11-themes/xcursor-themes x11-misc/makedepend x11-misc/util-macros fonts? ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-adobe-utopia-100dpi media-fonts/font-adobe-utopia-75dpi media-fonts/font-adobe-utopia-type1 media-fonts/font-alias media-fonts/font-arabic-misc media-fonts/font-bh-100dpi media-fonts/font-bh-75dpi media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi media-fonts/font-bh-ttf media-fonts/font-bh-type1 media-fonts/font-bitstream-100dpi media-fonts/font-bitstream-75dpi media-fonts/font-bitstream-speedo media-fonts/font-bitstream-type1 media-fonts/font-cronyx-cyrillic media-fonts/font-cursor-misc media-fonts/font-daewoo-misc media-fonts/font-dec-misc media-fonts/font-ibm-type1 media-fonts/font-isas-misc media-fonts/font-jis-misc media-fonts/font-micro-misc media-fonts/font-misc-cyrillic media-fonts/font-misc-ethiopic media-fonts/font-misc-meltho media-fonts/font-misc-misc media-fonts/font-mutt-misc media-fonts/font-schumacher-misc media-fonts/font-screen-cyrillic media-fonts/font-sony-misc media-fonts/font-sun-misc media-fonts/font-util media-fonts/font-winitzki-cyrillic media-fonts/font-xfree86-type1 media-fonts/font-alias media-fonts/font-util media-fonts/encodings )
+DESCRIPTION=An X11 implementation maintained by the X.Org Foundation (meta package)
+EAPI=6
+HOMEPAGE=https://www.x.org/wiki/
+IUSE=+fonts
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=metapackage
+RDEPEND=x11-base/xorg-server[-minimal] x11-apps/appres x11-apps/bitmap x11-apps/iceauth x11-apps/luit x11-apps/mkfontdir x11-apps/mkfontscale x11-apps/sessreg x11-apps/setxkbmap x11-apps/smproxy x11-apps/x11perf x11-apps/xauth || ( x11-apps/xbacklight sys-power/acpilight ) x11-apps/xcmsdb x11-apps/xcursorgen x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xev x11-apps/xf86dga x11-apps/xgamma x11-apps/xhost x11-apps/xinput x11-apps/xkbcomp x11-apps/xkbevd x11-apps/xkbutils x11-apps/xkill x11-apps/xlsatoms x11-apps/xlsclients x11-apps/xmodmap x11-apps/xpr x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xrefresh x11-apps/xset x11-apps/xsetroot x11-apps/xvinfo x11-apps/xwd x11-apps/xwininfo x11-apps/xwud x11-misc/xbitmaps x11-themes/xcursor-themes x11-misc/makedepend x11-misc/util-macros fonts? ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-adobe-utopia-100dpi media-fonts/font-adobe-utopia-75dpi media-fonts/font-adobe-utopia-type1 media-fonts/font-alias media-fonts/font-arabic-misc media-fonts/font-bh-100dpi media-fonts/font-bh-75dpi media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi media-fonts/font-bh-ttf media-fonts/font-bh-type1 media-fonts/font-bitstream-100dpi media-fonts/font-bitstream-75dpi media-fonts/font-bitstream-speedo media-fonts/font-bitstream-type1 media-fonts/font-cronyx-cyrillic media-fonts/font-cursor-misc media-fonts/font-daewoo-misc media-fonts/font-dec-misc media-fonts/font-ibm-type1 media-fonts/font-isas-misc media-fonts/font-jis-misc media-fonts/font-micro-misc media-fonts/font-misc-cyrillic media-fonts/font-misc-ethiopic media-fonts/font-misc-meltho media-fonts/font-misc-misc media-fonts/font-mutt-misc media-fonts/font-schumacher-misc media-fonts/font-screen-cyrillic media-fonts/font-sony-misc media-fonts/font-sun-misc media-fonts/font-util media-fonts/font-winitzki-cyrillic media-fonts/font-xfree86-type1 media-fonts/font-alias media-fonts/font-util media-fonts/encodings )
+SLOT=0
+_md5_=2ef14114cce2a2652ff337aa6a81687d
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 3ba5393e6648..07fffacd5a95 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.3 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.3
index b26f39a3b9b8..4ce987f1de9f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.3
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 >=app-port
 DESCRIPTION=Generic VESA video driver
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=-* alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* alpha amd64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-vesa-2.3.3.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	eb955306a9e6a3d4eae89e689718d4f0
-_md5_=45e8f24695c2daa0ff3bef86062d60d5
+_md5_=4a2083efd1b869e99db4196a5800683a
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.4 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.4
index 38e8cd61c0f4..da266b64abb2 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.4
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.6 >=x11-libs/libpciaccess-0.12.901 >=app-portage
 DESCRIPTION=Generic VESA video driver
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=-* alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* alpha amd64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 >=x11-libs/libpciaccess-0.12.901 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-vesa-2.3.4.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xorg-2	eb955306a9e6a3d4eae89e689718d4f0
-_md5_=d5a23f14074b3ddffff99e475fc2ef26
+_md5_=7f1da616e39a2c4606ca85b0d7808426
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0
index 5fc2fc952705..66c72a0c2911 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.6 >=x11-libs/libpciaccess-0.12.901 >=app-portage
 DESCRIPTION=Generic VESA video driver
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=-* alpha amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* alpha amd64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 >=x11-libs/libpciaccess-0.12.901 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-vesa-2.4.0.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xorg-2	eb955306a9e6a3d4eae89e689718d4f0
-_md5_=056a880dd6c8ae768b79dfb255bf823a
+_md5_=400530ba569d8bd0889ac929b9f5ebe3
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.32 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.32
deleted file mode 100644
index 8068ab5b57d3..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.32
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite python_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-lang/yasm-0.6.2 >=dev-util/kbuild-0.1.9998_pre20131130 sys-power/iasl x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2.4.5 )
-DESCRIPTION=VirtualBox X11 video driver for Gentoo guest
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=dri python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=dri? ( ~app-emulation/virtualbox-guest-additions-5.1.32 )
-RDEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite python_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=https://download.virtualbox.org/virtualbox/5.1.32/VirtualBox-5.1.32.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f9ca25196ea2084e448006c2ae3d1ab2
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.34 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.34
deleted file mode 100644
index 7c20370ef891..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.34
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite python_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-lang/yasm-0.6.2 >=dev-util/kbuild-0.1.9998_pre20131130 sys-power/iasl x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2.4.5 )
-DESCRIPTION=VirtualBox X11 video driver for Gentoo guest
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=dri python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=dri? ( ~app-emulation/virtualbox-guest-additions-5.1.34 )
-RDEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite python_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=https://download.virtualbox.org/virtualbox/5.1.34/VirtualBox-5.1.34.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=999b9140053e9418db95f9e3f3c006d5
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.36 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.36
index 6424dbd3fa0b..a42d7b478bc9 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.36
+++ b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.36
@@ -4,7 +4,7 @@ DESCRIPTION=VirtualBox X11 video driver for Gentoo guest
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=dri python_targets_python2_7
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=dri? ( ~app-emulation/virtualbox-guest-additions-5.1.36 )
 RDEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite python_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(+)]
@@ -12,4 +12,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.36/VirtualBox-5.1.36.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1c7c9816f718bfeb420cb55e78ff2cd0
+_md5_=f9ca25196ea2084e448006c2ae3d1ab2
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.38 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.38
new file mode 100644
index 000000000000..3810ea1dea55
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.38
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite python_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-lang/yasm-0.6.2 >=dev-util/kbuild-0.1.9998_pre20131130 sys-power/iasl x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2.4.5 )
+DESCRIPTION=VirtualBox X11 video driver for Gentoo guest
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=dri python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=dri? ( ~app-emulation/virtualbox-guest-additions-5.1.38 )
+RDEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite python_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=https://download.virtualbox.org/virtualbox/5.1.38/VirtualBox-5.1.38.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=999b9140053e9418db95f9e3f3c006d5
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 0e2390fcfbad..236c38b89b08 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/goffice-0.10.40 b/metadata/md5-cache/x11-libs/goffice-0.10.40
deleted file mode 100644
index e0ef8f3452ed..000000000000
--- a/metadata/md5-cache/x11-libs/goffice-0.10.40
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.38.0:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24:= >=x11-libs/cairo-1.10:=[svg] x11-libs/libXext:= x11-libs/libXrender:= >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= ) dev-lang/perl virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/perl-Compress-Raw-Zlib >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35 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 library of document-centric objects and utilities
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/goffice/
-IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.38.0:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24:= >=x11-libs/cairo-1.10:=[svg] x11-libs/libXext:= x11-libs/libXrender:= >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
-SLOT=0.10
-SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.40.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c9730b08e9a3582097cf337780268c0
diff --git a/metadata/md5-cache/x11-libs/goffice-0.10.41 b/metadata/md5-cache/x11-libs/goffice-0.10.41
new file mode 100644
index 000000000000..00fb66eff611
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/goffice-0.10.41
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.38.0:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24:= >=x11-libs/cairo-1.10:=[svg] x11-libs/libXext:= x11-libs/libXrender:= >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= ) dev-lang/perl virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/perl-Compress-Raw-Zlib >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35 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 library of document-centric objects and utilities
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/goffice/
+IUSE=+introspection
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.38.0:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24:= >=x11-libs/cairo-1.10:=[svg] x11-libs/libXext:= x11-libs/libXrender:= >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
+SLOT=0.10
+SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.41.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3c9730b08e9a3582097cf337780268c0
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.82 b/metadata/md5-cache/x11-libs/libdrm-2.4.82
deleted file mode 100644
index ccb3611f0bf0..000000000000
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.82
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.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(-)?] ) valgrind? ( dev-util/valgrind ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org libdrm library
-EAPI=5
-HOMEPAGE=https://dri.freedesktop.org/
-IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.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(-)?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.82.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	eb955306a9e6a3d4eae89e689718d4f0
-_md5_=65007ef3e3a49790d8b31eaf2f0a75c0
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.88 b/metadata/md5-cache/x11-libs/libdrm-2.4.88
deleted file mode 100644
index b60ee1f418b8..000000000000
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.88
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.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(-)?] ) valgrind? ( dev-util/valgrind ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org libdrm library
-EAPI=5
-HOMEPAGE=https://dri.freedesktop.org/
-IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.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(-)?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.88.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	eb955306a9e6a3d4eae89e689718d4f0
-_md5_=a2928883b80de999427a47696386d6a4
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.90 b/metadata/md5-cache/x11-libs/libdrm-2.4.90
deleted file mode 100644
index 1cf60870d637..000000000000
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.90
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.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(-)?] ) valgrind? ( dev-util/valgrind ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org libdrm library
-EAPI=5
-HOMEPAGE=https://dri.freedesktop.org/
-IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.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(-)?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.90.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	eb955306a9e6a3d4eae89e689718d4f0
-_md5_=b2601d9c7c220e439240202e6079e711
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.92 b/metadata/md5-cache/x11-libs/libdrm-2.4.92
new file mode 100644
index 000000000000..b5546b44fa4f
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.92
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.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(-)?] ) video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/meson-0.43.0 valgrind? ( dev-util/valgrind ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=X.Org libdrm library
+EAPI=6
+HOMEPAGE=https://dri.freedesktop.org/
+IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.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(-)?] ) video_cards_intel? ( >=x11-libs/libpciaccess-0.13.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(-)?] )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.92.tar.bz2
+_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=ab0a93308d6849818660b194e3c109ec
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index f8c44b0f05c2..af6bec783cf3 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/i3blocks-1.4-r1 b/metadata/md5-cache/x11-misc/i3blocks-1.4-r1
index 3d1ee71dcf49..306e217884e4 100644
--- a/metadata/md5-cache/x11-misc/i3blocks-1.4-r1
+++ b/metadata/md5-cache/x11-misc/i3blocks-1.4-r1
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://github.com/vivien/i3blocks
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=app-admin/sysstat media-sound/playerctl sys-apps/lm_sensors sys-power/acpi x11-wm/i3
+RDEPEND=app-admin/sysstat media-sound/playerctl sys-apps/lm_sensors sys-power/acpi || ( x11-wm/i3 x11-wm/i3-gaps )
 SLOT=0
 SRC_URI=https://github.com/vivien/i3blocks/archive/1.4.tar.gz -> i3blocks-1.4.tar.gz
-_md5_=79a7dc6b0d19bab7f296d9e873498419
+_md5_=6db2e66cae8c84b7655b8f9ca1cc95e4
diff --git a/metadata/md5-cache/x11-misc/i3status-2.11 b/metadata/md5-cache/x11-misc/i3status-2.11
index 1b02df70dad3..3002b93bcc24 100644
--- a/metadata/md5-cache/x11-misc/i3status-2.11
+++ b/metadata/md5-cache/x11-misc/i3status-2.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/confuse:= dev-libs/libnl:3 >=dev-libs/yajl-2.0.2 media-libs/alsa-lib pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=https://i3wm.org/i3status/i3status-2.11.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	29a56915716950cd3d23630cede80d68	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5e4e217f3defd2aa1dc58a5da95ee55b
diff --git a/metadata/md5-cache/x11-misc/polybar-3.1.0 b/metadata/md5-cache/x11-misc/polybar-3.1.0
index cebda50e6d12..96590e3bd7a5 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.1.0
+++ b/metadata/md5-cache/x11-misc/polybar-3.1.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(+)] x11-base/xcb-proto x11-libs/libxcb x11-libs/xcb-util-wm x11-libs/xcb-util-image alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) sys-devel/make >=dev-util/cmake-3.9.6
+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(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A fast and easy-to-use tool for creating status bars
 EAPI=6
 HOMEPAGE=https://github.com/jaagr/polybar
 IUSE=alsa curl i3wm ipc mpd network python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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(+)] x11-base/xcb-proto x11-libs/libxcb x11-libs/xcb-util-wm x11-libs/xcb-util-image alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools )
+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(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/jaagr/polybar/archive/3.1.0.tar.gz -> polybar-3.1.0.tar.gz https://github.com/jaagr/xpp/archive/1.4.0.tar.gz -> xpp-1.4.0.tar.gz https://github.com/jaagr/i3ipcpp/archive/v0.7.1.tar.gz -> i3ipcpp-0.7.1.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ae5bf9f9976e6060d354dc8892adfae5
+_md5_=425d5d358062beabd566afcddec73b53
diff --git a/metadata/md5-cache/x11-misc/polybar-9999 b/metadata/md5-cache/x11-misc/polybar-9999
index 53338e84aadd..a26af0a74b2c 100644
--- a/metadata/md5-cache/x11-misc/polybar-9999
+++ b/metadata/md5-cache/x11-misc/polybar-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/libxcb x11-libs/xcb-util-wm x11-libs/xcb-util-image alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1
+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(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A fast and easy-to-use tool for creating status bars
 EAPI=6
 HOMEPAGE=https://github.com/jaagr/polybar
 IUSE=alsa curl i3wm ipc mpd network pulseaudio python_targets_python2_7
 LICENSE=MIT
-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(+)] x11-base/xcb-proto x11-libs/libxcb x11-libs/xcb-util-wm x11-libs/xcb-util-image alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
+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(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0b70f53a515c61500a7f4031bde8825
+_md5_=5b7561eb6156d6f4c1c2876a94ab4bb8
diff --git a/metadata/md5-cache/x11-misc/slock-1.4 b/metadata/md5-cache/x11-misc/slock-1.4
index 1a4d60bb1be0..794cd712be0f 100644
--- a/metadata/md5-cache/x11-misc/slock-1.4
+++ b/metadata/md5-cache/x11-misc/slock-1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/slock-1.4.tar.gz
-_eclasses_=fcaps	29a56915716950cd3d23630cede80d68	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=9bfcbaf1a3b012f55a8dd17f2ab972a1
diff --git a/metadata/md5-cache/x11-misc/xbattbar-1.4.3 b/metadata/md5-cache/x11-misc/xbattbar-1.4.3
deleted file mode 100644
index 6a07e49f9e87..000000000000
--- a/metadata/md5-cache/x11-misc/xbattbar-1.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl x11-libs/libX11
-DESCRIPTION=Advanced Power Management battery status display for X
-EAPI=2
-HOMEPAGE=https://packages.qa.debian.org/x/xbattbar.html
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl x11-libs/libX11 !ppc? ( >=sys-power/acpi-1.5 )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xbattbar/xbattbar_1.4.3.orig.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=703d09b49f8953c987f30d2fc3f15c66
diff --git a/metadata/md5-cache/x11-misc/xbattbar-1.4.8 b/metadata/md5-cache/x11-misc/xbattbar-1.4.8
index 0fd6f33672d1..fee0bb60ad6d 100644
--- a/metadata/md5-cache/x11-misc/xbattbar-1.4.8
+++ b/metadata/md5-cache/x11-misc/xbattbar-1.4.8
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced Power Management battery status display for X
 EAPI=5
 HOMEPAGE=https://packages.qa.debian.org/x/xbattbar.html
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl x11-libs/libX11 python_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(+)] !ppc? ( >=sys-power/acpi-1.5 )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xbattbar/xbattbar_1.4.8.orig.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d27048944bda127e1251685aa1742837
+_md5_=8eabe25b82b7599a86d093d95f0e3426
diff --git a/metadata/md5-cache/x11-misc/xfe-1.42 b/metadata/md5-cache/x11-misc/xfe-1.42
index df66b0dcc158..0c0babe9d869 100644
--- a/metadata/md5-cache/x11-misc/xfe-1.42
+++ b/metadata/md5-cache/x11-misc/xfe-1.42
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libpng:0 x11-libs/fox:1.6[png,truetype] x11-libs/libX11 x11-l
 SLOT=0
 SRC_URI=mirror://sourceforge/xfe/xfe/1.42/xfe-1.42.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=48870228431ae096a112e8a98f607ac0
+_md5_=7c32f984077bb38cc1aaafa34a083565
diff --git a/metadata/md5-cache/x11-misc/xflux-20130927 b/metadata/md5-cache/x11-misc/xflux-20130927
index 6ce40b3e178b..55956b3d32e1 100644
--- a/metadata/md5-cache/x11-misc/xflux-20130927
+++ b/metadata/md5-cache/x11-misc/xflux-20130927
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Makes the color of your computer's display adapt to the time of the day
 EAPI=6
 HOMEPAGE=https://justgetflux.com/
-KEYWORDS=-* ~amd64 x86
+KEYWORDS=-* amd64 x86
 LICENSE=f.lux
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXxf86vm
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://justgetflux.com/linux/xflux64.tgz -> xflux64-20130927.tar.gz ) x86? ( https://justgetflux.com/linux/xflux-pre.tgz -> xflux-20130927.tar.gz )
-_md5_=29a23270e132eca0afa55f93830398a1
+_md5_=db4f2e3e04e12dd27a1673e6649980e4
diff --git a/metadata/md5-cache/x11-misc/xflux-gui-1.1.10 b/metadata/md5-cache/x11-misc/xflux-gui-1.1.10
index 3149bc494aba..cb9107f4a226 100644
--- a/metadata/md5-cache/x11-misc/xflux-gui-1.1.10
+++ b/metadata/md5-cache/x11-misc/xflux-gui-1.1.10
@@ -4,11 +4,11 @@ DESCRIPTION=A GUI for f.lux
 EAPI=6
 HOMEPAGE=https://justgetflux.com/
 IUSE=python_targets_python2_7
-KEYWORDS=-* ~amd64 x86
+KEYWORDS=-* amd64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/libappindicator:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gconf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/libglade x11-libs/libXxf86vm x11-misc/xflux python_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/xflux-gui/fluxgui/archive/v1.1.10.tar.gz -> xflux-gui-1.1.10.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91b47e3bc84f70a531f2789de30e2f92
+_md5_=97c9b2045b43be16aa271dd52e03cbe7
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 6e7696605a40..d8764942b5e9 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/ctwm-3.7 b/metadata/md5-cache/x11-wm/ctwm-3.7
deleted file mode 100644
index b0fac9fe93a6..000000000000
--- a/metadata/md5-cache/x11-wm/ctwm-3.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt app-text/rman virtual/jpeg x11-misc/imake x11-proto/xextproto x11-proto/xproto
-DESCRIPTION=A clean, light window manager
-EAPI=0
-HOMEPAGE=http://ctwm.free.lp.se/
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt
-SLOT=0
-SRC_URI=http://ctwm.free.lp.se/dist/ctwm-3.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=239ee8a580c87ddda479755a731a5a4f
diff --git a/metadata/md5-cache/x11-wm/ctwm-3.8.2 b/metadata/md5-cache/x11-wm/ctwm-3.8.2
deleted file mode 100644
index 900d6ccbb646..000000000000
--- a/metadata/md5-cache/x11-wm/ctwm-3.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt app-arch/xz-utils app-text/rman virtual/jpeg x11-misc/imake x11-proto/xextproto x11-proto/xproto
-DESCRIPTION=A clean, light window manager
-EAPI=5
-HOMEPAGE=http://ctwm.org/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt
-SLOT=0
-SRC_URI=http://ctwm.org/dist/ctwm-3.8.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=744417c5770103e57704e6ce71e2673d
diff --git a/metadata/md5-cache/x11-wm/ctwm-4.0.1 b/metadata/md5-cache/x11-wm/ctwm-4.0.1
index 32735784d7f7..94192f9bb23b 100644
--- a/metadata/md5-cache/x11-wm/ctwm-4.0.1
+++ b/metadata/md5-cache/x11-wm/ctwm-4.0.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/
 DESCRIPTION=A clean, light window manager
 EAPI=6
 HOMEPAGE=http://ctwm.org/
-KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt
 SLOT=0
 SRC_URI=http://ctwm.org/dist/ctwm-4.0.1.tar.xz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=11d1d7ed795e3b79d7afbcb0d8cdca87
+_md5_=a5d63ac86b3d883f137a2c4998a692e2
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.20.5 b/metadata/md5-cache/x11-wm/enlightenment-0.20.5
index 39c621a0e195..db565064b45b 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.20.5
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.20.5
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.8.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.8.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms sys-devel/automake:1.15 >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment DR17 window manager
 EAPI=5
 HOMEPAGE=https://www.enlightenment.org
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.8.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
 SLOT=0.17/0.20.5
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.20.5.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	e2ebae76ba56501855712c5fd3c4c77c	epatch	9a5f039771f143195164a15a4faa41a1	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2f6909492ac8a193acdba946ba50d153
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	e2ebae76ba56501855712c5fd3c4c77c	epatch	9a5f039771f143195164a15a4faa41a1	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d88617b1f29506e7469559639f634fa4
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.20.6 b/metadata/md5-cache/x11-wm/enlightenment-0.20.6
index d3d47eae0d43..9c7a8df78341 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.20.6
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.20.6
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.10.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.10.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms sys-devel/automake:1.15 >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment DR17 window manager
 EAPI=5
 HOMEPAGE=https://www.enlightenment.org
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.10.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
 SLOT=0.17/0.20.6
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.20.6.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	e2ebae76ba56501855712c5fd3c4c77c	epatch	9a5f039771f143195164a15a4faa41a1	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a37b704332cae5fcfd2d044c0545d7ea
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	e2ebae76ba56501855712c5fd3c4c77c	epatch	9a5f039771f143195164a15a4faa41a1	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a1c04b8043771e162db34a4c0a4b43d1
diff --git a/metadata/md5-cache/x11-wm/i3-gaps-4.15.0.1 b/metadata/md5-cache/x11-wm/i3-gaps-4.15.0.1
new file mode 100644
index 000000000000..2307b4fcf993
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/i3-gaps-4.15.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=i3 fork with gaps and some more features
+EAPI=6
+HOMEPAGE=https://github.com/Airblader/i3
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS !x11-wm/i3
+SLOT=0
+SRC_URI=https://github.com/Airblader/i3/archive/4.15.0.1.tar.gz -> i3-gaps-4.15.0.1.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	eapi7-ver	0ac2f15e1a779b87e6e29beb189fcc63	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=03aac184bfbfc49654f03b8f769601cb
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 9fdc42fc3964..faff5e88114c 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0
new file mode 100644
index 000000000000..4987a6ee3a07
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A panel plug-in for acpi, lm_sensors and hddtemp sensors
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
+IUSE=+acpi hddtemp libnotify lm_sensors video_cards_nvidia
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+REQUIRED_USE=|| ( hddtemp lm_sensors acpi )
+SLOT=0
+SRC_URI=mirror://xfce/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-1.3.0.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=59bf5d07c99d34e1d63d7cda1ae2c993
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d622d3924ccc..7c7e165d4baa 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 19582 BLAKE2B 9fc9cbe8fb3f91d1121694d9f65c77dccaa3a5e942d3fa2a476b09eb5b656361f8847037b308aac86b7cae934fd70e0ddbfc94f0ee35cfa6b27451814b6b7b33 SHA512 f9fc52a2e65e760677796caf947ff4692963718a9e344281000add570f0a8304f93abf5af66aac9201160caa4f01a92aedbd46f4fe2c171b0ba908e6dc390956
-TIMESTAMP 2018-05-08T12:08:26Z
+TIMESTAMP 2018-05-11T14:08:26Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrxkzpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlr1o9pfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC4xw//cwAl1Tnq7YE44BOCn4oaA+UGfw/891fchO8q768sU92bNgoBpOshZUG4
-yFli2XYUHVLPZHU1hQztI4iouUh9lagzK+lL5HG/vQgR0IQGZGmM/8x/KaJBQoMb
-PwhayuOzNOTp1W4t4CUaQB622PSAv6Qbb5CnPI/cq1bm4P0drpCnw1D2KY5i7PiL
-yW33wPbihxi0rOrmvOdY/IhLdl0qiae4+50kxbyhkPqryKOjOwxvh68d7jk2V+DZ
-l9QXjdMZZD2WFfobMtKzTguGOK2TjS+LoFinzO0mYTl9pZ5lwq/M2TwRibB/+bMw
-qRkQ4Nih98pCxwm0+BT1RHMg+S10x1r+QZNPF9o8Xt3yMcHahiISUUZz9zN7uxOR
-FOnwcB5+RxsLpmQS4eUvIyJsr6OgXEZ7nvKNtWhkrZXN43ByFuFN2dMoe/Q0Qibt
-mRHIWaNUyT1tDpgKCCJxVAYdYqpkpAsk5Tn/YQLQVV6fY/zOEJ1B1k4Xf0iN2zZZ
-c/PNwwnb/hibUnZ17819xQ4vabecwjJ+9ks0Yzs5J2L2j7xYfv3dt6mJwH/vbFV4
-ezcjLSGmnZckOMTD7YzEiqXmlgEPQv14STkcJy37W+A1rK2U70JuUGUGLG9G3bQY
-+vyGHq+AviDG0c9Gmsd0aT0wFzduwwL+wEHKITM9iBb9nb8QqgE=
-=PGfs
+klAHbw//SH9bhQIs9Jfp1BNPqvTZrKcrl/1/NbPduMB/hJ5wTt42CU5jHTMNf3zA
+grgTI5SYAzP1fDAzxQlf5aj77xrOl/63dU4o+zHgTnL/zqthmW6JL4oUD7XaBQvo
+9gZc9DgDbSK80cgU2+uIJQsBH+ZO9wNCL7CgYPiYsHVsgBGWY6/Ze1ZD5135tzj/
+z202B+th9tnPS/u5Qsmd2JIN3DQTN8Lz1vTqE5EQAHu/ZiPCtvl3nmorMPB7gHGh
+Ee9Ozz+EaptUj/mSy+r700R0WXB3WSXhCn7Tk5kKpHhOozHuat9GQIAmR2xFy/11
+22J7vn5TgzTo6zcFuvubqNuWnWsACxAcTIqBGdPS1HAQqfFwXTFrSLcKCmsdgjAZ
+wHAN6YocarsCviLa74eyFY3ny8cOFZB9JlR3K1qoksXbeylFdqGlxUOipine3lpW
+5p24xQTBe8hsRKOnMF2Y1Di4tmNA/FCKhJ9eDvcQfCCvuTvA+eCVk0/DYBOCgFhn
+PXh6MLvEhnAIYe3yTe58Ws7YuFjHGwW+28aXSoUWYPaE0FDCAJVzPLW+Hq5O/dtb
+W/ZNa6W7eIDQ2pUQfhBOH4rdRmDR5ucH7GvCVGm4Jdj8LEYAiCRTCSNuLumm1USe
+/iIRhpamDW+yesgx69a/ILnNGcvujzaQm6TWoeLKT+nJADkQnVg=
+=yZPM
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 72b494a0407a..55a4a1351eb4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 08 May 2018 12:08:21 +0000
+Fri, 11 May 2018 14:08:22 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 432322146dbb..656f5aa2072c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue May  8 12:08:21 UTC 2018
+Fri May 11 14:08:22 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 319127bec590..9524d53d8ffc 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 08 May 2018 12:15:01 +0000
+Fri, 11 May 2018 14:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 66e1f5d7e996..603dced4718c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c22bbec9d47a11889517a7bb082594bd123b5c47 1525779525 2018-05-08T11:38:45+00:00
+37067b30cac404477ae7711d6b053e0077c3df60 1526046155 2018-05-11T13:42:35+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 585c7cdd8331..71458c2faaed 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1525781101 Tue 08 May 2018 12:05:01 PM UTC
+1526047501 Fri 11 May 2018 02:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 72b494a0407a..55a4a1351eb4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 08 May 2018 12:08:21 +0000
+Fri, 11 May 2018 14:08:22 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6d0e653d0c46..7167024ddc69 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 66e5efd15634..9a6db2c88816 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -2,6 +2,6 @@ AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad2
 DIST monitoring-plugins-2.1.2.tar.gz 2613060 BLAKE2B ea352b283166a183b993c474d7318b218e8ba75d2cca91ae1901046e6c4bc2075c21217038a649aaf1355f04d6133a623ee1439fa0d1548c8ec6d03fb8952854 SHA512 845eb7636691aa5402119384c3d4256969e959fbc29ef5257c24fc4c21536cad3dade30747f36c9ad998cb37df0f325df66ea679d3d5b96c2993b59a9a325fed
 DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27
 EBUILD monitoring-plugins-2.1.2.ebuild 2858 BLAKE2B 3b07074b43e7dce8b468946f5184938a51444c093c3fb68a6abdfe7b3ea825f141c2b1994a54bed25b5362454a9d48e5684b12ed220ae14623c712dbd737fe81 SHA512 9426fdb164c60771cc3dddc6cff2e526ae7770400378b74dde706a2cfce7dba51aecddfb7c7a532e6bc07078d05cf28d64ddddc3e4eefeb4ec2bb70f44151f7a
-EBUILD monitoring-plugins-2.2-r2.ebuild 3012 BLAKE2B 1f0eb5fcc41390935086afeeb0e88ea2a46b27ddaff668ab1be3edbd98218ee4cdd846d4f49ba4850ef48416d8228bd94bbdb687827e53865bad6d78c429257d SHA512 3092a8d9bae0ef4f0089be694ba1ee1f3486ff3708b7010da6cb230e72f5803dedbe5e7434d612052b2feece33789161dd05b03f70d9b3bdd1d67953415c4db3
+EBUILD monitoring-plugins-2.2-r2.ebuild 3011 BLAKE2B 3e2fdb8a93f5adad5de4172a7fc4cb5d6afa5ec63dc4221160493b8068361d971650462838dece42d282511c458dc7ef0b4f60b541aa9c422019be5e48a00ec8 SHA512 bdd095ae665410133fd2125ba7b015e75aa57b8a0c35742a172ddb34cf3e71cb7389956aa278f92a3366b3aeb055ba6a579473878975fa7288d9e79f029b78a7
 EBUILD monitoring-plugins-2.2.ebuild 2875 BLAKE2B 8dfdf9c0bdb239768f0d441ba4f2a6648ed9f7d23580b9def8d2f93ec40d91653a841d821e54aed856bc6f30939ce386fbdde23a7bb86122113ab3d89fe0ff78 SHA512 67a2e298d56b06cfa7ef0f718889c4e300cccd668e7335f6574e36b929dbf349473ce4c4541a083a703440e8d61abea0551e2e245bfec4dbf95cd174e72114d5
 MISC metadata.xml 1404 BLAKE2B 68d3a914681db790872872cee7114b053aaa118b9eacbf33b02db932d3b970a80b0fc1d79d9e3f836f7d0f8870066bdf78b6b688864cac753d5ddf42a7ad9f9c SHA512 766657a0c9a0d16fa9fc0c052342b65c1f5b32dbbc0eb4e8fb014274b92dd0370dc19a6821ceed3979a1def5f429e1e3f23ccbf2ca443f787a50e00b503acf42
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
index d0be6977de1d..2e62986bc445 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 sparc x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 8cfef9500881..4c665af892de 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -15,5 +15,5 @@ DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b
 EBUILD nagios-core-3.5.1.ebuild 6154 BLAKE2B a12a36fc2217394d21f7084fce74104f5c17749271fcf984a1dd96cac505327abb89a20e9582c927286b4b93dbcbecfa131129bc3362a29b900441138dae580a SHA512 c402040b5449fe096d40d0313ee08380089788c57da4dc780a8736eb335fb775379db4667145baed355dbbe9128e99d2662f54d9a57e44f2cc5fc35f0fe2bf01
 EBUILD nagios-core-4.3.1-r1.ebuild 7579 BLAKE2B 931cbb9b132ad116fc2e7ed6670d309ecb5165b172eef9e24ef401b7946c4dc0f434f9678a338f4ecac2cf65cd2147cdda046d9ede2676e8aa7f7b5d5b8795b5 SHA512 8a4273cb4e2f50ed4e69d190743c362db3c1c9480ea19d061501dc57e48fea7e6b3c1811107714667b7ead9eb748ee8a7a106b792f066422ef13640b14bd5aac
 EBUILD nagios-core-4.3.3.ebuild 7466 BLAKE2B af8a11f344adbb8e8e7bb46b48c8bb414ef7c58e7b8aab77c2988919bc5fae24c6272f96cf51a9b43f64f6e42003187e6616d4d87d56f86a5e00184c8c5e9483 SHA512 860b07673f9d77e296bfc471291cd07de65b1195ea2cfd0bad7ceffdf316afa23fda0c5f90a2de2c7115f053f54dbced5e45627d6747512af62833d0c398682b
-EBUILD nagios-core-4.3.4.ebuild 6645 BLAKE2B a68204732d6613a7f7265d30aed20c093fa7077b468afab2bf35938210b910be4533dc768c0e9f9aad9b81ed75de72a7333e2aa3014958f5f6029bbc191d8d0f SHA512 5a1da06d0244646b68b36cd5cdd549d05ebf2ca379ad0fcf4aee92dd76d68bdee98635c290c613d12b3660aeda8b342fea8bda0bf39aed3dbb2672e47313ebc8
+EBUILD nagios-core-4.3.4.ebuild 6644 BLAKE2B 5d4122fcdaf7a49e1b1f19a8329978adb13c4453d3c582353a041e44dd8b836018351bd5a67be60acf21a8e1451960b67b453c7a898e6865eafc06a021918247 SHA512 9dc3711eae6ca9aace53ee2d960f5a5886ea0cd2473e8f61b939fd0dc6a2db7881d299702997d2c5cf47438b2248c939a552077fb8bf542bd583b9ea2eb28f9d
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index e2924762eced..fdfbefc49438 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index c136ad27932f..10ca0cd26495 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -2,5 +2,5 @@ AUX suricata-4.0.3-conf 2767 BLAKE2B fe356820f57a8a7b068b66fd8c012c94a9bffdc8a62
 AUX suricata-4.0.3-init 5499 BLAKE2B c2aece3a386d0ecf821e9d0e6bcb74efd97b90a71bad59a3e86f0f6a30702c711e7a287d1065745e73521c6f6cfaf5444b50b064fc06052dc33d8a6bc690f2da SHA512 ac407c70751a3610d9082b0736e76dfe04bd82014a5ac850b581c2e3c5806bb9d8fd59788cfaeabf51a856861a4568e31f9f1e33687623cc380ce226c0e06b92
 AUX suricata-logrotate 161 BLAKE2B d55edb7e36cc27819b6fba26778eff3cc66bfc5c04877e36e27ef9adcf3f003c10cff787b317e00a32a4c764c2180f90c9abd3f81e877d73bd2c892d5ca2d161 SHA512 c22a85667460df9b7b1fd15af1e4472dd5b7d1726a43f3b621547a884dcd64ff49b0728767d6a4dc70c413dd8997905e3753fa94c82cda34e4aaf903ebdb1cec
 DIST suricata-4.0.3.tar.gz 12392388 BLAKE2B 9b6338b343ff85f070d61608ff9dc7f25df868fdffbc13b5a8d245cb3db5cd757cb1785c827c388653b2f8a7977129259671900bc1abfebeb878a668b4058bdf SHA512 aa6b6d1ae86efad0184ba4fa06375f34334e07c22b7b1f82bf17fcb0ae48ad7f867bced57ab4f713de01583965e1260cb82e1355f78002071b689dddd3b53892
-EBUILD suricata-4.0.3.ebuild 4498 BLAKE2B 2e0ae5a07fdf1d40bc33675ea75687f3cfe2c5aa8b8219ff6d211b763de1252c24295006ccb7544282d49411ef0e075fecd2b82ad3a698d12ef814a9ed741cb4 SHA512 f3bd64620d69acf0f083640992b0f7213fae8cba7bbd71d871f84f885ff3c841ae40e426b606be6f9ffb0f90236c10bd25757b01d00b53060fd7b678ef48a77d
+EBUILD suricata-4.0.3.ebuild 4559 BLAKE2B adf2d05e0a605e7539edc6e89895b8da8d05ee7fa3e8f2c1a86557785dae0f69f9a98138d82e2496303d03642416cc3620f72507cfe4a9925112a366eeb87d52 SHA512 c57ab35bfd25ed6321c4abdce2fd32bab1e8a3a89ce1513f6464bb766850edcfa03ffef52c5aaf69edcaffcf143ce19cb0b8a51e1cfd98dc1c94bcb8ad166003
 MISC metadata.xml 775 BLAKE2B faf442e43b5388b3a24b57ee3aa73ea22eb0f230bd7bfbdee98bc4ec0be260f52f47cf7caa67d44d3498cdba58e18c487741a295149c64cf2b4631a141537e8a SHA512 e9407a4c043553a31b1a66c6b45d352444368567eef3bfa4af26e64bb84a70a81bcc7a21e48dba7e532a3115c7086932e22b75a05b00ba1f84b59d4d7ec187c6
diff --git a/net-analyzer/suricata/suricata-4.0.3.ebuild b/net-analyzer/suricata/suricata-4.0.3.ebuild
index e501c9c775b2..19c4e17ebb26 100644
--- a/net-analyzer/suricata/suricata-4.0.3.ebuild
+++ b/net-analyzer/suricata/suricata-4.0.3.ebuild
@@ -27,10 +27,8 @@ DEPEND="
 	sys-apps/file
 	cuda?       ( dev-util/nvidia-cuda-toolkit )
 	geoip?      ( dev-libs/geoip )
-	lua? (
-		!luajit? ( dev-lang/lua:* )
-		luajit? ( dev-lang/luajit:* )
-	)
+	lua?        ( dev-lang/lua:* )
+	luajit?     ( dev-lang/luajit:* )
 	nflog?      ( net-libs/libnetfilter_log )
 	nfqueue?    ( net-libs/libnetfilter_queue )
 	redis?      ( dev-libs/hiredis )
@@ -83,15 +81,16 @@ src_configure() {
 # 		myeconfargs+=( $(use_enable pfring) )
 # 	fi
 	# no libprelude in portage
-# 	if use prelude ; then
+# 	if use prelude ; theng
 # 		myeconfargs+=( $(use_enable prelude) )
 # 	fi
 	if use lua ; then
-		myeconfargs+=(
-			$(use_enable !luajit lua)
-			$(use_enable luajit)
-		)
-	else
+		myeconfargs+=( $(use_enable lua) )
+	fi
+	if use luajit ; then
+		myeconfargs+=( $(use_enable luajit) )
+	fi
+	if (use !lua) && (use !luajit) ; then
 		myeconfargs+=(
 			--disable-lua
 			--disable-luajit
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 6657e1223f61..5afa59ff818d 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index ed1078b9b202..1d42f439c168 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,14 +1,15 @@
 AUX config-full-paths-r10.patch 2487 BLAKE2B a0c7ff420a9000903ec8fdf446c463ef367db2ec934147817f08c12277d5e1704db7c7ec89ec068a5cdc26f88eb794f8caf6d9eb318764783ad62e22ce9a2798 SHA512 15a8af5fff20d9f9d7931faf40d2f9ff1a960a764d7330287af65290e85e986892f0b94a6b311e8ae0be60be3b78caa10c71e438275f20d44706850c2a61d407
+AUX dnscrypt-proxy-2.confd 149 BLAKE2B 8b20be543525918f825feb1c32238f2ae5ca55e8cc18bee8f952a82a712d9abc358a38f2bfd4dcdf0f4e21717c0c218fbddfa9a7a675fcb6b6435b3eeb862571 SHA512 cdd1699551eb6b3cbb9592c45f73f33cef6916a8a05dd3a94055643d7c1de53cdb09b9a1d4d0dd69c6d3d41fe0c8256f53e9b31e087e2b30a2f38331f464727d
+AUX dnscrypt-proxy-2.initd 640 BLAKE2B b459fcc99c952ed8987d816bb6e5370b3b9906410a0321186fb37f3fcad5effdd0e87710e2bdee2ba566c89b5a441f02d097f0f18d1cef0f7ed3835570073cb5 SHA512 5106abf823c33873d23bc91ed463121999d14e7e65fbbd4168cd09ff3390e7e8367018229beed6d6b553e72f42de5854db2baa9a9b94a819426b9431101ccddb
+AUX dnscrypt-proxy-2.service 1204 BLAKE2B 879571cc00eab424b10f6ed79d9d52ba1ee835fd3ad7ef295d113b21afed075b3670066cf5dbdf0647c02853bb242c6d037f6ad962e0e6a7225b86fe88a3c9ab SHA512 3ae8f2dbe93169a6ddf71db85103a297210287006a63c71e9837ddfb62cecf6de28dd3ead6028e2f239edc4dab5a16d27c3c84fd2fcc23e41ba71b7b8fbf8b1f
+AUX dnscrypt-proxy-2.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36
 AUX dnscrypt-proxy.conf 8912 BLAKE2B ea1b196528dae0c9536c12e3ed6b9839830ae4f89203ea19332d8238cbeba599a202557c75de1d77e2e4f306db1d2a1dd2bc352891bbc2f8a3595c8aa253fa6d SHA512 1e45f38a46383af14695cd44531335801ae315d819e9593e931be0fd513059c87ddfc9128158a532c6bc26cf113635c9630d8694764dff5a46a6a98c5ea8b42a
 AUX dnscrypt-proxy.confd-r1 41 BLAKE2B e73624ac07b382c9dd66970e12da3e00a669d548a32b16aec6e4227a0af73980f294444507c86fa0ae26e8f9f19c6d533f83ecdcbdcf9d8c28a8c47439844d77 SHA512 2f381c21e92a8f74d47f6c5d3d18bcc32a2713d3b7d82f260d8e2770bfb6aea0a46f8d957796c64d02e6a0445f92c31b83b29724b8004ba9fcc7f6fcc93afaf3
-AUX dnscrypt-proxy.confd-r2 119 BLAKE2B 00c216f87133aaf606c9c753ba5eb3d400363406abb4c25bd8f203aec8b8fe3e5c621deb4dea4f2db801c26ec92b3af609cc5a7bb954181641c1deeefa3aafcb SHA512 b144cd8f67b6ff06156841cf619ab4cd94855104f00fb1877c83308b6bf4d8addfd59ab1134c51855465a6daabbcd445550976c9d956d0795fa09f3b0482ac80
 AUX dnscrypt-proxy.initd-r1 258 BLAKE2B 86ceff0c2affc0508cafa782803498be680f46520a380eb64eb2fde026c65cd349a4a5f995e5a285c35db1514a77e95b5067c96cd41905f253e101bffa453f41 SHA512 700849b9a0b8a3a224d0c149091937f751461bb42c7ac4a4bccecf28d9a7b64dd2f47601bee1f8d5c08bdfad2defdcab0c0bc22c7393873612f56d78cd0edc6a
-AUX dnscrypt-proxy.initd-r2 594 BLAKE2B 633906a42693dc99103eafa2694e9537f1622d757ced10f026b4564f7a3fa20c0c59871870f0e9eb8c1f9e8f1aaf63d073c6d4688da3362dd0b69ba9b00ceedd SHA512 d671c63b461c8e58aea0d4a7903dfd05ad458020f289c12d48140cd10416eb1c0b34f0ebb2833e8f129496e59df166a3014bf92d9b3d8e7c32ddc1030f2bbab6
 AUX dnscrypt-proxy.service-r1 445 BLAKE2B f6e6af96d6b11892aa8d7aa111ca42dfe6589abbb6e5e214253fdc4f6d6686484e22dc24f45f05b23223bb8ada91e594bd0d015d35ed4850ce47e90d778a7867 SHA512 ff226e1f6416de04b42828ab89a0df48b4eac1385f489ccad594b5e07cbceb57249006951f25237a55effdd2acaf8ce7e0fb2c36fc17799f963d506696b0cb4f
-AUX dnscrypt-proxy.service-r2 581 BLAKE2B 1d873041005135b5ca01aa2b24f373056a4281604a8e69675912d86ec7de34c318c899a1628bcd758019c8c105179d231630dd6aad520ab5a8e86fe64b8592b7 SHA512 40552beb4f640881bbad0cf0c40406e5c1e4ec236b4e1d89a88af4eef888f91c8170732273990bc4041c39e742516664651cc89f7686fba941697a148b9345d4
 AUX dnscrypt-proxy.socket-r1 152 BLAKE2B e4eb7875f749646f77675b39c7c74f57d5674d825329891b0f128e190ac3625d28f81df8004975828080c6eb9665a8c0825826b5ccf305694c03c2e196da3dd7 SHA512 920014c202344726e645f3bfa5def0f194c215cc0ce6e45750e82cee3434399497b9ad3fb5268afb1823689ced0fa8d177d6411b3153661b97fbd55984752a87
 DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
-DIST dnscrypt-proxy-2.0.11.tar.gz 2774458 BLAKE2B 36c9109a682a0d70c32910a44a64f49ebf0a958660154c10bf3687da3fdaa405e8add43717267f30a79d96941160cda5994704060a78e2ee6bbeddc55ff87766 SHA512 5e306c3bff65d0375b650666e2191c6f54e72bb0d2d2f6f8f7b941ffc063eb7eb244a52eb69b0b008dc566e9a6ce8a8f75929edb6762fad4751d966aa2da98a0
+DIST dnscrypt-proxy-2.0.12.tar.gz 2775112 BLAKE2B c3a1085c7c4d005d323d2d3e803b7bce447b86a8f2e9bff0eb7e5e145d275dd19fe6913c805be9469ba0a492f7a479a146af56a769432d8120790375628bb936 SHA512 757a7a88e8f6ed61462736184f0ca8426c40f800f54727881412de44c527e4334a6b42aa6906c19ecf9287d462a1ec7bd55cb471781bd94c2a0faa8ad7055137
 EBUILD dnscrypt-proxy-1.9.5-r1.ebuild 1817 BLAKE2B bb0c48cadf271b942beeaee69c49dbb2582c41f86176b84c6e929ad5dd5b55deacfa03d15143b2180d05ab03913a93702315712afc73bbbea53b152e43ab30f8 SHA512 87a35841daf4da9b666bae888f9b73fa7205f9e7054afe5bdc47d1112525e2eb1237416fa7702c38bc63ce0878fc61d752f6851af1cc07a0f9b5a3591b8f0704
-EBUILD dnscrypt-proxy-2.0.11.ebuild 2692 BLAKE2B 72884728ad3012578ac8b1eb3799c5cca44ec8daeef67f045409e6ddd99a9dcd58ab2bec22a0cc47a74e3ef4e8ac09325ebc99e881dcc69b162bc60b75ab0c63 SHA512 330ecba2bf86b48b3308decbb5464d9572d5522d65188ab9de2f12b39ec5dc24870b39c81706cc62e7aab57073c1193a708e11a63f5a65ef66eea58c45fc614b
+EBUILD dnscrypt-proxy-2.0.12.ebuild 2876 BLAKE2B 1d8617576f87525d517f7a32be2d4f044fdcfc865cc11278a4469c1c2ff9c6f550f8d244adc97852ca48d03388845259335f9d837e5e40d2893bbe74cf7e47d3 SHA512 f77bb0d9cb3bea881c4bb15cf027564937bfbde26fbcaad3e58ceefc39dfb935dc165428b9365810af1e4df7a7d00526a41d6b2d749ad357fcab1273d0006cbf
 MISC metadata.xml 941 BLAKE2B 234421b342985e6980a870bc0f7e4dc96e2867d89aa589ac23723a7a7cc4767109de7f046c817c3a21ea1bab23d352210941dc092b002dd3a7374be6c459877c SHA512 6bad822978132f7467756a88695e9e87a3ec2c007af04b423496f7befc1fc4de781a78bac17167b6de6682688e3ef445e5dce7f6f3f3e9c25a632e6222268918
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.11.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.11.ebuild
deleted file mode 100644
index 948f785d3d5f..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.11.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/jedisct1/${PN}"
-
-inherit fcaps golang-build systemd user
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="systemd"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_prepare() {
-	default
-	# Create directory structure suitable for building
-	mkdir -p "src/${EGO_PN%/*}" || die
-	mv "${PN}" "src/${EGO_PN}" || die
-	mv "vendor" "src/" || die
-
-	if use systemd; then
-		sed -i 's|\['\''127\.0\.0\.1:53'\'', '\''\[::1\]:53'\''\]|\[\]|' \
-			"src/${EGO_PN}"/example-dnscrypt-proxy.toml || die
-	fi
-}
-
-src_install() {
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
-	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
-
-	insinto "/usr/share/dnscrypt-proxy"
-	doins -r "utils/generate-domains-blacklists/."
-
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r2 dnscrypt-proxy
-	newconfd "${FILESDIR}"/dnscrypt-proxy.confd-r2 dnscrypt-proxy
-	systemd_dounit systemd/dnscrypt-proxy.service
-	systemd_dounit systemd/dnscrypt-proxy.socket
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if ! use filecaps; then
-		ewarn "'filecaps' USE flag is disabled"
-		ewarn "${PN} will fail to listen on port 53 if started via OpenRC"
-		ewarn "please either change port to > 1024, configure to run ${PN} as root"
-		ewarn "or re-enable 'filecaps'"
-		ewarn
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v} == 1.* ]] ; then
-			elog "Version 2.x.x is a complete rewrite of ${PN}"
-			elog "please clean up old config/log files"
-			elog
-		fi
-	done
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "Starting with version 2.0.9 ${PN} unit changed:"
-		elog "It now runs as an unprivileged user with dynamic UID/GID"
-		elog "and privately stores log and cache files"
-		elog
-		elog "See man:systemd.exec, man:nss-systemd"
-		elog
-		elog "Edit ${PN}.socket if you need to change port and address"
-		elog
-
-	fi
-
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver 127.0.0.1"
-	elog
-	elog "Also see https://github.com/jedisct1/${PN}/wiki"
-}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.12.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.12.ebuild
new file mode 100644
index 000000000000..0b64d8b992e3
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.12.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd user
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+pkg_setup() {
+	enewgroup dnscrypt-proxy
+	enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
+}
+
+src_prepare() {
+	default
+	# Create directory structure suitable for building
+	mkdir -p "src/${EGO_PN%/*}" || die
+	mv "${PN}" "src/${EGO_PN}" || die
+	mv "vendor" "src/" || die
+}
+
+src_install() {
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
+	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	insinto "/usr/share/dnscrypt-proxy"
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy-2.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy-2.confd dnscrypt-proxy
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy-2.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy-2.socket dnscrypt-proxy.socket
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.* ]] ; then
+			elog "Version 2 is a complete rewrite of ${PN}"
+			elog "please clean up old config/log files"
+			elog
+		fi
+		if [[ ${v} == 2.* ]] ; then
+			elog "As of version 2.0.12 of ${PN} runs as an 'dnscrypt-proxy' user/group"
+			elog "you can remove obsolete 'dnscrypt' accounts from the system"
+			elog
+		fi
+	done
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd
new file mode 100644
index 000000000000..fb40827a77ef
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd
@@ -0,0 +1,3 @@
+#DNSCRYPT_PROXY_OPTS="--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
+#DNSCRYPT_PROXY_USER="dnscrypt-proxy"
+#DNSCRYPT_PROXY_GROUP="dnscrypt-proxy"
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd
new file mode 100644
index 000000000000..74c2dad63f7b
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/dnscrypt-proxy"
+command_args="${DNSCRYPT_PROXY_OPTS:--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml}"
+command_user="${DNSCRYPT_PROXY_USER:-dnscrypt-proxy}:${DNSCRYPT_PROXY_GROUP:-dnscrypt-proxy}"
+pidfile="/run/${RC_SVCNAME}.pid"
+start_stop_daemon_args="--background --make-pidfile"
+
+depend() {
+	use net logger
+	provide dns
+}
+
+start_pre() {
+        checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${SVCNAME}"
+        checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${SVCNAME}"
+}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.service
new file mode 100644
index 000000000000..ed02955621ba
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.service
@@ -0,0 +1,39 @@
+[Unit]
+Description=DNSCrypt-proxy client
+Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki
+
+## systemd sockets - Do not enable unless you are very familiar with the systemd socket activation mechanism.
+## Always try without systemd sockets before reporting any issues related to speed, latency or reliability.
+## If you enable this, the `listen_addresses` list in the main configuration file can be empty.
+## Or, at least, the addresses it contains should not overlap with the systemd socket addresses.
+
+# Requires=dnscrypt-proxy.socket
+
+After=network.target
+Wants=network.target
+Before=nss-lookup.target
+Wants=nss-lookup.target
+
+[Service]
+ExecStart=/usr/bin/dnscrypt-proxy --config /etc/dnscrypt-proxy/dnscrypt-proxy.toml
+NonBlocking=true
+
+DynamicUser=yes
+
+ProtectControlGroups=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+
+CacheDirectory=dnscrypt-proxy
+ConfigurationDirectory=dnscrypt-proxy
+LogsDirectory=dnscrypt-proxy
+RuntimeDirectory=dnscrypt-proxy
+
+## Allow binding to 127.0.0.1:53 as non-root user
+## without the .socket unit
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+
+[Install]
+Also=dnscrypt-proxy.socket
+WantedBy=multi-user.target
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.socket b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.socket
new file mode 100644
index 000000000000..ea38c90e8a5d
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.socket
@@ -0,0 +1,21 @@
+[Unit]
+Description=DNSCrypt-proxy socket
+Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki
+
+[Socket]
+## Listen on TCP socket.
+ListenStream=127.0.0.1:53
+
+## Listen on UDP socket.
+ListenDatagram=127.0.0.1:53
+
+## Below options are valid only for TCP socket.
+## Applying them to UDP socket will result in warnings:
+## TCP_NODELAY failed: Protocol not available
+## TCP_DEFER_ACCEPT failed: Protocol not available
+## Those can be safely ignored.
+NoDelay=true
+DeferAcceptSec=1
+
+[Install]
+WantedBy=sockets.target
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r2 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r2
deleted file mode 100644
index 9934e828b82a..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-#DNSCRYPT_OPTS="--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
-#DNSCRYPT_USER="dnscrypt"
-#DNSCRYPT_GROUP="dnscrypt"
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r2 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r2
deleted file mode 100644
index dcccd83dab3d..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r2
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/dnscrypt-proxy"
-command_args="${DNSCRYPT_OPTS:---config /etc/dnscrypt-proxy/dnscrypt-proxy.toml}"
-command_user="${DNSCRYPT_USER:-dnscrypt}:${DNSCRYPT_GROUP:-dnscrypt}"
-pidfile="/run/${SVCNAME}.pid"
-start_stop_daemon_args="--background --make-pidfile"
-
-depend() {
-	use net logger
-	provide dns
-}
-
-start_pre() {
-	checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${SVCNAME}"
-	checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${SVCNAME}"
-}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r2 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r2
deleted file mode 100644
index 745b094aaa16..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r2
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=DNSCrypt client proxy
-Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki
-Requires=dnscrypt-proxy.socket
-After=network.target
-Before=nss-lookup.target
-Wants=nss-lookup.target
-
-[Install]
-Also=dnscrypt-proxy.socket
-WantedBy=multi-user.target
-
-[Service]
-User=dnscrypt
-Group=dnscrypt
-Type=simple
-NonBlocking=true
-ExecStart=/usr/bin/dnscrypt-proxy --config /etc/dnscrypt-proxy/dnscrypt-proxy.toml
-ProtectHome=true
-CacheDirectory=dnscrypt-proxy
-LogsDirectory=dnscrypt-proxy
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-AmbientCapabilities=CAP_NET_BIND_SERVICE
diff --git a/net-dns/dnssec-system-tray/Manifest b/net-dns/dnssec-system-tray/Manifest
index 0ddb62eb8de5..ca1d489a8999 100644
--- a/net-dns/dnssec-system-tray/Manifest
+++ b/net-dns/dnssec-system-tray/Manifest
@@ -1,5 +1,3 @@
-DIST dnssec-system-tray-2.1.tar.gz 15397 BLAKE2B df7fe49c8ba098ba0d0ca29c562262af445910e5ed692a4a1c4811c46d4acd53c52a316f5faef1dd203c02e8209b49dbeebe5f1fa4e224db810caf4470b8e81d SHA512 bd4a17e8eed65a6d96dc4c19c316746da6da698d1d48a412aad70a8c2db5bebb2bcefc1d3f1b6e39d6c9b275936cc218add75e07acaa87fbd53df35013ea5e60
 DIST dnssec-system-tray-2.2.tar.gz 15309 BLAKE2B 0cf4535c8c58d85f9b9aa142ec514b3ccc278123f52e70708d34260a410bfc62464e0ca35d8b30754c5933a6f947d7850c8b2d638f25719a9006957aa51943ee SHA512 1c99abc7029232770b1776b57ff014b6b3c10edd4841952b6f7cabea69ad0252911db3f7aa252d53fca7457e8cba8a38665fbb6c05421daea0946622bb13daf9
-EBUILD dnssec-system-tray-2.1.ebuild 606 BLAKE2B 0253e81328bfaf3b85a039fccbfd8ffca597ce80179a510fdce1a5654101ba5a56430afc379a5e512a220dd1cf037f0da71a74f6a306d77aa910ca747e5c080e SHA512 ce289133bc3fac88b2adbfad23b21ccb66546a142fd685c353afbd5e4471f206043c2a909643e87102ef9552afb4638c7c3068816378a6465b3cb6989b9cacab
 EBUILD dnssec-system-tray-2.2.ebuild 606 BLAKE2B 0253e81328bfaf3b85a039fccbfd8ffca597ce80179a510fdce1a5654101ba5a56430afc379a5e512a220dd1cf037f0da71a74f6a306d77aa910ca747e5c080e SHA512 ce289133bc3fac88b2adbfad23b21ccb66546a142fd685c353afbd5e4471f206043c2a909643e87102ef9552afb4638c7c3068816378a6465b3cb6989b9cacab
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/net-dns/dnssec-system-tray/dnssec-system-tray-2.1.ebuild b/net-dns/dnssec-system-tray/dnssec-system-tray-2.1.ebuild
deleted file mode 100644
index 2e0c9099d4ff..000000000000
--- a/net-dns/dnssec-system-tray/dnssec-system-tray-2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils qt4-r2
-
-DESCRIPTION="display DNSSEC resolver logs in system tray"
-HOMEPAGE="http://www.dnssec-tools.org"
-SRC_URI="http://www.dnssec-tools.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	dev-qt/qtcore:4"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	eqmake4 ${PN}.pro PREFIX=/usr
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	newicon	images/justlock.png ${PN}.png
-	make_desktop_entry ${PN}
-
-	doman man/${PN}.1
-}
diff --git a/net-dns/dnssec-tools/Manifest b/net-dns/dnssec-tools/Manifest
index 6113096dec67..ca865a99f54b 100644
--- a/net-dns/dnssec-tools/Manifest
+++ b/net-dns/dnssec-tools/Manifest
@@ -5,8 +5,6 @@ AUX donutsd.service 152 BLAKE2B 4663f200f1f5194b0a2d5c94938640d2c621cdf93faef534
 AUX rollerd.confd 234 BLAKE2B 9a360e3c66bbc785b0a925991ae954e16808922b44a597949f79bf0e9df3bfb99a9f355c916b5e93f90327fff7e3cb7098d19171dc037675d283fab74106572e SHA512 a368b1f288c382d265a437798ffd0d09adc1898caf00d5eff63487f0551a19d023d3a5dda514b574a8cd723b6fb657ea588f5ca206321535a3e3b99a90af3a65
 AUX rollerd.initd 409 BLAKE2B d3f545fa48d061c0bff8d7a73352f4307678e14006ecb51cb78d32854685d422f269a436ab64307295aab700481bf601de5f3315b1677ac594319e341b15c423 SHA512 1d50ea92a5cd63f77bdf3c780cf33f1d540fc5dbcfd0bd5eea5cc1f156a15c872b2f6b3bbfdf57bb72a99527ce0a6d1bded254d153dc28df51bfab8e6dcd4d9d
 AUX rollerd.service 202 BLAKE2B 8d3841fdaa9a8a5503eba707e22ba66d62a5b28fea3ab1b7a689958f66dd4a3ae53a613f622093846f2dbfa1fdb52fc30bfe772def34d6180e88079b5b3d2bd6 SHA512 5eb0786a0fcad3fe88db3d2391a2ec3dd272818aed0c17a664fff7f126da467ef2e47671212c86c7cc27f0e62873c63968cdbdff6c561499639f8a608e93648b
-DIST dnssec-tools-2.1.tar.gz 4430320 BLAKE2B 53f4ed09d5a1c1237933b9ad8aa51411f8bd9b95aab7bfbee0149618bb038814de3ebf12115fde818b535bd8f09b58d9e780162b293ae5d697eb634e2a9e0fe5 SHA512 61119837320bf9a7c2d64a593fc3ed6b84ee7683b7e4ba5de380b0fd1be70e44bf73825ea5395cc1d3ddc729eaef17823a230b44b68fbc5fca988f8fb080f66b
 DIST dnssec-tools-2.2.tar.gz 4430138 BLAKE2B 52683f19d66066b2938ef3667d066a6ab59b4579cb2cbba87c79b42700d3f70bfe84c0f712bca607ee3023d152b16b0ba1a9635e7779cc61aab7a2c8f9d05830 SHA512 5d0d936a2dabc648033cbd74ff6f1b309ae66bf3f2ab1223c8be5879fa4385bfdfd8cee2b4005b0d0e7ed85eeb1b81a9a4092d300fa725d4b19a84bf2619a280
-EBUILD dnssec-tools-2.1.ebuild 1710 BLAKE2B 82ce6b58798cac2cc6ba83406601f05e3ca0aa24d21a2889295dced29aaaf7b197749e3d34e20fd12dd3103cede0e147a82a5550d223c7020612236b787c88d3 SHA512 eeda38dcf6cef55c85c1eca35c64e4a98bb8ae012ce86ccc17b8a060aff27680a172c91e94e13ec51c92fe4610136e2cdff3fa4a41bb8710321f446f20fe77bb
-EBUILD dnssec-tools-2.2.ebuild 1710 BLAKE2B 82ce6b58798cac2cc6ba83406601f05e3ca0aa24d21a2889295dced29aaaf7b197749e3d34e20fd12dd3103cede0e147a82a5550d223c7020612236b787c88d3 SHA512 eeda38dcf6cef55c85c1eca35c64e4a98bb8ae012ce86ccc17b8a060aff27680a172c91e94e13ec51c92fe4610136e2cdff3fa4a41bb8710321f446f20fe77bb
+EBUILD dnssec-tools-2.2-r1.ebuild 1738 BLAKE2B 9076088f0c4cec7ba5780d032b127faa0d2b6d493543daafcaec4ae8bd140baa713d6ba06a2e7c93396be36d5a1a2e4e3fa99e6988630ff8158143df45d29552 SHA512 47d8c2b6941a91b400cad6920c3ce582154dbe48d15108a63ff7c5b65fed3b38e393a909c0a6f0f4ca50662e142a748b73e6e380f68110528b63dd52dfb2059e
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/net-dns/dnssec-tools/dnssec-tools-2.1.ebuild b/net-dns/dnssec-tools/dnssec-tools-2.1.ebuild
deleted file mode 100644
index bb63dd7c5455..000000000000
--- a/net-dns/dnssec-tools/dnssec-tools-2.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils qt4-r2 systemd readme.gentoo
-
-DESCRIPTION="tools to ease the deployment of DNSSEC related technologies"
-HOMEPAGE="http://www.dnssec-tools.org/"
-SRC_URI="http://www.dnssec-tools.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Crypt-OpenSSL-Random
-	dev-perl/Getopt-GUI-Long
-	dev-perl/GraphViz
-	dev-perl/MailTools
-	dev-perl/Net-DNS
-	dev-perl/Net-DNS-SEC
-	dev-perl/XML-Simple"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e '/^maninstall:/,+3s:$(MKPATH) $(mandir)/$(man1dir):$(MKPATH) $(DESTDIR)/$(mandir)/$(man1dir):' \
-		-i Makefile.in || die
-	sed -e 's:/usr/local/etc:/etc:g' \
-		-e 's:/usr/local:/usr:g' \
-		-i tools/donuts/donuts \
-		-i tools/etc/dnssec-tools/dnssec-tools.conf \
-		-i tools/scripts/genkrf || die
-	epatch "${FILESDIR}"/${PN}-2.0-dtinitconf.patch
-}
-
-src_configure() {
-	econf \
-		--disable-bind-checks \
-		--without-validator \
-		--with-perl-build-args=INSTALLDIRS=vendor \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/rollerd.initd rollerd
-	newconfd "${FILESDIR}"/rollerd.confd rollerd
-	systemd_dounit "${FILESDIR}"/rollerd.service
-
-	newinitd "${FILESDIR}"/donutsd.initd donutsd
-	newconfd "${FILESDIR}"/donutsd.confd donutsd
-	systemd_dounit "${FILESDIR}"/donutsd.service
-
-	prune_libtool_files
-	readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please run 'dtinitconf' in order to set up the required
-/etc/dnssec-tools/dnssec-tools.conf file
-
-DNSSEC Validator has been split into net-dns/dnssec-validator
-"
diff --git a/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild b/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild
new file mode 100644
index 000000000000..6b83d1c27fd7
--- /dev/null
+++ b/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1 systemd
+
+DESCRIPTION="Tools to ease the deployment of DNSSEC related technologies"
+HOMEPAGE="https://www.dnssec-tools.org/"
+SRC_URI="https://www.dnssec-tools.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Crypt-OpenSSL-Random
+	dev-perl/Getopt-GUI-Long
+	dev-perl/GraphViz
+	dev-perl/MailTools
+	dev-perl/Net-DNS
+	dev-perl/Net-DNS-SEC
+	dev-perl/XML-Simple"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0-dtinitconf.patch )
+
+src_prepare() {
+	default
+	sed -e '/^maninstall:/,+3s:$(MKPATH) $(mandir)/$(man1dir):$(MKPATH) $(DESTDIR)/$(mandir)/$(man1dir):' \
+		-i Makefile.in || die
+	sed -e 's:/usr/local/etc:/etc:g' \
+		-e 's:/usr/local:/usr:g' \
+		-i tools/donuts/donuts \
+		-i tools/etc/dnssec-tools/dnssec-tools.conf \
+		-i tools/scripts/genkrf || die
+}
+
+src_configure() {
+	econf \
+		--disable-bind-checks \
+		--without-validator \
+		--with-perl-build-args=INSTALLDIRS=vendor \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/rollerd.initd rollerd
+	newconfd "${FILESDIR}"/rollerd.confd rollerd
+	systemd_dounit "${FILESDIR}"/rollerd.service
+
+	newinitd "${FILESDIR}"/donutsd.initd donutsd
+	newconfd "${FILESDIR}"/donutsd.confd donutsd
+	systemd_dounit "${FILESDIR}"/donutsd.service
+
+	find "${ED}" -name "*.la" -delete || die
+	readme.gentoo_create_doc
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Please run 'dtinitconf' in order to set up the required
+/etc/dnssec-tools/dnssec-tools.conf file
+
+DNSSEC Validator has been split into net-dns/dnssec-validator
+"
diff --git a/net-dns/dnssec-tools/dnssec-tools-2.2.ebuild b/net-dns/dnssec-tools/dnssec-tools-2.2.ebuild
deleted file mode 100644
index bb63dd7c5455..000000000000
--- a/net-dns/dnssec-tools/dnssec-tools-2.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils qt4-r2 systemd readme.gentoo
-
-DESCRIPTION="tools to ease the deployment of DNSSEC related technologies"
-HOMEPAGE="http://www.dnssec-tools.org/"
-SRC_URI="http://www.dnssec-tools.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Crypt-OpenSSL-Random
-	dev-perl/Getopt-GUI-Long
-	dev-perl/GraphViz
-	dev-perl/MailTools
-	dev-perl/Net-DNS
-	dev-perl/Net-DNS-SEC
-	dev-perl/XML-Simple"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e '/^maninstall:/,+3s:$(MKPATH) $(mandir)/$(man1dir):$(MKPATH) $(DESTDIR)/$(mandir)/$(man1dir):' \
-		-i Makefile.in || die
-	sed -e 's:/usr/local/etc:/etc:g' \
-		-e 's:/usr/local:/usr:g' \
-		-i tools/donuts/donuts \
-		-i tools/etc/dnssec-tools/dnssec-tools.conf \
-		-i tools/scripts/genkrf || die
-	epatch "${FILESDIR}"/${PN}-2.0-dtinitconf.patch
-}
-
-src_configure() {
-	econf \
-		--disable-bind-checks \
-		--without-validator \
-		--with-perl-build-args=INSTALLDIRS=vendor \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/rollerd.initd rollerd
-	newconfd "${FILESDIR}"/rollerd.confd rollerd
-	systemd_dounit "${FILESDIR}"/rollerd.service
-
-	newinitd "${FILESDIR}"/donutsd.initd donutsd
-	newconfd "${FILESDIR}"/donutsd.confd donutsd
-	systemd_dounit "${FILESDIR}"/donutsd.service
-
-	prune_libtool_files
-	readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please run 'dtinitconf' in order to set up the required
-/etc/dnssec-tools/dnssec-tools.conf file
-
-DNSSEC Validator has been split into net-dns/dnssec-validator
-"
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 23c01eacc499..0ae284195454 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/arptables/Manifest b/net-firewall/arptables/Manifest
index 51b27ce7e831..d278b4334697 100644
--- a/net-firewall/arptables/Manifest
+++ b/net-firewall/arptables/Manifest
@@ -1,9 +1,3 @@
-AUX arptables-0.0.3.4-arptables_save.patch 893 BLAKE2B a04b621cf62dcfc0887b93f2dc67ff39bbdc542eb68c33f1c17a80c22bf15d284fa0940689f47a26629d899888fa4c30cf1501d2334bfa6f5bf95190b75b7b13 SHA512 eb0c76d754a5370ab5967e4fcc3544d9dd72f16692c50a399177da57600eb28d4fe9bed5f510b6f23f18db3775433b399b09c679275b93c3fbabc77d81f550b1
-AUX arptables-0.0.3.4-ldflags.patch 372 BLAKE2B b618b21e569228520304be74b7e93676c09a44049f7394ec34315311d84a431ee39b24ef2d796365967d14c31a3b879fbc085876983fb02d93f53d7c833597b3 SHA512 7620d7f16c0a2d25070f32222935db49d2a8fd675612af72b5bea18a6b0db42cf30f4a854f2f5c2f1185e1fd5f7780ddd3e2d7d4eb335ddf24a53318f490bd06
-AUX arptables-0.0.3.4-manpage.patch 447 BLAKE2B d165642f0e97056edd11152a1c3bd429793d8061c4d06e502fe1ae0d6146b7f4048e70f102e4fc3c3ef4875b350135dc93e9d4a7628aff64aa010ed029324202 SHA512 72860d0f7b33e42bdfe1470399391eb64a3d5543b6b071aab1c9c428f7e56e7a0f115d82c1f5a57f5d324a13b1d58a23adc8a656a8c4f1d4a71a5d0810b5802f
-AUX arptables-0.0.3.4-type.patch 935 BLAKE2B 7534adfd33baba8b7ac30b739007f9e77c8d488bde0d6a5a9088557f9ae02523ba0604395e3c02ef974c1e29a9b4243f6db3d498573c15f0adfffee9c939e5a3 SHA512 4e87cac250cf6b23c54bf9d6b09360300e803cbb76ebb30d166525a6a1069b67eddb46e73d21be18926b2222386a5fee4ef249dff2fba9b03e1b40c2e64681ae
-DIST arptables-v0.0.3-4.tar.gz 44335 BLAKE2B a5764ad0976cddd10d0fc727609a5d6d68bd19422900401040990d464940c87855b82e8da994a23e62a233ace2a7f1fdecc20161855ed41925f34cf1e796a29f SHA512 a566b6df5c4b22c9c15d22c3801763e640f15b76043123c4ca8db1cc753a20a99b8b7b6dae2f0d9277cc6c49bcb269ba481958bcff3f6a516c7c9d8b553d35b5
 DIST arptables-v0.0.4.tar.gz 45380 BLAKE2B a256aa280aa65fae8c5b17477fedb3fed4973e8d76746d5832184858b77111eb22bec63211a1ddfb74d25bdc23b0f237caf5ac7effa85433d0f63c51e23a3ef1 SHA512 bd84e93ab5e0a038753aa17dae9e1f48364f2d2b1492dce2edac117e21edd5aa912be7b9e21bf4fb3698031d2f765a75fa067fe10ce20a1c8951ae7efcc5dbbd
-EBUILD arptables-0.0.3.4-r2.ebuild 1013 BLAKE2B 9d053f6db1ff97309d8995972a72356e4c7e4282ff0bf9a7e342c98cdb3c4a46c275b21afd1c0268f826c33a7866f7d9c87e5b03b13300cb3d4e3984783246b0 SHA512 8855aa2f610f8bdd5931cd0c6a8a78fffc711b49a8eaf34d65a47e4cae6b2a6cd50f94dc727a7cd5e700e56768192811aa42d2e399f17e0f8e1f61b93d37d83d
-EBUILD arptables-0.0.4.ebuild 768 BLAKE2B 2030d6c9db42cd42fa6a098c9feb3bcbe32563d09e9efd6cc3f003bc070c9734764237205cd1192e2b21c890e1a9fe1527c2b34f9caf50128f42b0dab877e715 SHA512 ae7eb923eeb1c9cedafcfbb1139dc9067955bd89c9d758448b04646cfa84d63e05651e1caeebc4d96bf30f6a29e5ee1ad9dbfc6190d1f822d1007a17d691f920
+EBUILD arptables-0.0.4.ebuild 767 BLAKE2B 643669923fb19fe90de6eed8acbba68e113cdd8572c025d694c2672fb053f71837980e88bd0991d7bc55376dbc785d72f1c51e8a2603831dfe4484463f8b7d6c SHA512 8e731f2562f779bb89abacb1de3fb7083959ef7b322c81186273f995f07b0cbbc7f30f5cece5118a4510f9a3914d4800f6b167c26e0098203adde3d02dfea557
 MISC metadata.xml 335 BLAKE2B 322b571e61e782fd11e8ddabf27e3c58827d150770bcc7f8c512564012d1cd927c5c518491f8546a64a38432ff0ffd1f06f0d52b54fdcd5f6cd96ef13b702de2 SHA512 840c9d22c1e29b4ddfd6b230e293766fb4b6d5cefc9a5839765629fa33adbddbaa3157d12be851e458030406af95c8e3356577fd20c0f876b43153e89ae298df
diff --git a/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild b/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild
deleted file mode 100644
index 14b31b9b2647..000000000000
--- a/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit versionator eutils
-
-MY_P=${PN}-v$(replace_version_separator 3 - )
-
-DESCRIPTION="set up, maintain, and inspect the tables of ARP rules in the Linux kernel"
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ebtables/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	epatch "${FILESDIR}/${P}-arptables_save.patch"
-	epatch "${FILESDIR}/${P}-manpage.patch"
-	epatch "${FILESDIR}/${P}-type.patch"
-}
-
-src_compile() {
-	# -O0 does not work and at least -O2 is required, bug #240752
-	emake CC="$(tc-getCC)" COPT_FLAGS="-O2 ${CFLAGS//-O0/-O2}" || die "make failed"
-	sed -ie 's:__EXEC_PATH__:/sbin:g' arptables-save arptables-restore \
-		|| die "sed failed"
-}
-
-src_install() {
-	into /
-	dosbin arptables arptables-restore arptables-save || die
-	doman arptables.8 || die
-}
diff --git a/net-firewall/arptables/arptables-0.0.4.ebuild b/net-firewall/arptables/arptables-0.0.4.ebuild
index c69397f10400..f53623192423 100644
--- a/net-firewall/arptables/arptables-0.0.4.ebuild
+++ b/net-firewall/arptables/arptables-0.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-firewall/arptables/files/arptables-0.0.3.4-arptables_save.patch b/net-firewall/arptables/files/arptables-0.0.3.4-arptables_save.patch
deleted file mode 100644
index a1b60b24ea10..000000000000
--- a/net-firewall/arptables/files/arptables-0.0.3.4-arptables_save.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# Don't resolve host names and don't convert '*' interface names to any.
-# Remove '*' interface names.
-
-diff -urNad arptables-0.0.3.3~/arptables-save arptables-0.0.3.3/arptables-save
---- arptables-0.0.3.3~/arptables-save	2009-08-19 14:17:17.000000000 +0200
-+++ arptables-0.0.3.3/arptables-save	2009-08-19 14:19:58.000000000 +0200
-@@ -35,6 +35,8 @@
- 	# Due to arptables "issues" with displaying device names
-         # we need to use -v and then do some processing
- 	$line =~ s/\s,\s.*//;
-+	$line =~ s/-i\s\*//;
-+	$line =~ s/-o\s\*//;
-         $rules = $rules . "-A $chain $line\n";
-     }
- 
-@@ -47,7 +49,7 @@
- # ========================================================
- 
- unless (-x "$tool") { print "ERROR: Tool $tool isn't executable"; exit -1; };
--$table =`$tool -t filter -L -v`;
-+$table =`$tool -t filter -L -v -n`;
- unless ($? == 0) { print $table; exit -1 };
- &process_table($table);
- 
diff --git a/net-firewall/arptables/files/arptables-0.0.3.4-ldflags.patch b/net-firewall/arptables/files/arptables-0.0.3.4-ldflags.patch
deleted file mode 100644
index b5ced69c504b..000000000000
--- a/net-firewall/arptables/files/arptables-0.0.3.4-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'Makefile'
---- Makefile	2010-09-15 11:51:49 +0000
-+++ Makefile	2010-09-15 11:52:56 +0000
-@@ -31,7 +31,7 @@
- 	$(CC) $(CFLAGS) -c -o $@ $<
- 
- arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS)
--	$(CC) $(CFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- $(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8
- 	mkdir -p $(@D)
-
diff --git a/net-firewall/arptables/files/arptables-0.0.3.4-manpage.patch b/net-firewall/arptables/files/arptables-0.0.3.4-manpage.patch
deleted file mode 100644
index 76295b6d9b5c..000000000000
--- a/net-firewall/arptables/files/arptables-0.0.3.4-manpage.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNad arptables-0.0.3.3~/arptables.8 arptables-0.0.3.3/arptables.8
---- arptables-0.0.3.3~/arptables.8	2007-08-19 15:04:51.000000000 +0200
-+++ arptables-0.0.3.3/arptables.8	2008-05-08 18:56:35.000000000 +0200
-@@ -22,7 +22,7 @@
- .\"
- .\"
- .SH NAME
--arptables (v.0.0.3-3) \- ARP table administration
-+arptables \- ARP table administration
- .SH SYNOPSIS
- .BR "arptables " [ "-t table" ] " -" [ AD ] " chain rule-specification " [ options ]
- .br
diff --git a/net-firewall/arptables/files/arptables-0.0.3.4-type.patch b/net-firewall/arptables/files/arptables-0.0.3.4-type.patch
deleted file mode 100644
index 851bf0ee247f..000000000000
--- a/net-firewall/arptables/files/arptables-0.0.3.4-type.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# Patch from Jeroen van Wolffelaar <jeroen@wolffelaar.nl> to make
-# arptables --proto-type also accept hexadecimal inputs (ethernet protocol
-# numbers are often specfied in hex, not decimal), using standard strtol()
-# behaviour (hex iff starts with 0x).
-
-diff -urNad arptables-0.0.3.3~/arptables.c arptables-0.0.3.3/arptables.c
---- arptables-0.0.3.3~/arptables.c	2007-08-19 15:04:51.000000000 +0200
-+++ arptables-0.0.3.3/arptables.c	2008-05-08 19:16:43.000000000 +0200
-@@ -2039,7 +2039,7 @@
- 			check_inverse(optarg, &invert, &optind, argc);
- 			set_option(&options, OPT_P_TYPE, &fw.arp.invflags,
- 				   invert);
--			if (get16_and_mask(argv[optind - 1], &fw.arp.arpro, &fw.arp.arpro_mask, 10)) {
-+			if (get16_and_mask(argv[optind - 1], &fw.arp.arpro, &fw.arp.arpro_mask, 0)) {
- 				if (strcasecmp(argv[optind-1], "ipv4"))
- 					exit_error(PARAMETER_PROBLEM, "Problem with specified protocol type");
- 				fw.arp.arpro = htons(0x800);
diff --git a/net-firewall/ferm/Manifest b/net-firewall/ferm/Manifest
index 56a759a116c0..c2b6ca40539c 100644
--- a/net-firewall/ferm/Manifest
+++ b/net-firewall/ferm/Manifest
@@ -1,5 +1,5 @@
 DIST ferm-2.4.1.tar.xz 71324 BLAKE2B 290cd2f6fbb1ca1c1f060f998d84eaed2ba2a6ec8f736375a460a3ae81c6f5e67c174774065a09fbe155347f6dc1b7977321d65ac753f4c28f8a47cda8409dd8 SHA512 beea4b8dd04e00662ef380442f8249c2d2dadf6d35b90e415038df807c8d08295d2575efbf3265f48f5e92afa174135a9c662f74d52545dd3e1c55a1436aa5bb
 DIST ferm-2.4.tar.gz 128776 BLAKE2B 0b7df0c38ed5d311c4cbeba7da02dd9a366161f542f24bcecb88584ea081e2815bcdaeaa9dd2731d12d7e3982cd4f2caad38def41a087451b783e1c7853f66c8 SHA512 0b36b95a5ebb4cd306f9ab84ea12ce16c15d56ecc70c895261c74310f2474946ec1e73d63e7cda5becbfa875091c1362c715226776793c5b6ed179bf543ab27e
-EBUILD ferm-2.4.1.ebuild 800 BLAKE2B 2bb6052c54f948ceb17b5e8db199e8749c56ba50549a5c95acf5eec76a89557b96e0338ef6c6e9117eca30128dae47c04d3b8fa70e97951bd0d1d9f069f0d7c4 SHA512 5cb4dd2ba44ff315e768b96e251e560b923a4887e1a8a57b92455864e2e0006df0bf8004daf9ef0c81aac57df3ae4941001b07cca630c143f003eb18216a431b
+EBUILD ferm-2.4.1.ebuild 799 BLAKE2B 083bb55bc9a5d36c93ad542075115e0102354569917e647843a156fb416da6c3a5b46e64b855c83ecba42e7229e5979359484ae101ffd817ea46080cb8869b49 SHA512 b92cf64e621a7cfe7e4bb47b8016f30e34da39c62db1bc4087a5d0198a07c9f4c1add681724d9ec671317d3be3dcc9e23f18aa9895825613459f720f22ca4d35
 EBUILD ferm-2.4.ebuild 760 BLAKE2B 82735e1a66814888b5268c33a30e4a49da6fb6276bef089f2643765d8d04e31f86bd0b127a74e47fff53652ee615ee491b2b756847f3af366631da6364e3112e SHA512 b27bc01b9c69a416f26b9a4282e8d8602de4f3a2b2b596f5a675bddb6e85d7ed00a9c92fb0572dcd411fbfdda61db070b83de3b5e4846a70cb0e56ed350a1364
 MISC metadata.xml 450 BLAKE2B a42e7896b2269a0fbb904ced374899d3a3b87d38cb08c0c6f55f570ff476d42ede3b9316b69a86a5d46b64c5d7050348efdb72c2e9b68440c4a991078ae56e42 SHA512 23ffc755aba9f3ce1acb92f3de86ec1f788bd868227b7ace77b3b7accfe891036da7e3e87254fc0bd693d7777e4c932b663e0b1118a8804b0ac2d63624a4ecac
diff --git a/net-firewall/ferm/ferm-2.4.1.ebuild b/net-firewall/ferm/ferm-2.4.1.ebuild
index 52d689b233b4..0acff45ec716 100644
--- a/net-firewall/ferm/ferm-2.4.1.ebuild
+++ b/net-firewall/ferm/ferm-2.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ferm.foo-projects.org/download/${MY_PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 # does not install any perl libs
 RDEPEND="dev-lang/perl:*
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 08d5d78e2ff0..88f22d9e17bc 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -4,8 +4,10 @@ AUX nftables.init 3069 BLAKE2B 68c6b2b81995bd909c00cc3527f891f04d0dd30532cd821c8
 AUX systemd/nftables-restore.service 394 BLAKE2B 1c1f358eb2eff789e68c051098c971f11a8df6621c3c919e30a1ec1213f6db822c390609c01827fe9fc75c540effa3e3a7b6f93bd24e16ea19841bbfaab796ed SHA512 18da6a770bb3e94fd6b2c9e6f033450aaff9fe886c8846f780d08a21e2fc884ac078652743b50b3d4ea8c9500f92d272bdd27e2881e438c2b223d40816c100a0
 DIST nftables-0.8.3.tar.gz 336963 BLAKE2B 534768559254d1c797ae84d97487dfca12bd2ab07170a8670778b46c7a6c854858b8ac670eedb0d0c443b457b4ad15d03c0a6b54ffa5ecde78ef538df71ec090 SHA512 cffea523fe2eee5937f30fe3d5215e5890dfc089d6f16d07090ef922e2782df53fe268d467734a1b6a604d7f16bca52ada3e48cce7699a59dd7a092294930332
 DIST nftables-0.8.4.tar.gz 353236 BLAKE2B 78d35880ea6cb9af2f9ed99134c930cb8bfa6290e2adee28e2147bab676ebef420db04e2eba6b8bc541c7afc040461c194e01e45f176cfbb663e04d6347bf119 SHA512 79cbf7098343cdb517a1790a72769738756eca499eb84aa7ad0b6c96314502f09ac4d03a712bfbe45fc1b8a730f2f56c6ef515e8d93d24f065a55e0594ab62bd
+DIST nftables-0.8.5.tar.gz 355403 BLAKE2B 124bc5c35f050cc591f57b39cddcd595f97d14f83aed464b42efed272a03150623667dd0ca2862833c6b86d825d264c79dd1a211b9a6913b5734c0eaa4029b13 SHA512 311ec77646e2bc7da1b46ef2aba7492a5c0fdf23d33633649a6304771c5ce5ad839353b0702e942a82508c01d1c35705b602d91e54913944e03e176dc3f855f8
 DIST nftables-0.8.tar.gz 327629 BLAKE2B a484c22ac010f68fc7458c12cabd0c35e474a0bf81fa4edbefba12d75b424898d38adb11a7fbb4542efbbb2d14be823701b3d9ced7b9fd669338366733fa169b SHA512 90ffebc338c121334ca42822793b6fdeff48390e755c690308919de47064b53f9af735a2c2914e5255f1bddec90484599337d4cdd67f7a01a3956deefcef9fcb
 EBUILD nftables-0.8-r3.ebuild 1959 BLAKE2B a029fd4444f5aeddedfbdcb3659f879c4a8f6246c25042449cb5ffa7809401a7ef512275dc1f45c50b51bc2807b3679d1c386bcb2470522ba1a338dc728bdb15 SHA512 6bd510183e9d1cec3fa05970adccf28ac21c7ad839f3a6236ee584d1308c48988ee2b006630ecd558954cb80a7a8faf6e78ab9b06b29df4b2a69161a9e848c71
 EBUILD nftables-0.8.3.ebuild 1963 BLAKE2B 338d254fcee930198bc5aa570ba0fd407e4a6e8d03c57c58de26da89077153b476dd5441e578a2f90115935c24385177d5a0787ee0225f375d3095f1991fde7f SHA512 db701128d4066a419164e3e9b26fb2442dffa5a93b69ecd2285cfd21a712da06e4763f80d43208be367bdac18d9914d60eb7d4420be91eff5acbf7a54d53fbe9
 EBUILD nftables-0.8.4.ebuild 1937 BLAKE2B b24ea2b8978dc0294c2d27a90aa205916ddeb04c2b66f0adc7e870705a6ffac8ac0e3bf5a95e3c79c27965f780c0ca94ba21bcb5abad49ce49b50ff00c2046fd SHA512 f5f461225c68ed17450380d467f79d87302f0d1c1d69ddb15f90b6a938ea79906e165e6564db8135f07eafc35fb89acfab7659a97d62c7c71ac0376953ff6954
+EBUILD nftables-0.8.5.ebuild 1937 BLAKE2B b24ea2b8978dc0294c2d27a90aa205916ddeb04c2b66f0adc7e870705a6ffac8ac0e3bf5a95e3c79c27965f780c0ca94ba21bcb5abad49ce49b50ff00c2046fd SHA512 f5f461225c68ed17450380d467f79d87302f0d1c1d69ddb15f90b6a938ea79906e165e6564db8135f07eafc35fb89acfab7659a97d62c7c71ac0376953ff6954
 MISC metadata.xml 372 BLAKE2B c1733809892af8497a3a0340d5877ec99b856083c8e16804f2129779e8065c1bd8b93f10b4c37c25e089ca474be5e18eb4344ce4e83c95c646fb9252f1451d0d SHA512 13f7b219a6a043a047b4be99f69cadf76b2a0c20800c1622f08dc9626ebc1115db79a3866fb19c1c00a98b66a692b42d42c2c3e66da654ff83e44d193da8a511
diff --git a/net-firewall/nftables/nftables-0.8.5.ebuild b/net-firewall/nftables/nftables-0.8.5.ebuild
new file mode 100644
index 000000000000..cc5cb45fc15d
--- /dev/null
+++ b/net-firewall/nftables/nftables-0.8.5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+IUSE="debug doc +gmp +readline"
+
+RDEPEND=">=net-libs/libmnl-1.0.3:0=
+	gmp? ( dev-libs/gmp:0= )
+	readline? ( sys-libs/readline:0= )
+	>=net-libs/libnftnl-1.1.0:0="
+
+DEPEND="${RDEPEND}
+	>=app-text/docbook2X-0.8.8-r4
+	doc? ( >=app-text/dblatex-0.3.7 )
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+
+S="${WORKDIR}/v${PV}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable doc pdf-doc)
+		$(use_enable debug)
+		$(use_with readline cli)
+		$(use_with !gmp mini_gmp)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	exeinto /usr/libexec/${PN}
+	doexe "${FILESDIR}"/libexec/${PN}.sh
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	keepdir /var/lib/nftables
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
+	systemd_enable_service basic.target ${PN}-restore.service
+}
+
+pkg_postinst() {
+	local save_file
+	save_file="${EROOT%/}/var/lib/nftables/rules-save"
+
+	# In order for the nftables-restore systemd service to start
+	# the save_file must exist.
+	if [[ ! -f ${save_file} ]]; then
+		touch ${save_file}
+	fi
+
+	elog "If you are creating firewall rules before the next system restart "
+	elog "the nftables-restore service must be manually started in order to "
+	elog "save those rules on shutdown."
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 6163a978c9a6..ff12c5d8fb19 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 6052d4d825b7..2d7c86736596 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,10 +1,10 @@
 AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a3bb2821ad1643e5e5d43cd18adfe5911309a24822368fd38176aaf2af99d7b098864bc5ae2d6f94ffb481a4d25340 SHA512 009946fbb676698e404b1c91bb6b14767234751cbecb7faa097692b382a65af7ab31b54f1aac81fdb72c1492db4698d24f5fa9b1966f69bffa1f4b6073283e00
 DIST FileZilla_3.25.2_src.tar.bz2 4712781 BLAKE2B c4e346442596eb2c1c7f5b541dc1386be5be13a3564187d5d7f275b5e1223cf1c95e11e27120c98276ea550d0b1c65122ffd62b5471a886faf1ebea0ab217522 SHA512 6c6feeec0b1bd15ff2c3fecbec22bca9c79f4263e0d1855c6d27a3df54128cfd837f0a546d1540b87b4645e620b57961b8ac0f01bd52748832f5625139c39764
-DIST FileZilla_3.30.0_src.tar.bz2 4855577 BLAKE2B fb146c05eccdb6bfee1fb8abebbe164440bf4bd2a2a54769218ec2b2d988dc8d32ebb711de878dfd5448befeec9858953157977aab10a6b936c5ec5d42cfae96 SHA512 e045ed07d3ca550881238935d80a9f6e972d67a40449a2bab72b29519240785e89c573af53fad702ab066cc26b7077452868bb50bfc76d371c29c86f908060fe
 DIST FileZilla_3.31.0_src.tar.bz2 4861886 BLAKE2B 675dc6263c68e00433ec81eb45ce13ae124ba020cbacd4d1ee06f703bf8579000f7d97506d24fc705cff45345a66f137bb5fadf2aef83b3c1c95f5c3a8e0fae6 SHA512 fefb1217a39214dfd1441fa45b37a461b2dab3cc80eeb82b8c1eb88b74e8be3ef6c436cbe5dba705feeb938bb2fc970863f28502d16097d01fdbf8c400b5e901
+DIST FileZilla_3.33.0_src.tar.bz2 4862360 BLAKE2B c0a5b4c1f749eacd95fe3769daa222f60e916a41430260a8816aca60c7ffe07e46c0fb1594d7fe84406185260d937290a0f736b0f408e9132b1a525ed8e7c58e SHA512 9499ea28aa1cdc29d5dcb81fe328b288bed76c4f9fdd5e4bdb7824f6328b9d58ba9274401de7d8321abab4642839c70cdbb9995d86acaed0c4f6a6b582f99ff0
 EBUILD filezilla-3.25.2.ebuild 1764 BLAKE2B ef1a42063903ebe5c1022a183627a3377a41aed5c683c30b56d29611b6ddf0dc2a86aa03385697e8bd65b9b44b72deeafbb7bc085bf05618d56c7c58cd19a367 SHA512 b7aec2a4a8f455330dccb6a1b409c718194463e762e129358fa04febd68f5cca6cc990c96284c7fc61448d7f1509037d44f4325e77cb8a563b789ab2d5961403
-EBUILD filezilla-3.30.0-r300.ebuild 1779 BLAKE2B 6b254540b9cb42e0178ffa9620b442b8e8f66b4222ec569dfdfd93c2da3f1c354a13538795a09608d98f3c0327c9ec4176111801a42966d173ac5d1b7dc9bced SHA512 6e77c93717cea75ed752692b321e0db076fe3487e148e222eaa77e9517a7d1b3c731a9818f4ce385996aa156e426e3ce6b48a1817ab5eb82321784a1be412609
-EBUILD filezilla-3.30.0.ebuild 1774 BLAKE2B a6b00b04ac2b99f32582c79e7f019c0dfa521d4b0deb1ac56551258c28e069aebcf9d8e860e7b2d2aa130453b47d012ba10f7ac7b57606bb8722c1e1fc56cdbf SHA512 f4e7176f7998eeddea6bbdb812fc5b468991f4a66d1a850ac993ace0deae0f7804133b2dcefd2cc183d62a5e09be6fc5ee62dcc41a02fcdac92131b5e05b48d8
 EBUILD filezilla-3.31.0-r300.ebuild 1779 BLAKE2B cd5bf9d1474d09809bd28e2c24fe085b0ebf1e32644abb9f7e92af10a0233e6d1ce0f081530db9fc80665c739dad5335c384e224fcae47610c45113b0649a6ae SHA512 99851297b2efb27a085e6aadf8eca2fcfad97e7a6891f1c008cdde8a6fa53d41a5acc325453854ee877200f020068e6a8092555a982985b61d58a654d2e7248f
 EBUILD filezilla-3.31.0.ebuild 1774 BLAKE2B a3361899775cc8f5ece3230ad9de70b34474fbc9209cbfa05db12f890df4d056c556ed29283e135a6d98a23d8e2651bee5cb02e2e3844c9622e3a9796bc40aec SHA512 b7ab34827077922e3dbaea323a4a78960468d7bd90fcce4c1e9d64e5d778271379a27e7cf9f9f39426a3786d65526c60950348706bf32c174b94a57eac1e487b
+EBUILD filezilla-3.33.0-r300.ebuild 1807 BLAKE2B 9ff4a90b5d0c673f2f93bb51cf35fbc26eb8ee82637403b9e5b237a7a7bfdd23587fce50ce7a00aa0c28e2d86ea1e7a62b2a268623fb020204ae59caf87eac1e SHA512 e12932431d79358175c58e2d58f1f0b283126dd2a213a5a45754e2d8c2e9587ffd4d1d2cd55d3f240ab1824c1fee49623337e5605867ceaf0f2d40dbdeabca10
+EBUILD filezilla-3.33.0.ebuild 1802 BLAKE2B 70910aa8282d8f1a625f27ae330793f90c891a61aadec98e76a192994af131df372310c15282d85b09cecb2b4d7a4ee62cf50e33a0ab9d168e75257ce72c81dd SHA512 a80cedd12782d54d96eaf7692f79d5a5680658ae588394cfa53830a39a7b139e41b0f081180a6482557b84ac166a31b5d572262d49dda6065d1286c766627af7
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.30.0-r300.ebuild b/net-ftp/filezilla/filezilla-3.30.0-r300.ebuild
deleted file mode 100644
index d12dacada518..000000000000
--- a/net-ftp/filezilla/filezilla-3.30.0-r300.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools eutils flag-o-matic gnome2-utils multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.10.0
-	>=dev-libs/pugixml-1.7
-	net-dns/libidn
-	>=net-libs/gnutls-3.4.0
-	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_prepare() {
-	setup-wxwidgets
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=system \
-		--disable-autoupdatecheck
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-ftp/filezilla/filezilla-3.30.0.ebuild b/net-ftp/filezilla/filezilla-3.30.0.ebuild
deleted file mode 100644
index 068e70fbb993..000000000000
--- a/net-ftp/filezilla/filezilla-3.30.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic gnome2-utils multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.10.0
-	>=dev-libs/pugixml-1.7
-	net-dns/libidn
-	>=net-libs/gnutls-3.4.0
-	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_prepare() {
-	setup-wxwidgets
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=system \
-		--disable-autoupdatecheck
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-ftp/filezilla/filezilla-3.33.0-r300.ebuild b/net-ftp/filezilla/filezilla-3.33.0-r300.ebuild
new file mode 100644
index 000000000000..7895c9ff9fcb
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.33.0-r300.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools eutils flag-o-matic gnome2-utils multilib wxwidgets
+
+MY_PV=${PV/_/-}
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://dl2.cdn.filezilla-project.org/client/${MY_P}_src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="dbus nls test"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.12.2
+	>=dev-libs/pugixml-1.7
+	net-dns/libidn
+	>=net-libs/gnutls-3.4.15
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )
+	test? ( >=dev-util/cppunit-1.13.0 )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DOCS=(AUTHORS ChangeLog NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_prepare() {
+	setup-wxwidgets
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-pugixml=system \
+		--disable-autoupdatecheck
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-ftp/filezilla/filezilla-3.33.0.ebuild b/net-ftp/filezilla/filezilla-3.33.0.ebuild
new file mode 100644
index 000000000000..506fc6d9f961
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.33.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit autotools eutils flag-o-matic gnome2-utils multilib wxwidgets
+
+MY_PV=${PV/_/-}
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://dl2.cdn.filezilla-project.org/client/${MY_P}_src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="dbus nls test"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.12.2
+	>=dev-libs/pugixml-1.7
+	net-dns/libidn
+	>=net-libs/gnutls-3.4.15
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )
+	test? ( >=dev-util/cppunit-1.13.0 )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DOCS=(AUTHORS ChangeLog NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_prepare() {
+	setup-wxwidgets
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-pugixml=system \
+		--disable-autoupdatecheck
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index 6cb468f9d5ae..e2067f134974 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 1109 BLAKE2B 281f8c15f3bbf74c4accd3b5d48944ee5c9244bdd93255947ada5c6b9af9992b3cadb685978462c47eecd1f57ecda9077508be005b8ffcf1941dff941669b3dd SHA512 8fbe6004dc0895e229294c738fa590269ea548ffac721c8f4ff80522b0ca88a57d48abbbaeadd7d3956f7e392f7875912c833f0c6d6558542e12541cfe33933c
-EBUILD ftp-0.17.23.0.2.1.ebuild 1559 BLAKE2B fbef5e344e028fe2be8fdfe0a379c48e14da663216f2eecbdd1141a8713736823649ebb2c738c49a1fde661f508cc0b0accf663f49cf76f7a682f2728f0a4874 SHA512 86cb0b67cc5032e0cfdbaf23a731368029b38bb0d33e863a8f3a326d3cdb7988d60a373af80d7857f77365bb455221cfd4c68f6f3ac579e24f009e24a8b0b2dd
+EBUILD ftp-0.17.23.0.2.1.ebuild 1557 BLAKE2B 18ddb66949a826dfd52572c152a20a3d2f8fb98ba6deb42114f03363f53cfc4b1bac962cd8850a6e404719bac9cbeff272712541f798c8fdd48099d45e959b31 SHA512 60583b1c084cc68c06d19d646833ef002d3e85fa2e299e8dbe9f8c1cab5c4173d950592416a812df126b8e38f1caf12ea6a80f2c260c6792762c8159756d5aad
 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 d8513d331583..c107e4e7ccc0 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-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index a258fdc25527..358b27f142f9 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -9,8 +9,7 @@ AUX oftpd-0.3.7-pthread-cancel.patch 797 BLAKE2B 07b08302c9cb1b50454031c16b2b01d
 AUX oftpd-0.3.7-unistd.patch 448 BLAKE2B 4f69ab2c867f2c443c0a5cfc0637b92a486a757d43a39d5b02ba81ebde87535949e4d0f6e5afa9a0d7c248477746f917a92091ca36d764f1896f60a007495662 SHA512 0e0ad78eecb9f2be425fcda44e624fe118ceb0ccb094a05bce96a9bb1268bf58e4a8efab553e767d4ad2165e9bc5b360f5d36ad28b21ccfee35f9a2809a96d7e
 DIST oftpd-0.3.6-ipv6rel2.patch.gz 12478 BLAKE2B 1d367979261fff05bdfa22201cf06ae537d7bc7cd656708cd2c672b8c437ec8b42d94c84c387ee450da140feab4af98e4601a1126077acdd93959284a28548b2 SHA512 76d12b82424a9a338f151534df55310511d3138a1e80851e6ebb8f4a841cd075892ab1a02851d871772a2229c107ec35de2d5fb3572c72207a65629e10e55dba
 DIST oftpd-0.3.7.tar.gz 97364 BLAKE2B 4fef7204d905d248f5fbf1e641d015c0549dfcc08b0ad98ac3557250ca91dda2e25d0aaffe09c9d68d47318b977a637f693e5bbd359c20e894a656a412fccf59 SHA512 36bfd15dbe84043aee9678acbcc2c1312091887b381bee36a6a57f2516a5ec742a1733bf570c7cc71aaa28bd053d686976e6bfd549443a8bb398f8176db1a6a8
-EBUILD oftpd-0.3.7-r10.ebuild 1302 BLAKE2B 23f6df78911647ab2c89bcac21a591e3c209b532098edb1ac4612ace8bb51f7e66720edd8a99da1f045db538ec96ac901872a942036907ad88af516144720e64 SHA512 5d6d12cf2dea696be1ec86b9916598a6accedcdf7c945ee6b89a1ad1486a1357d5b94d0aaea8a1b837fd41583451dbb483b8ba1d3a5b12e2dd8bbe52cdeb3f06
-EBUILD oftpd-0.3.7-r7.ebuild 1122 BLAKE2B 92dc5aeffad04e5d801d592c1f49ff6e2f451ec2526590806f1684ab919f82ca69e39a41bb585a8e82c3bcae00519e75975af1b8d07b34e2c314cbe416814247 SHA512 c87bbc4ab04e0e3c58e97f99f1b1f8a5fbb7039b0018fc6a0145f87895612f14e6a585c31df9d57c1843b778519aa9f504ae9aa1fadcfd3d6943fe21e3930d10
+EBUILD oftpd-0.3.7-r10.ebuild 1300 BLAKE2B a91dac4853eafd26eee790ed50adc993ba0a9dc4ce4ae76c52c2b3db4ec42fdc81f1593908c20ada6a1f2876d6e6bcc6ae07de300a452d8ef273baf81902fd1f SHA512 b7a7edeb28fc46bd16d574b67ad04248bf7c6b023cd7cf539a876e13949a50e2842014b7ba0e10b36a72370f6cfec1054b44151f8e8191fd7922dfe4dda81a8b
 EBUILD oftpd-0.3.7-r8.ebuild 1142 BLAKE2B f7349d9da7243c6e78cc17d59df6356120cabc22d21166023f3c0cb625555abfac1b397180b6b033d6662b84b91aa069a4d2c17bc1c2d9a19ffeeaa9e199ef6f SHA512 4b1da7307d64982fc1ed31bf71908cfde352ff8e19219a16f7744d18de62b5ad83b6939384342f0120fa982641c595e42bedb948c592d96d26f13379c7be1c50
 EBUILD oftpd-0.3.7-r9.ebuild 1199 BLAKE2B 2c9edb9d1dc5ae6a4d54f925640b5b2a73f6da56fedb3c88f51553525fa146cc054ac9ac298f96e81aa05e50acd2259a9afac9852ba8326f38c60844e082b868 SHA512 89e5f21643f26c2fbcc855fe1a473918e17949cddaeedb9137a41636664205166b53e3d7716e606f867bf8057194247071aa73948cd397b930545def3013437b
 MISC metadata.xml 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild
index b1c5b9e701c4..b8a810ca1888 100644
--- a/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 ~sh sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 sh sparc x86"
 IUSE="ipv6"
 
 DEPEND="net-ftp/ftpbase"
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild
deleted file mode 100644
index d898a4dba669..000000000000
--- a/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit autotools eutils
-
-DESCRIPTION="Secure, small, anonymous only ftpd"
-HOMEPAGE="http://www.time-travellers.org/oftpd"
-SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz
-	ftp://ftp.deepspace6.net/pub/ds6/sources/${PN}/${PN}-0.3.6-ipv6rel2.patch.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sh sparc x86"
-IUSE="ipv6"
-
-DEPEND="net-ftp/ftpbase"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	epatch "${FILESDIR}"/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
-
-	cd "${S}" || die
-	epatch "${WORKDIR}"/${PN}-0.3.6-ipv6rel2.patch
-
-	# Don't crash when using an unsupported address family, #159178.
-	# updated in bug #157005
-	epatch "${FILESDIR}"/${P}-family-1.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --bindir=/usr/sbin $(use_enable ipv6)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS FAQ NEWS README TODO || die
-	keepdir /home/ftp
-	newinitd "${FILESDIR}"/init.d.oftpd-r7 oftpd || die
-	newconfd "${FILESDIR}"/conf.d.oftpd-r7 oftpd || die
-}
diff --git a/net-ftp/uftpd/Manifest b/net-ftp/uftpd/Manifest
index 33ccaf742655..fa80b85de43f 100644
--- a/net-ftp/uftpd/Manifest
+++ b/net-ftp/uftpd/Manifest
@@ -1,4 +1,4 @@
 DIST uftpd-2.4.tar.xz 173132 BLAKE2B 5bb1d90a2353e34d1a2346fa09c9843e598827875cc2c09beabf3916e34693dca17bc0d1f00773ce823cb79685204a20fa16d7abc8d4c88085dd1bdafc7e5acc SHA512 1ed9ed4429a3e7a08ac902ebac95610e58164f3528a8fc00a745c0545aae4e13d3bcbf597bcae6ba045b24ee9ba3c39ec0617068920bcc4bbc3f5ef246d4c404
-EBUILD uftpd-2.4-r1.ebuild 463 BLAKE2B d4bb489ebe0d546bc45316b8ee86722dac73ca6424568fdf655e6915607366aa513d8d42e01ec0ee6d1b3d681e18d50e88612b61a64aca140ce22f69e3ed5046 SHA512 6c1224fe83aee499fd89dca721049ded3547f551697109a3f5945cb229ecb7394e5b2274aa400f3a43cd42f6a2ffa3a05982eb93babca628ca433b941f55739c
-EBUILD uftpd-2.4.ebuild 429 BLAKE2B 924a8756b8e22b0cd9b329aba92fe4cd3b656c7add29906fa6efce8067aeaf56ce1eaffbc41c435efb9e3ab8148b6a4abc316d9d158f1338596b5bfd252d1e38 SHA512 11e97c07c19849fc3d20c2e00a43735fc63370abbee4f6d4305d3303429343d93350a03ce50ba9542fa6119f6d205fbd710bc7969195bb0b3e372ee036158465
+EBUILD uftpd-2.4-r1.ebuild 457 BLAKE2B 33c4de8d31cbf9d7c14efd8173fda8136afc8c3fa4f43d964220c9c7c05cd6ac95d1dfe2556b1887e6a3545b05dc4c45be537ce034f423cab6fab714406c061f SHA512 f0451976a5643cc09a4e185c4c01b8a3ffdb7ade01609f68b849af1697db1cfe45b1ed2709b18934e847f02bce3b061cddb221788184a5b57a202398f84bfedc
+EBUILD uftpd-2.4.ebuild 428 BLAKE2B b047cc73d1822a2f401074c34aaf804b3fbf7a3b87b3d7e217c96f8f7f000f7dbfbb0fd695b8e69021910d23e49c388ea39c404c4f514e1bf19bb14f663d57b1 SHA512 94172f2592ca4164e8eaecbae9fcc12d972b4ab2703968cc80eee7a034f557d60840db8ee2c4546956a200c3b98d48b8efdbd02b8c852fd6ec89da4f7be40634
 MISC metadata.xml 919 BLAKE2B b8bb2ddc64dc727547cf908e62df335d5cdf71132a2292e14a7e995d48364de64adde5d0035af3ddbdbdd8b64640b929cd3de0cdd62f49e2480154b1e5d543e4 SHA512 fec60605c1a67eee40734f15395129e76cfd0d0fbde24e977a61973e960704cd5be83e68094d45b0b2ce9b688c5d27cf41c4fb540094b7be532e1563ab622d31
diff --git a/net-ftp/uftpd/uftpd-2.4-r1.ebuild b/net-ftp/uftpd/uftpd-2.4-r1.ebuild
index 93af03f1dfa4..5739b08fde28 100644
--- a/net-ftp/uftpd/uftpd-2.4-r1.ebuild
+++ b/net-ftp/uftpd/uftpd-2.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-DESCRIPTION="The no nonsense TFTP/FTP server."
+DESCRIPTION="The no nonsense TFTP/FTP server"
 HOMEPAGE="https://github.com/troglobit/uftpd"
 SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
@@ -14,12 +14,10 @@ IUSE=""
 
 RDEPEND="
 		!net-misc/uftp
-		!net-ftp/atftp
-		"
+		!net-ftp/atftp"
 
 DEPEND="
 	dev-libs/libite
-	dev-libs/libuev
-	"
+	dev-libs/libuev"
 
 RDEPEND="${DEPEND}"
diff --git a/net-ftp/uftpd/uftpd-2.4.ebuild b/net-ftp/uftpd/uftpd-2.4.ebuild
index ad41f43f2ca5..e741e5bc2068 100644
--- a/net-ftp/uftpd/uftpd-2.4.ebuild
+++ b/net-ftp/uftpd/uftpd-2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-DESCRIPTION="The no nonsense TFTP/FTP server."
+DESCRIPTION="The no nonsense TFTP/FTP server"
 HOMEPAGE="https://github.com/troglobit/uftpd"
 SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 0cdfedf4b750..9bb48cd3cf34 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index a306e046bc48..e26f85427d53 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -6,5 +6,5 @@ AUX kadu-4.3-gcc7.patch 266 BLAKE2B 1211251304c10c46df75d3fbc84dff1f560c89a533c8
 DIST kadu-2.1.tar.bz2 6013519 BLAKE2B 31df1b245ec402a44c60581084d4ec9216636e14a1c11d8609862d982ad08ff3717c16bc9431c21366ef9852eb0035828a11d8010178736ec6b6ebfbadfd971c SHA512 3f0e38aefbaf15f357ae8232b1364deb5954a2464895fafa0a324ad99c7d14c6ba7495bed51d628e04c30bbaaf8e49412c70bbbbf01a40f360406c1afba2384a
 DIST kadu-4.3.tar.bz2 8087786 BLAKE2B b63ce2beebb1fd1f64ae8e85430784c6c7d25a071e00342e33d97a2e49b25c02ab131fb30d591acc11a336427118d4dd23e03d89ad07ef066eca09d0463397db SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9
 EBUILD kadu-2.1-r1.ebuild 2753 BLAKE2B e113a680d09511ed47661fff15025fd5f018b2f260b5f2a139efb4852fc7dd8732effee8c75518229ab40d86c5e164eea8f79c62af2cc8e1de6198cd03fa2396 SHA512 c419340e5107b22b678d3b61abe921b29a4155df0773a21edcab6e513100e6cbec823d5effa1975066b04df815f3bfffba308df649c555148e3c3ca18390d56e
-EBUILD kadu-4.3-r2.ebuild 2584 BLAKE2B f4ce1206f8989d40aa6e05a5cf4b4e3739a0febc217e5c6dced5ca35ad24066b946cf042717dcba92c71cda662cad2257985fe2eca1941cc26b26a5a351a1ebf SHA512 3752855bcb6588f7c3d20f431a39ba77dd508cd38a6afe5d963802caf737e3a3aa0597a70413f4e0860a0b9e7d02a68b450315ec8a916d3624a9ef473956397d
+EBUILD kadu-4.3-r2.ebuild 2583 BLAKE2B 75dea3c689db049c9d7649ac5746c6bdb0d76e8947f21f6c48eb7a2e56408c7c7ca3a947220f34b09611e68907dbc51b187151e4ac415852b2af006d4412a89b SHA512 485c06669a74a70a6da64bd336c92acb3e6b5614a53174aca14d34d8200da8ff90df755f25052c2113da34479f3430ff481b43e0c7c1cc8575d39e3f97d8201b
 MISC metadata.xml 635 BLAKE2B 024363b73640cde3ad95f4c1a0a953cc87ea0786da585cdf7b69c75ed2c472120af558d099cced80eaeea6ff293f6502e1cc8e7b2a60621682947b28a95818d3 SHA512 91bc130c8ea984c22e84a1702216fb78956f9c25a60fadab7c9b2afa04067306ffa8936db29eb138b6f95c41b8b99ac18b26b4747a054bf56eb0af87f8cb0571
diff --git a/net-im/kadu/kadu-4.3-r2.ebuild b/net-im/kadu/kadu-4.3-r2.ebuild
index fd0611532b63..e348cb31a4d5 100644
--- a/net-im/kadu/kadu-4.3-r2.ebuild
+++ b/net-im/kadu/kadu-4.3-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kadu.net"
 SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="0"
 IUSE="+gadu mpd otr sdk speech spell xmpp"
 REQUIRED_USE="
diff --git a/net-im/libcommuni/Manifest b/net-im/libcommuni/Manifest
new file mode 100644
index 000000000000..080dbb792f77
--- /dev/null
+++ b/net-im/libcommuni/Manifest
@@ -0,0 +1,4 @@
+AUX uchardet.pri 473 BLAKE2B 811ea967aa76d8c59b4077042819aa952d2b35364fc3d8f7d9b4922839f05c8f31a9a9d33d01a23d8de7b0d0f0c4273c0f60dd27458be120c53aa229c5292917 SHA512 9661b94e66ea1223a3b76927ff88f7d50710706f9183bce2a2f3b612c280e300a9e92fa5e16b3296c26c4ce365f6c93d650c0d2e96ddbfa0159f46b819f111b1
+DIST libcommuni-3.5.0.tar.gz 646734 BLAKE2B 81e2c783625a0befe2d364423e862967bc76e8a66e9b5d7f2f94f46f46530d54b030bfd3a48d7877532092c607295cff5a77ecd8bb669112d53507a1ea18c5b0 SHA512 4d62f7e5edd32b9121f2b69d15a4022ad5d6cf7136dc48d0a1ca4bd413b3334533d7734d6939906fa3426f8db9bc255696107ecada19875c60ce59990b54dee4
+EBUILD libcommuni-3.5.0.ebuild 2246 BLAKE2B 7b32a7bdc00b5e2e0423da7c8d12e040615d9be2ed73dbac4d42c03f0805b3d050eaf65ce98bf4a312911463fdbce5f91b2b41e3fb0ea7e86a888dc7be2cb901 SHA512 008c8942a62a2eeafa66b4d983875d51be1fbdaa42fcc648d120634cc35cae91cce359df08f74012de09c81cd3477ed60fab8b2addbbd29bc2f0a9d4de254f02
+MISC metadata.xml 797 BLAKE2B 9dc5a8109d9b5421c2ae2b8fa49bef5012107e5356975fe3ec2879bf02395d0762b370400c19a9bcefb90583b985c91bfcc42b934849b964496b2857640bccc2 SHA512 61814cbb96bb1a263bdecdba5adf4620dd35d9444065499af20523674573c9297ea39f52b740e7bf19cabf6cb63a116209f95a9a6edc4d25fe7d2966c9e36d7e
diff --git a/net-im/libcommuni/files/uchardet.pri b/net-im/libcommuni/files/uchardet.pri
new file mode 100644
index 000000000000..d22393b76d26
--- /dev/null
+++ b/net-im/libcommuni/files/uchardet.pri
@@ -0,0 +1,17 @@
+######################################################################
+# Communi
+######################################################################
+
+include(../pkg.pri)
+
+pkgExists(uchardet) {
+	CONFIG += link_pkgconfig
+	PKGCONFIG += uchardet
+}
+
+isEmpty(PKGCONFIG) {
+	error("UChardet support has been enabled, but the UChardet installation has not been found. Did you emerged app-i18n/uchardet?")
+} else {
+	LIBS += -luchardet
+	INCPATH += -isystem /usr/include/uchardet
+}
diff --git a/net-im/libcommuni/libcommuni-3.5.0.ebuild b/net-im/libcommuni/libcommuni-3.5.0.ebuild
new file mode 100644
index 000000000000..166369b11ab3
--- /dev/null
+++ b/net-im/libcommuni/libcommuni-3.5.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="A cross-platform IRC framework written with Qt"
+HOMEPAGE="http://communi.github.io/"
+SRC_URI="https://github.com/communi/libcommuni/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qml test +uchardet"
+
+# Compiling with USE="test" is currently broken with dev-libs/icu
+# See: https://github.com/communi/libcommuni/issues/60
+REQUIRED_USE="test? ( uchardet )"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	uchardet? ( app-i18n/uchardet )
+	!uchardet? ( dev-libs/icu:= )"
+
+DEPEND="test? ( dev-qt/qttest:5 )
+	${RDEPEND}"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	default
+
+	# Don't use bundled uchardet, use instead app-i18n/uchardet
+	rm -rf src/3rdparty/uchardet-0.0.1/* || die
+	cp "${FILESDIR}"/uchardet.pri src/3rdparty/uchardet-0.0.1/uchardet.pri || die
+}
+
+src_configure() {
+	local myqmakeargs=( libcommuni.pro
+		# Disables compile run-time benchmarks, as they don't make any sense
+		-config no_benchmarks
+		# Disables examples, as no new files are installed
+		-config no_examples
+		# Is needed for fixing the QA Notice: The following files contain insecure RUNPATHs
+		-config no_rpath
+		# Compile libcommuni always in Release mode, as Debug seems to do nothing
+		-config release
+		# Don't silence all compile messages
+		-config verbose
+		-config $(usex qml '' 'no_')install_imports
+		-config $(usex qml '' 'no_')install_qml
+		-config $(usex test '' 'no_')tests
+		-config $(usex uchardet 'no_' '')icu
+		-config $(usex uchardet '' 'no_')uchardet )
+
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+	# This is a hack to delete the existing LD_LIBRARY_PATH and set a new one,
+	# otherwise a test will fail, because it uses the system installed lib instead of the new compiled lib.
+	# The test will fail, when libcommuni is emerged with USE="uchardet" and
+	# libcommuni is already installed with USE="-uchardat", or the other way around.
+	find "${S}" -type f -name 'target_wrapper.sh' -exec sed -i -e "/.*LD_LIBRARY_PATH.*/d" {} \; || die
+	local -x LD_LIBRARY_PATH="${S}/lib"
+
+	default
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	einstalldocs
+}
diff --git a/net-im/libcommuni/metadata.xml b/net-im/libcommuni/metadata.xml
new file mode 100644
index 000000000000..40dcff97d647
--- /dev/null
+++ b/net-im/libcommuni/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>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		A cross-platform IRC framework written with Qt.
+		Communi provides a set of tools for enabling
+		IRC connectivity in Qt-based C++ and QML applications.
+	</longdescription>
+	<use>
+		<flag name="qml">Install optional qml files.</flag>
+		<flag name="uchardet">Use <pkg>app-i18n/uchardet</pkg>, which is upstreams default, instead of <pkg>dev-libs/icu</pkg>, which makes impossible to run tests.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 6a6a0dad6f12..11370afbc0e9 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.8.0_amd64.deb 64534608 BLAKE2B dfa58aeaafec4c4939ac5d6fc09deec48511038ae25b133e45b2d14459241254c66a46474d5799dfb9952c2dc09b62f657803189e6990db7c997d620ab88e16d SHA512 e4bd200362476ac25c37322c42a06dae2824fea57a3224919ccdb8f07d5b217c0a2f54b3b57cc3db789b7d83909949ecfcab1fba0a98360502f2ce04bff9e3fe
-EBUILD signal-desktop-bin-1.8.0.ebuild 1231 BLAKE2B f5d6133c1f09d6335074a7d22b61f866b626a881e074f20df41484f97498d6ed4fc5cbb88eec6c86663f94c7f2ada04cbcca419b7b2d33d3cb0ca7730e080568 SHA512 dac032025dfb40ed7e88739f180fdecb64a2001d5b294e10afb2752fe54814876329250e669ed78c986b670a3d2e7a00e4d61b702c080ddd355d765a9b88cea6
+DIST signal-desktop_1.10.0_amd64.deb 64197564 BLAKE2B 2dbf673094a532f49c89d25de2689303ae5f36abefa7fdcc38e9899a51a1093db5699a31fa0b0f6fd5641292c6fa707bc8c9dbb0710ce391c40302219ddd681a SHA512 07d5c6e59c5788cd4c15b82c72f90af39f3a232a2f5d92ac80b484dcd55c3e45d1e6bd8714b90906567b0f45d5833d9b0b1818731482f72517d9b22a50cd1fa1
+EBUILD signal-desktop-bin-1.10.0.ebuild 1231 BLAKE2B f5d6133c1f09d6335074a7d22b61f866b626a881e074f20df41484f97498d6ed4fc5cbb88eec6c86663f94c7f2ada04cbcca419b7b2d33d3cb0ca7730e080568 SHA512 dac032025dfb40ed7e88739f180fdecb64a2001d5b294e10afb2752fe54814876329250e669ed78c986b670a3d2e7a00e4d61b702c080ddd355d765a9b88cea6
 MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.8.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.10.0.ebuild
index 5fec1e934090..5fec1e934090 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.8.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.10.0.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index a1e43f82444b..9178202ee7cd 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 1ae4a01e6247..6d6391347203 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,6 +2,6 @@ DIST gnutls-3.5.15.tar.xz 7238928 BLAKE2B d9a081ec0f956cabe0e0a240c6f20bd2f2855c
 DIST gnutls-3.5.18.tar.xz 7261980 BLAKE2B 1c7df33aa331634885426196d1e39cf7c5748ba467323d7a48c4e865efcea03e3a59a7bb21cebb4cfe9d11a83a532bb785ae9a5824703c759e573de0f347004d SHA512 434cf33a4221fe2edce1b531cb53690d14a0991cb2056006021f625fb018987351f8ec917c3a7803e5e64179cf1647a3002ae783736ffca3188d2d294b76df52
 DIST gnutls-3.6.2.tar.xz 8093304 BLAKE2B a5e40cadb184eb960e51cc0d94d441e50378f33582eeda1382e9ee3a9a4b2d26f6b44948921d8983de3e1b8fbc0199e0d894ce8b8da1fddeb84dbe304b2f9222 SHA512 6a574d355226bdff6198ab3f70633ff2a3cff4b5d06793bdaf19d007063bd4dd515d1bd3f331a9eb1a9ad01f83007801cfa55e5fd16c1cd3461ac33d1813fb06
 EBUILD gnutls-3.5.15.ebuild 4109 BLAKE2B 04b4e2f396c7a9648c5515822e4899228adba373a3b51cf8e17174418c6de99384a40e2e1f255541f5bb0a0ab1c96d4556c52438ef7cb3ac7038adedec43a094 SHA512 e1f4936c0222c38a0f280bfbb86e8cdb2e4e9e4f22baddd5a8ab9c163fc0afd6f9ddb7924a42a398650bf77f7ae8d230b9e8d2713a01e53986b02d7545725547
-EBUILD gnutls-3.5.18.ebuild 4115 BLAKE2B 7f83ffb50f1aec508154e9823076e9ccef115c4a6cf3a2f36b9b3036b6e6e79720381b7c6f13ac8e1fed09d601523856dcece91932fbf9384dbb36dd1f320859 SHA512 5cde5dc117f5644e020751632d38d9eb2ea81afbb46ea805274c43913263ad36965ff63165cde4db4a9386d618e217658de157131dbebb5374d2da15290ccaaa
+EBUILD gnutls-3.5.18.ebuild 4114 BLAKE2B c8ed07eabba11d072baac64ac6a1590e64df5aaf6bf38820887e7c0cd4650ff25aab67c01d163ce550cb6f44f85c698192436732a7272503479abdd4b719cd3c SHA512 0e62f7e93d007c27ae718ae6bd24bb6692afbb8b8e9fb6ad5f1848cacf98930c522dbb6b6c98e78d6c9fd0ea7b5a9eba20ad5204b70f0adc556bec086a0a1027
 EBUILD gnutls-3.6.2.ebuild 3751 BLAKE2B 9777ce3562714525ea3442a8ede4a654e4fa80d67418a9eae8ddde910c934593b3f6c5ff33042cdefbb2d403ba4e403cd51998e2167a5b38c7ba4e367bdeea60 SHA512 d64c7e65868e2aac58ed783a415a8756c1b225bda0a4082798d52c8eb332ddd03ba5f07a9fa34c7831d975a17e0def85faa0b6f5ba9046b3ac49472d5756f96a
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.5.18.ebuild b/net-libs/gnutls/gnutls-3.5.18.ebuild
index b0ae57cb5899..cbac099a7f42 100644
--- a/net-libs/gnutls/gnutls-3.5.18.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
 
 REQUIRED_USE="
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index 0470623b55ee..126a38282d32 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -6,5 +6,5 @@ DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2
 EBUILD libgadu-1.11.4.ebuild 1299 BLAKE2B 8ae4199cdefee341d9593eec668ec6d4fe53d340863869399a866c38d22810f117ce33fd58473caa19a2c02cacd46167c34800e52279866316877abebec9814c SHA512 77fce206ce7324e7a10b6c7e1c4e49fcc3815b3c4442ff9ba1b80460fef971f487aaf6504cbeb4f2162e912f87d565f052f5e859d22806bd122cace801a969bb
 EBUILD libgadu-1.12.0.ebuild 1421 BLAKE2B fa83fb7b137cae397024abde603e8839cbfffe0e54130298eda458b1354cae08fe3b9bb875bf4179cc39fba5d4c10b92ce57b8918a07958c06331ba862207706 SHA512 1601544bbd6e29c6c134bdb7e2e94e4dafce2b845d6e5d13bdb6ab2f955b718bb90b91217c2c42460834997be3d0c216e8df4a3ea84ec0ed0ff1257aa868add0
 EBUILD libgadu-1.12.1.ebuild 1435 BLAKE2B 56ab1bc6b8f003354096b25290a17af6245331cee34dfbb676fa37f478aa03cfc6510a2f785dd84569b60cfdad63310a0004ce751753a28e1756a338128d4a7e SHA512 6a2f97e833816e212202b8e21a45fe9505371e4c1060670000fffc9ac77852baefb729dc46f2431b9e63acbc4759caebcbfdec650e84a7c0e32d8252314e8531
-EBUILD libgadu-1.12.2.ebuild 1394 BLAKE2B e2e8383b2c5ca54cdc9773c3400c1a4111e7788ba9102c2b8cb6f5837952cf16f949b4ad9358dde1162a14ed80d59a3e1d481604902335ed76d114ef5d24ff65 SHA512 180cb5fbf375ecf8979906b28cd561d4dd3e800aadc4ae53de01c99fd72c90e9f28d2eee10d7555fed11ebbcdf68661af6062f6f23e818930699ea065998222b
+EBUILD libgadu-1.12.2.ebuild 1393 BLAKE2B ae6c1bc6c49b3d2e5c0800ba0bf72240141154830a15b3dc609a64c91b0ffa04d4c33f5dc0052d8bee443b27d39b852d72e7878768541838f6616fd99b2d20ce SHA512 944b3d1f2f70ef67e154415edaec6c044bd777771473de7d1b464a7ad51622e7ac7665e1bfaab053729fe77b7ae9f9ee1286ee5139577211d3096ddac2332f74
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/libgadu-1.12.2.ebuild b/net-libs/libgadu/libgadu-1.12.2.ebuild
index 6864f7ad5739..eda0ca3fa582 100644
--- a/net-libs/libgadu/libgadu-1.12.2.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.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
@@ -12,7 +12,7 @@ HOMEPAGE="http://toxygen.net/libgadu/"
 SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="doc gnutls ssl static-libs test threads"
 
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index 36ea3df445d9..2ca22993d67b 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -1,10 +1,8 @@
 AUX libnfsidmap-0.19-getgrouplist.patch 3459 BLAKE2B bf58f1234c9b306643698250c0d5cc9ad4290a22582e18af09b91d9c9d7b49cffc959c77758ab1c7d1af0be9401cef2c0f5c1127aceb9a175738236dfb6e0d58 SHA512 a778620b51158b07b7224ca010ba199feba85af7fc087bde65cfb8d2660bd7646c08d303a39d2af525b3a449694a60c3c35fe3b696cb0354b5d74423240a9e8d
 AUX libnfsidmap-0.21-headers.patch 438 BLAKE2B 0ef48276188f4142b2c85cb3cf326d37aee270f7a4b1442c41678792d071d528e83b41c4cc7ea253fa2e43efca788903c37a52540bffa0fc8199203954d62c1e SHA512 55cc2dce6df5c215d2ba270324a2dabdd7c798d88dfe1f6ac01a7bfcddc1b9a23bc031fac2006682596f3984f0ce9782c8584e3b8e02a1b491ac978a69aca926
 AUX libnfsidmap-0.27-getgrouplist.patch 3467 BLAKE2B 595045c93b897fd51a8ee4b039fe8b8732e78fc203cf6ab4ad138feaf35c408698ba4571477115ddf03d73ba20a9fa8623af43e6adf9c5a51a8577710e5a4c1d SHA512 3bf266ddeed306981cf7724032a59118ec93e34974b79fc93966f3494acef1855ce7bdf4e88ac12b0d435a5b2380e1570243c746bd05dc19a65d40517f6f2462
-DIST libnfsidmap-0.24.tar.gz 328720 BLAKE2B 4b33a589b9d4b47530d2044a0912481dfda770de86f7aa90e80771f2df4b555857535a7f162a485b68c9b1d48be563d246e128fa3ca1e3c79d9bf0af69b8401d SHA512 1283a4af1bcf3c6f941ab294acc0b2b4bd9ca947f2d3c2e866717478ba2e7a2190a5467b71d7e9136c5c83de564c4892f9e3304323ae17e3988af2e40c43982b
 DIST libnfsidmap-0.25.tar.gz 346587 BLAKE2B dbf31779371ba29737ed7a5901cf46f17e4a1b2ac444c2959d3ae76f41815e9a15a2ee892e417c5b7f97cf5f8396024071430fed028a8cd583aeed1a95e350df SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557
 DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
-EBUILD libnfsidmap-0.24.ebuild 1072 BLAKE2B cbc056d0eaa632b3692b21d6062f5538ffda57035d2683c49808b4922f14da1e8673dd0301fe9452a70341046aa6d2a513d04947827f9b9d49a2313aa13e3687 SHA512 1de6d7598472c57587b95c46c0b2093438227efdc85800d340c85f32f05b2f4fe91b30c46c04fa735c8a222c47f2a0f0342624a296fad0f0abccdaaaf3d0432e
-EBUILD libnfsidmap-0.25-r1.ebuild 1226 BLAKE2B 41cd41db66786ab6f39d78ecb31520b965c63993db3dda43a8c3602cf8de2241e7b229a2ce341f7a69a2a007d5e3d870bcf6bc6e10914602ba1b0ce09e067156 SHA512 87af244b1bb1d2d83a13cdfb7c9cd0b0eff322a4490562f51037eb39ab4b91e06137265985567a3c3fd343092de68fe8494c0554b070bccac292b2f8a37e0d0b
+EBUILD libnfsidmap-0.25-r1.ebuild 1222 BLAKE2B 330ac209ea2c836320d71cb91738cf140a2207664c469c0470fb8e7d37b8690b2075cb67c727019a738a3d33cdf1ed79f956e7d1abd781787a79602472549e90 SHA512 aad280f52fa485aedbc4fd0856f57367bf25aa8888aeea550d2683230154671d963b6645f972d48c0e9d20c1560a07d51a4eecb2d6ae442f55ea4de71fbf1f8b
 EBUILD libnfsidmap-0.27.ebuild 1357 BLAKE2B 5e976922f305b8549331aff8d74a48dc5546d20deba68c7196e3773c8272b3964e72f31fcfd358def163ddaca53eac6cbb9d28ad137dadf4c33f2e5bc4b423aa SHA512 192121cc99c8240f1a9e66d5d4ed6bb2bac743a324c58c115d5b7ee2aeb610f488d105c27055d072b4268bdea43be00c94d8dadf71a7af7ba9cb8776772fb239
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild
deleted file mode 100644
index 6cf4e36fb64a..000000000000
--- a/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="NFSv4 ID <-> name mapping library"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
-SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ldap static-libs"
-
-DEPEND="ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
-	!<net-fs/nfs-utils-1.2.2
-	!net-fs/idmapd"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.19-getgrouplist.patch #169909
-	epatch "${FILESDIR}"/${PN}-0.21-headers.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable ldap)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	insinto /etc
-	doins idmapd.conf || die
-
-	# remove useless files
-	rm -f "${D}"/usr/lib*/libnfsidmap/*.{a,la}
-	use static-libs || rm -f "${D}"/usr/lib*/*.la
-}
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
index e4e6136dd054..97ca93fae281 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
 
 LICENSE="BSD"
 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="ldap static-libs"
 
 DEPEND="ldap? ( net-nds/openldap )"
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 02ec7fccc83d..4d6778863ff2 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -3,10 +3,12 @@ DIST nghttp2-1.29.0.tar.xz 1544736 BLAKE2B 1708d2c787e27d722aec27890a21e752a9fe6
 DIST nghttp2-1.30.0.tar.xz 1545352 BLAKE2B 0d52f973a63632dc1ad235f1b535c24053a8dde52dfbda957c3e40548b4de5db5975639140f207cd9ffe564b6151ed6d97de45ff070eb2cfa3d6b41f52254430 SHA512 4b79f46947777627f0a9e1384ec51ac70e273aef6d46d322aa448731726b8ca606e73dcb171170bbe91fce93c28170ff04e11da56ee90fa28d642e7bc37b50be
 DIST nghttp2-1.31.0.tar.xz 1545800 BLAKE2B c0b8130abe7eb16e977cb8d480505d74c41986f15733da2005b1772b4030082c1c0c2e9a0576aae3e88922fc7b17ad9658e916641c3ddb816b45cc0e202b5bf4 SHA512 00342b0517eb9e1044eced4649488d7ad35694e0a1303c4cba2d2be897fb86c5c70f1a5a157799d5c0cf448a6b983f2a2a57ee2bdb5ec762876647f9303446ca
 DIST nghttp2-1.31.1.tar.xz 1545400 BLAKE2B 1d1a0982dc36928fe031c26d7adeca3364e0efbef43a7a2e01701614e128c3ab307321fc3e3166f09e71f002bd14d1ad5caaf3242502cbe4e71285591d8f2977 SHA512 e0f5b345b6d794b21fa04bc0c7125f24a877074538ad746451d4a293eb22f1afb9e0e619c69b84f0fc2142a925044a19976af4cffb8426358e95e7d9715d5a4f
+DIST nghttp2-1.32.0.tar.xz 1548528 BLAKE2B 1a1d031fc23ac14236c58a84aa94ee255646d36c9c631000b5d48e39c9fbc16e1b28d82e40bfc96d0fb9e2aa6982ed6bff77bcecdacf220ba8dea0b86d92bcab SHA512 ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e
 EBUILD nghttp2-1.19.0.ebuild 1811 BLAKE2B 7931aa1b1477275b7efb6f174bbcd5a7c18ef6df4d69d4097d4b199d9debe43a9de9a4ef3ffee66d7bd7b7895289fddb69707a69e6eb3da49210109b5d87ea39 SHA512 5ed6ebd9d727a4803878bade7f3abd7fdf61b53ce7e04259e3c07290fd48f8a26a4b61d64aa533afa9eaaf37d4c7a7376e9f37b6bbc04637e61d6d07f603857b
 EBUILD nghttp2-1.29.0.ebuild 1852 BLAKE2B d1b38bd11741cd70e153c933b961b049eec102edc439d3c5c40425458878cbad8cc2e3e64f55019fe5694ac1229cec52de99e3e2f599b27dbef08e7e61f1db78 SHA512 b15473ec7490b351612a14d2593e92a3d17322e7e8c8dbda7064c4da055326a2c5b68de17ae0da85d91d937a3d8942ea0c46cb7d95224c19bd9a322b802405fc
 EBUILD nghttp2-1.30.0.ebuild 1860 BLAKE2B 1921255023f5cf1ed11003ff073094c50427849fe965440ad361a86515f75d11825b04097d4c4728a7f3158f60b94a3cdf086297c2c54f68ba25699be7dca7d7 SHA512 b3a7e529a1c7d303e47d8440a673f5ec9a72f111c5473f3a7c5cb22610ca007d260d626a6f480ae1d9cbffece42cb7ecdb21535714ef74dd1f8d087e829026c1
 EBUILD nghttp2-1.31.0.ebuild 1872 BLAKE2B 775c3fabc17662def41332741827e2a67c1729c04fe6d8eb2752c1ac744066279103ac9b8dc7bfc95654004e72dfa159b2e005f99bbdbf8bcb75f87c1b0a7fc6 SHA512 995c72a6396a1620736db53995c56875f6b4a6370246a04a3b04caa0ed670343274909e8bd091f30ff3ba0a556f96f9db8054084308b2d150994b755bc6a5f74
 EBUILD nghttp2-1.31.1.ebuild 1864 BLAKE2B ee44e10fadc1aa2d28b71aa4618122fe84483c92aad7fbd005cfc48235d9ec68b13bb16bd2f82ec71189aeebe1c120575f80511ab357e8e0d415e0f512095608 SHA512 074f50c5e04fd301e0f4e79e21c6c720b336bf982d5bbbef4d241d124721fcb648f5ef1d9cfa7fd89c98ff45449b45a8f6fa668be9137814f1002bc06a91d874
+EBUILD nghttp2-1.32.0.ebuild 1872 BLAKE2B 775c3fabc17662def41332741827e2a67c1729c04fe6d8eb2752c1ac744066279103ac9b8dc7bfc95654004e72dfa159b2e005f99bbdbf8bcb75f87c1b0a7fc6 SHA512 995c72a6396a1620736db53995c56875f6b4a6370246a04a3b04caa0ed670343274909e8bd091f30ff3ba0a556f96f9db8054084308b2d150994b755bc6a5f74
 EBUILD nghttp2-9999.ebuild 1934 BLAKE2B 091fa366b740f254c371d075bf24dc126f8d86f66315816b16b3c4c0177c9d2fff66d4ba916adbc203bb2d92ca6a070e80d58d6a4f30cea6bc8fa71eb3718616 SHA512 7e157bcc44e80ca78a85fe1b0e97b293646a30aedbfe7d918f5e16b96d061e9303636053675021af5ca97f84f38fabe0e54c63348f40fe9a52b00e20b0717c4d
 MISC metadata.xml 578 BLAKE2B a210790f12a0149240e59fee7702570c81a026851cfe8fdc2ce015bfb56c73150937a06e26dfabf896118a4d566b33d94ace7a622d751c0455629bf02061fcdb SHA512 a8948265c469d936a699b42978f7e8b2fdd6a7d016094242763730f75f285e6b8ed2a26d66ae8597f1c0ca9d45d47f3e2893005c0cd101e13fd4f62c6e937e28
diff --git a/net-libs/nghttp2/nghttp2-1.32.0.ebuild b/net-libs/nghttp2/nghttp2-1.32.0.ebuild
new file mode 100644
index 000000000000..ffeb54eded23
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.32.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=6
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+SSL_DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-werror
+		--without-cython
+		--disable-python-bindings
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 12dfd2346335..15b1f305983d 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,18 +1,22 @@
 AUX gentoo-global-npm-config.patch 1511 BLAKE2B da2b127df9ac9babc87c1930272244e7f89ac1931543fa524e13fb3c53d2b5a9cbdf0d93dc0cae207822dee3c8f71e2a12fca3d608f6de8589ad2c0064f0855b SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v10.0.0.tar.xz 19248896 BLAKE2B 3ab8313e44d57a2f04442d23311a4d824a9d0b89c7d3ee06042f843ce0bde39e59c1ef2eb0d77cde4c46d649b074cf08d1109c91b0914c23b048c75f29e79727 SHA512 9d686da290f84c5fdab39cce08161787661b4df1e3e37bd242e5f5f3ff8285b6bca3ada16e155fcf0fbb9ec8ca8736dc7d02788cee2d66f6fab87c1a29048f4e
+DIST node-v10.1.0.tar.xz 19363748 BLAKE2B 931349d204764472706f44473b2ea0e1399dad84d0595cecfc2cbd71670df25f05c2c2ac77e4c18852f523d5b0cf853ca83739fc96a46e1f5e76ae51cab006c9 SHA512 f98da47849de8a50d9986d0176c39914f3993e579a3d482153cb0fceb64d7c79443fd230a80946361008e4fac58b7b99292c906961fb57ef14ccecfd1da07156
 DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
 DIST node-v6.14.1.tar.xz 15758180 BLAKE2B 63db5d1f73cc16f5c73012953799193cbd58da3aa92d3d48c5419d4e5c4e9126a2eb45b7e27e7396269deeca7836cac62c5f89e5d23b695a3455305739d5df90 SHA512 c1f725c76bfad914d8d607e1d0bddbb6cb75a99adcf781d12291830bc41610ede346a5ab29648d16ad8bb3031dade89f7f4e16708083b5fcda2def965f0c7d21
+DIST node-v6.14.2.tar.xz 15842896 BLAKE2B 8cbfdc6b865d003612cce1be9d9bab2d1e0a85e4a7d05b093dbd075cd659ccf834de3107d568a3d2d9273ac848ee02afd5c4c83789d9021f32654af82ccc5373 SHA512 0390febbc8abbfb8f9da72489bd90af71fa71c52bbac8f156017c66cb6fd505b52173f5626b75bcf10be22315ef0774b4c93369089e91688ec9567cc7405c6d3
 DIST node-v8.11.1.tar.xz 18279516 BLAKE2B b06f31571c93455d16899e3ba57d1e5835951be7a644fafbfcac9cce1bf33ed8ca47929e0a5d0df72034a6c2b967c578e3c78a2ed27ba85e41c4af1de2307293 SHA512 0ca0dead15a1623ece7f972d420dec623141a795ddd984c32ce7e92ae32ead97bb0153ebd8c1c249b91a1bd6efcef7fb313105455f66d4d181473153c4e0736f
 DIST node-v9.11.1.tar.xz 18500884 BLAKE2B ac086b59144ed7393a7c0293616c1ef2b149e23ac67ba8ccf324c2c1f97b18435889e4fb2f1c205834e3309728853dcdbf34d00cc319a10bfed7cbea9fdf01e3 SHA512 6e5ed333ebb678c08fca8f567708874a50bd9311e326196bf86ca77db3046dd196b50208bcffb7f3435f0c031d47dff5471465c840be12903f3c683802000a1e
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
-EBUILD nodejs-10.0.0.ebuild 6333 BLAKE2B 552ecbfaf9e2c973d3673ebd93df67821c55ba41896fbeeda4386572f8a33a23a39ead9ff04b449c1224bef3f6fd212c94cbb6f08f4b55bae8db6ea78245b005 SHA512 6d43a12494acea5d298517d41dc93abb3b863020fecf0696aee6b4cfa7147696807eeaeaa90ea3e538563bc6311e052ff0682df708be4945d3ab744d7124fe93
+EBUILD nodejs-10.0.0.ebuild 6333 BLAKE2B 5ca8e721fa5bfbf5c7bb4602de9e15228de138cde1ae522b673cfc61f601c9019e1988b472566172eb13471c91c0941b4d1d42db79d52f64a3be820322c77a7c SHA512 91492cd5bc82b5b454aa418b6b176ca6ad6417a7edd032c68f0c36cae4f7799d2da62791835656d5ba7487f1eb9f663f7347bd2b73c1fb1efd5fa2c732626e55
+EBUILD nodejs-10.1.0.ebuild 6333 BLAKE2B 552ecbfaf9e2c973d3673ebd93df67821c55ba41896fbeeda4386572f8a33a23a39ead9ff04b449c1224bef3f6fd212c94cbb6f08f4b55bae8db6ea78245b005 SHA512 6d43a12494acea5d298517d41dc93abb3b863020fecf0696aee6b4cfa7147696807eeaeaa90ea3e538563bc6311e052ff0682df708be4945d3ab744d7124fe93
 EBUILD nodejs-4.8.7.ebuild 4431 BLAKE2B ebdf991fab56e0e40958ec1d08570a8d32732237115fa6b468e788d4d92245c553d4f0e6187a83bb5cf57ee1aee334002cbf255925cc5f3788d566d9204316a8 SHA512 dfd48068f1f246211a001fd9b180cbf5344b6948714f17eb6435be604e4138f8bcd72812b8d782c33d1569f25b907736ffd92b7852b2542f63f2dadf06ac1ca8
 EBUILD nodejs-4.9.1.ebuild 4432 BLAKE2B 3650a661997bdfeef6097b4e356a186a2b829c0f2224624b71ad832b1e957ce9e841136b83f62c53b8e524993b4eb8e203c1d10176f98f09503047e058804fbc SHA512 98b52c0ebade643785b90d8362fc047b361c4c29e5a7e81b59c581978025a24c9562171fca342d29855f4881985db4d8f017b2711c5ab4e54f0dbdf18aa69a03
 EBUILD nodejs-6.11.5.ebuild 6089 BLAKE2B d1b1c07ac7eb975d28291fca7fc10688e316e1fd62419f6cf87c9ce7952e074afb23eb89f40df0d336dd4c0f0d22ed40157035b7e6b8e2730eb2ef95a538ba60 SHA512 9a4310b2b53b0f58e855f35dd04052f4b1b8e0a8c9341486321b5e78ecd5df0078fcc614c3786d6f54799ce031c3046868d8970a041ad67fc7be0bd6e789cdb1
 EBUILD nodejs-6.14.1.ebuild 6170 BLAKE2B f8f9b6ead741f993da24c760daa48a7a5ac9415a9fec05c313257cd02c9f86ba03b4c15d7e2d0ef18dd1ad1e23b5d5152edb794756dd356368ac2fb534b68148 SHA512 c49be4f51d5fcace57544a7ab35ceac10870cee4e8341b9fb7303b2b030e21b65d3d158a854fe52b5d6813a5bf15cf5cc6c5dff254c2824c6fe8c8bc826aa634
+EBUILD nodejs-6.14.2.ebuild 6171 BLAKE2B 7946e4fcd461d071fcdb81c1642d0eb6d812e5660aa308ca3bf78501aaf9cc9430f9be3a806e371c9216774a545507759faefcb30ff4861a91fc05915b4d9601 SHA512 3e77ce77a4d9453d36eb252834ed056751c8805d4e89e47448bc1bdeeb41732a8d380eb8b4c1d13254ce14ff37bd586ecf381a5878901528b5a50de777056f6a
 EBUILD nodejs-8.11.1.ebuild 6348 BLAKE2B dd10b95ed52f83175d16c6a68c9daa39f38f8e839d2f181c8a4fb0f64715561c68cff6e704aedc186af3b657dd87b4b05f29ae7c01ef1b1a31d1799a7a66dd2d SHA512 09fc1df3c4cdeafc27dd63836f30f62c81144ec70ef09acd8ebd0e093a07c413c368c47ab6657c9fc290bf59abe72062e2f92b7f6782ffdd49e80d2036936a9f
 EBUILD nodejs-9.11.1.ebuild 6334 BLAKE2B 51236f25ddb70527867a9ceb89d77872627db453f74c909d0a9a57457b4814322731c9e5d6f93f9f5b37945bd35bcdda924834e22ce19c1eaf97df3873488ade SHA512 45035c68b6202f9aabd12be127674b89811e0192dcc5604969b27b85a4662a2219dfa6e507d40d7fb5f8e9643c49e755f19ba686fc611e83e1165e03fdb1c566
 EBUILD nodejs-99999999.ebuild 6267 BLAKE2B 2858d03713127b51e3897909454354ee34f3ba11273972cf62cad065faa3a571bb1d17c7353ecc3487e9e8809bae45caa9898a05bf7c1871b13cc6bc7d7668ac SHA512 8a8f375e96f33b6c85f7c188b488586c4193708b9d3618e4f83d3f562bfd55baf8034b61b15b8e003611c6209787339adfd07358237b70250de376b1612d0a06
diff --git a/net-libs/nodejs/nodejs-10.0.0.ebuild b/net-libs/nodejs/nodejs-10.0.0.ebuild
index 6ef2faad5c3a..f2952fc37161 100644
--- a/net-libs/nodejs/nodejs-10.0.0.ebuild
+++ b/net-libs/nodejs/nodejs-10.0.0.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.19.2:=
+	>=dev-libs/libuv-1.20.2:=
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.29.0
 	sys-libs/zlib
diff --git a/net-libs/nodejs/nodejs-10.1.0.ebuild b/net-libs/nodejs/nodejs-10.1.0.ebuild
new file mode 100644
index 000000000000..6ef2faad5c3a
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.1.0.ebuild
@@ -0,0 +1,200 @@
+# 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 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.19.2:=
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.29.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-61.1:= )
+	ssl? ( >=dev-libs/openssl-1.1.0: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/nodejs/nodejs-6.14.2.ebuild b/net-libs/nodejs/nodejs-6.14.2.ebuild
new file mode 100644
index 000000000000..d00288db71c6
--- /dev/null
+++ b/net-libs/nodejs/nodejs-6.14.2.ebuild
@@ -0,0 +1,197 @@
+# 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 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 test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.16.1:=
+	>=net-libs/http-parser-2.7.0:=
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-58.2:= )
+	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	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/|| 'python'/|| '${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 || die
+	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" 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
+
+	# 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 myarch=""
+	local myconf=( --shared-libuv --shared-http-parser --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	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} \
+		--without-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/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest
index dc9cda3a045b..274b0a66193d 100644
--- a/net-libs/telepathy-logger-qt/Manifest
+++ b/net-libs/telepathy-logger-qt/Manifest
@@ -1,4 +1,3 @@
-AUX telepathy-logger-qt-15.04.0-cmake-3.9.patch 10869 BLAKE2B cddc033ae014691a161c1c7445af0618bb68e83ab37197b337c2991499134592d7316370e5182b04b280065ad8cff66dcdc4ccd9e5b37c6ee24a314db05a2ec7 SHA512 0475b66dfd81cba40b61380aa4eaf9c6c570e9a86850445fef028461a40a72e51896a3f8500ac22e02ed6a5521938b40bf5335e86d25184e5f4da0794a2e631d
 DIST telepathy-logger-qt-17.08.0.tar.xz 94184 BLAKE2B ead0598c1f2f2786e026af15ef1424347b9ec9ac7d78b1e90943a8e39db1833f76353b9b9c767470fcbf635438fbcbcc52c9b969318341128f66b8b9ad5eb14a SHA512 1768509b61d83cdd39adf8abd74f71d0c9ae757411e08017c6788fe50962b57768a8fdc9fbba75f5968bb22849ff619e790323806d29ae63066e41cc5f22c366
 EBUILD telepathy-logger-qt-17.08.0.ebuild 712 BLAKE2B 91e523f0e8c752acaafe928ed181ad9fdb1a19b788be356c53716e552605f486c934abb32ea553aea9d645000d9e9d754ebc4f67a38bb1a9d0f439cec51eed35 SHA512 0273a7c2cc1bc6f12ac7aa2980f96781a7df6f503ffd8024b248f11c3f0b1782c1c677ce8a05c3eab6a6f9c39821e28dd04bcef07a3d7ed177e1a3333a2a782d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-logger-qt/files/telepathy-logger-qt-15.04.0-cmake-3.9.patch b/net-libs/telepathy-logger-qt/files/telepathy-logger-qt-15.04.0-cmake-3.9.patch
deleted file mode 100644
index 84d66851a221..000000000000
--- a/net-libs/telepathy-logger-qt/files/telepathy-logger-qt-15.04.0-cmake-3.9.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-diff --git a/cmake/modules/TpQtMacros.cmake b/cmake/modules/TpQtMacros.cmake
---- a/cmake/modules/TpQtMacros.cmake
-+++ b/cmake/modules/TpQtMacros.cmake
-@@ -128,15 +128,15 @@
-   FOREACH(_currentArg ${ARGN})
-     IF ("${_currentArg}" STREQUAL "DEPENDS")
-       SET(_TPQT_DOING_DEPENDS TRUE)
--    ELSE ("${_currentArg}" STREQUAL "DEPENDS")
-+    ELSE ()
-       IF(_TPQT_DOING_DEPENDS)
-         LIST(APPEND ${_tpqt_depends} "${_currentArg}")
--      ELSE(_TPQT_DOING_DEPENDS)
-+      ELSE()
-         LIST(APPEND ${_tpqt_other} "${_currentArg}")
--      ENDIF(_TPQT_DOING_DEPENDS)
--    ENDIF ("${_currentArg}" STREQUAL "DEPENDS")
--  ENDFOREACH(_currentArg)
--ENDMACRO (TPQT_EXTRACT_DEPENDS)
-+      ENDIF()
-+    ENDIF ()
-+  ENDFOREACH()
-+ENDMACRO ()
- 
- # helper function to set up a moc rule
- FUNCTION (TPQT_CREATE_MOC_COMMAND_TARGET_DEPS infile outfile moc_flags moc_options)
-@@ -151,54 +151,54 @@
-     GET_FILENAME_COMPONENT(_moc_outfile_dir "${outfile}" PATH)
-     IF(_moc_outfile_dir)
-       SET(_moc_working_dir WORKING_DIRECTORY ${_moc_outfile_dir})
--    ENDIF(_moc_outfile_dir)
-+    ENDIF()
-     SET (_moc_parameters_file ${outfile}_parameters)
-     SET (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
-     FILE (REMOVE ${_moc_parameters_file})
-     FOREACH(arg ${_moc_parameters})
-       FILE (APPEND ${_moc_parameters_file} "${arg}\n")
--    ENDFOREACH(arg)
-+    ENDFOREACH()
-     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-                        COMMAND ${QT_MOC_EXECUTABLE} @${_moc_outfile_name}_parameters
-                        DEPENDS ${infile}
-                        ${_moc_working_dir}
-                        VERBATIM)
--  ELSE (WIN32)
-+  ELSE ()
-     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-                        COMMAND ${QT_MOC_EXECUTABLE}
-                        ARGS ${moc_flags} ${moc_options} -o ${outfile} ${infile}
-                        DEPENDS ${infile})
--  ENDIF (WIN32)
-+  ENDIF ()
- 
-   add_custom_target(moc-${_moc_outfile_name} DEPENDS ${outfile})
-   add_dependencies(moc-${_moc_outfile_name} ${ARGN})
--ENDFUNCTION (TPQT_CREATE_MOC_COMMAND_TARGET_DEPS)
-+ENDFUNCTION ()
- 
- # add the -i option to QT_GENERATE_MOC
- function(TPQT_GENERATE_MOC_I infile outfile)
-     qt5_get_moc_flags(moc_flags)
-     get_filename_component(abs_infile ${infile} ABSOLUTE)
--    qt5_create_moc_command(${abs_infile} ${outfile} "${moc_flags}" "-i")
-+    qt_create_moc_command(${abs_infile} ${outfile} "${moc_flags}" "-i")
-     set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
--endfunction(TPQT_GENERATE_MOC_I)
-+endfunction()
- 
- # same as tpqt_generate_moc_i, but lets the caller specify a list of targets which the mocs should depend on
- function(TPQT_GENERATE_MOC_I_TARGET_DEPS infile outfile)
-     qt5_get_moc_flags(moc_flags)
-     get_filename_component(abs_infile ${infile} ABSOLUTE)
-     tpqt_create_moc_command_target_deps(${abs_infile} ${outfile} "${moc_flags}" "-i" ${ARGN})
-     set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
--endfunction(TPQT_GENERATE_MOC_I_TARGET_DEPS)
-+endfunction()
- 
- # generates mocs for the passed list. The list should be added to the target's sources
- function(tpqt_generate_mocs)
-     file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/_gen" )
-     foreach(moc_src ${ARGN})
-         string(REPLACE ".h" ".moc.hpp" generated_file ${moc_src})
-         tpqt_generate_moc_i(${CMAKE_CURRENT_SOURCE_DIR}/${moc_src} ${CMAKE_CURRENT_BINARY_DIR}/_gen/${generated_file})
-         set_property(SOURCE ${moc_src} APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/${generated_file})
--    endforeach(moc_src ${ARGN})
--endfunction(tpqt_generate_mocs)
-+    endforeach()
-+endfunction()
- 
- function(tpqt_client_generator spec group pretty_include namespace)
-     tpqt_extract_depends(client_generator_args client_generator_depends ${ARGN})
-@@ -223,18 +223,20 @@
-         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- 
-         DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
--                ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py)
-+                ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py
-+                ${CMAKE_CURRENT_BINARY_DIR}/_gen/stable-spec.xml
-+                ${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-${spec}.xml)
-     add_custom_target(generate_cli-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp)
-     add_dependencies(all-generated-sources generate_cli-${spec}-body)
- 
-     if (client_generator_depends)
-         add_dependencies(generate_cli-${spec}-body ${client_generator_depends})
--    endif (client_generator_depends)
-+    endif ()
- 
-     tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h
-                        ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.moc.hpp
-                        "generate_cli-${spec}-body")
--endfunction(tpqt_client_generator spec group pretty_include namespace)
-+endfunction()
- 
- function(tpqt_future_client_generator spec namespace)
-     tpqt_extract_depends(future_client_generator_args future_client_generator_depends ${ARGN})
-@@ -259,18 +261,20 @@
-         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- 
-         DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
--                ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py)
-+                ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py
-+                ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-spec.xml
-+                ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.xml)
-     add_custom_target(generate_future-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp)
-     add_dependencies(all-generated-sources generate_future-${spec}-body)
- 
-     if (future_client_generator_depends)
-         add_dependencies(generate_future-${spec}-body ${future_client_generator_depends})
--    endif (future_client_generator_depends)
-+    endif ()
- 
-     tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h
-                        ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.moc.hpp
-                        "generate_future-${spec}-body")
--endfunction(tpqt_future_client_generator spec namespace)
-+endfunction()
- 
- function(tpqt_service_generator spec group pretty_include namespace)
-     tpqt_extract_depends(service_generator_args service_generator_depends ${ARGN})
-@@ -294,18 +298,20 @@
-         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- 
-         DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
--                ${CMAKE_SOURCE_DIR}/tools/qt-svc-gen.py)
-+                ${CMAKE_SOURCE_DIR}/tools/qt-svc-gen.py
-+                ${CMAKE_CURRENT_BINARY_DIR}/_gen/stable-spec.xml
-+                ${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-svc-${spec}.xml)
-     add_custom_target(generate_service-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp)
-     add_dependencies(all-generated-service-sources generate_service-${spec}-body)
- 
-     if (service_generator_depends)
-         add_dependencies(generate_service-${spec}-body ${service_generator_depends})
--    endif (service_generator_depends)
-+    endif ()
- 
-     tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h
-                        ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.moc.hpp
-                        "generate_service-${spec}-body")
--endfunction(tpqt_service_generator spec group pretty_include namespace)
-+endfunction()
- 
- # This function is used for generating CM in various examples
- function(tpqt_generate_manager_file MANAGER_FILE OUTPUT_FILENAME DEPEND_FILENAME)
-@@ -324,7 +330,7 @@
- 
-     set_source_files_properties(${DEPEND_FILENAME}
-                                 PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/param-spec-struct.h)
--endfunction(tpqt_generate_manager_file MANAGER_FILE)
-+endfunction()
- 
- function(tpqt_xincludator _TARGET_NAME _INPUT_FILE _OUTPUT_FILE)
-     tpqt_extract_depends(xincludator_gen_args xincludator_gen_depends ${ARGN})
-@@ -346,8 +352,8 @@
- 
-     if (xincludator_gen_depends)
-         add_dependencies(${_TARGET_NAME} ${xincludator_gen_depends})
--    endif (xincludator_gen_depends)
--endfunction(tpqt_xincludator _TARGET_NAME _INPUT_FILE _OUTPUT_FILE)
-+    endif ()
-+endfunction()
- 
- function(tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE)
-     tpqt_extract_depends(constants_gen_args constants_gen_depends ${ARGN})
-@@ -371,8 +377,8 @@
- 
-     if (constants_gen_depends)
-         add_dependencies(${_TARGET_NAME} ${constants_gen_depends})
--    endif (constants_gen_depends)
--endfunction (tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE)
-+    endif ()
-+endfunction ()
- 
- function(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAMESPACE _REALINCLUDE _PRETTYINCLUDE)
-     tpqt_extract_depends(types_gen_args types_gen_depends ${ARGN})
-@@ -398,8 +404,8 @@
- 
-     if (types_gen_depends)
-         add_dependencies(${_TARGET_NAME} ${types_gen_depends})
--    endif (types_gen_depends)
--endfunction(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAMESPACE _REALINCLUDE _PRETTYINCLUDE)
-+    endif ()
-+endfunction()
- 
- macro(tpqt_add_generic_unit_test _fancyName _name)
-     tpqt_generate_moc_i(${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp)
-@@ -410,7 +416,7 @@
- 
-     # Valgrind and Callgrind targets
-     _tpqt_add_check_targets(${_fancyName} ${_name} ${CMAKE_CURRENT_BINARY_DIR}/runGenericTest.sh ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
--endmacro(tpqt_add_generic_unit_test _fancyName _name)
-+endmacro()
- 
- macro(tpqt_add_dbus_unit_test _fancyName _name)
-     tpqt_generate_moc_i(${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp)
-@@ -422,7 +428,7 @@
- 
-     # Valgrind and Callgrind targets
-     _tpqt_add_check_targets(${_fancyName} ${_name} ${with_session_bus} ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
--endmacro(tpqt_add_dbus_unit_test _fancyName _name)
-+endmacro()
- 
- macro(_tpqt_add_check_targets _fancyName _name _runnerScript)
-     set_tests_properties(${_fancyName}
-@@ -474,20 +480,20 @@
-         COMMENT
-             "Running callgrind on test \"${_fancyName}\"")
-     add_dependencies(check-callgrind check-callgrind-${_fancyName})
--endmacro(_tpqt_add_check_targets _fancyName _name)
-+endmacro()
- 
- function(tpqt_setup_dbus_test_environment)
-     file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/runDbusTest.sh "
- ${test_environment}
- sh ${CMAKE_SOURCE_DIR}/tools/with-session-bus.sh \\
-     --config-file=${CMAKE_BINARY_DIR}/tests/dbus-1/session.conf -- $@
- ")
--endfunction(tpqt_setup_dbus_test_environment)
-+endfunction()
- 
- macro(make_install_path_absolute out in)
-     if (IS_ABSOLUTE "${in}")
-         set(${out} "${in}")
--    else (IS_ABSOLUTE "${in}")
-+    else ()
-         set(${out} "\${TELEPATHY_QT${QT_VERSION_MAJOR}_INSTALL_DIR}/${in}")
--    endif (IS_ABSOLUTE "${in}")
--endmacro(make_install_path_absolute out in)
-+    endif ()
-+endmacro()
-
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e633fc1ebbcf..7e7d33cc5bfd 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/ipsorcery/Manifest b/net-misc/ipsorcery/Manifest
index 8a69aabf1d18..c4bcec5c1a89 100644
--- a/net-misc/ipsorcery/Manifest
+++ b/net-misc/ipsorcery/Manifest
@@ -1,6 +1,5 @@
 AUX ipsorcery-2.0.9-_BSD_SOURCE.patch 203 BLAKE2B d04a19c782186b5c966116eeb3681f9695b71190928aa6e81e152ee7c68d6f6cec66d1d46f9b6e85ed562cfdde046b05877460f98e6d0408e461ae85ec3beb0c SHA512 e3497b6d5f77288fd8627ecf610045177bd7a5db22b94ee87f91965ddfc13539736b23dc0245001f5d2726617c120d7133dc288b7fb2355d7648f83c08a06dcc
 AUX ipsorcery-2.0.9-gentoo.patch 756 BLAKE2B a37fc6896955a1b4e86847f027cc71320960c71e7e2eee077cc29d632c7fbfd0a60fa7456bdde1d354824e564a45ede7a18801b8ca270d1f83e465587e153e11 SHA512 9619924c02996032584c4a0975dcce9d5d9ad5945f3320b0d4cca0f0bb2d938ce07644992db794c928aa84a1e0a3d46968516b6bdb6180e547a8a13b50de6f39
 DIST ipsorc-2.0.9.tar.gz 38600 BLAKE2B b773a60105e03963edeead61d93d7a28cb16683cf00fbc9d874f4de7e854127c44c9c64dc045f4228520114593cf98587e594e7946015f2f3f8ec7e9e2fdd36c SHA512 a45454d70ecd928df36aa466dc886ab470ea3200e1b252288ea96f96e3fa8742af57bfe98f42d65c7e7abb07986092c2191aadee78ac785fffda40acc5ff8d66
-EBUILD ipsorcery-2.0.9-r1.ebuild 616 BLAKE2B 5e7520720dd063ec181cfeaf4fe229438e60214496ecdc33c8304d49f547d86845a3c5e17a3050293d507b396a8198d3463458776d89bdb5a0884b34099e2ec1 SHA512 5ce56c3e072b7cfa4cae49b058d9426a1d1161f0e742d7fb9c17f55c407c536a224d7b577fda2e77d7484ec1931a56f9cfc3d72c0918a6e9deebbce18b699496
-EBUILD ipsorcery-2.0.9-r2.ebuild 768 BLAKE2B 15908c1fec4583a1770e9a8d26fb75c70306260b70cbfe49cddaaa47ea334c5e1d838512d174bb452d0b62b21a00fc31266200405b9df2753e27e38201cb3f2c SHA512 412272d57ec0cbf5f1019bae21db7b1d7f773fc86bfad2ce8bccb58b3ff1a366a36655595e3ec405fef74a4c0a18b244418b32aa37b3bdcc4266baf8d2e263dc
+EBUILD ipsorcery-2.0.9-r2.ebuild 767 BLAKE2B 9d5b72f7d8d7b0695b1918936d3b46551ff688a07bac623cd088851ed49574fba93c10f03ae8fb711786039b9f125cddc910ec22aaab3815d4664a5f46b757f1 SHA512 e1522d5515bf9a2193a12f314943ed1a26b6d1cd5849fca55e599fb04e33114215da64fa300d76ca5fca76796cd7895eeeb461ac924e49f5b79b3ae25e3bcd8a
 MISC metadata.xml 212 BLAKE2B fb59bcfbeb093c851e3e4a935d1614a10f509fd386894f9d9ade50348d9a1963e9eb482c89980f54986c79e073769212b0f9f0b4ec49d817fd252f578f292bfe SHA512 934c3c3ff6efab14f989c4b030de2bad2ce242d4402a68f90cb6e6fa9d5c3aa85cf0d6f5b92936acead641ebd9d05c870f4d5d59d1e94901c21cb9ebfa4ae685
diff --git a/net-misc/ipsorcery/ipsorcery-2.0.9-r1.ebuild b/net-misc/ipsorcery/ipsorcery-2.0.9-r1.ebuild
deleted file mode 100644
index 092da8b8b032..000000000000
--- a/net-misc/ipsorcery/ipsorcery-2.0.9-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit toolchain-funcs
-
-DESCRIPTION="Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packets"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/ipsorc-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-S=${WORKDIR}/ipsorc-${PV}
-
-src_prepare() {
-	sed -i \
-		-e 's:-g -O2:$(LDFLAGS) $(CFLAGS):' \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" con || die
-}
-
-src_install() {
-	dosbin ipmagic || die
-	dodoc BUGS changelog HOWTO README
-}
diff --git a/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild b/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
index 8771173f2528..f937dc446a40 100644
--- a/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
+++ b/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/ipsorc-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="gtk"
 
 DEPEND="
diff --git a/net-misc/netkit-bootparamd/Manifest b/net-misc/netkit-bootparamd/Manifest
index 8037af1d06de..b46441e6e335 100644
--- a/net-misc/netkit-bootparamd/Manifest
+++ b/net-misc/netkit-bootparamd/Manifest
@@ -3,7 +3,5 @@ AUX 0.17-libtirpc.patch 455 BLAKE2B 2adcdb678d54f486dc4c2b4efa37851c334331d95293
 AUX bootparamd.confd 29 BLAKE2B a2697cebfe9e2c7a9617b2624b70d0615b4ad920d034dbd0f5a5dc66a8183e802747015befa07e9a310c5618dba770c263307c157fd6f6402ebaa570c9fd4a79 SHA512 4f2e6cfef21053bc3a37fada11e77338de57a9e034963c9e91bdc8d6829df29e6b5d69eda3531e67ea3c03599f22da28bb3f7f64a282cc6a2e63927236c1765e
 AUX bootparamd.initd 502 BLAKE2B ebc4d4c3381c1003924c402415aea4ad820e24f38520b4f0bc41643dc3f24642e8010907ae1451f7286607ab387d256e9e74f43ca53c5f3677e876956d0a686f SHA512 9326e3a3dfca43cd7233a289b1f58c22db22aabc2136cba2d61a4bdab17652f9d031e4eddc877126aa09e08e048e63ba9fcf4219f9dbbf55d6787e03d5ee2548
 DIST netkit-bootparamd_0.17.orig.tar.gz 13934 BLAKE2B d828175594b0aae60c5284d4f02c73b4bb91cee2601dc52c6cbfb21e02779825a03567de7dbcc945246104889b7b4bc74f0429b508bda082a365a1d605e213e5 SHA512 fc237c72efd0c7a671c179ee4596f64e13a7a637441d32c9e82e81f4133d987f468c98b00611fbada1f7d6e5fa791c9b513978bfc7a58efe7d93102a2d3b4dca
-EBUILD netkit-bootparamd-0.17-r2.ebuild 988 BLAKE2B 9d293c276ffc2d7b389d5bcd651a6273ceaf24b370c9992d81939aef261e7782a23c3c107819499740d8c7cd4ddd6300703936f68ffcee1627758693fa78886b SHA512 0f801db2520579ad8e898f0fc97b880f9afa9f1a6a0658943c24105107a3c7a24ce7d99f6011bf8701423a50a5e410ca1dc002865b3b24f741133407079e4450
-EBUILD netkit-bootparamd-0.17-r3.ebuild 1197 BLAKE2B 3e94fb3e41d3020c870589ac0e1a8908b3165e50ecaafd9d259928d81f1ee998f18531b32c61d3aa15849d6d9e0bf1382b0b7fa2b984dddc3e4d81283a12f0cb SHA512 b2841f185d425053b8483b25b8a03f0a1a30b02f007640d3c70b9283ac6e7e271701e00b2eb7d114b1260ee93b815154286ef1f9de139cd7a25470e521adb713
-EBUILD netkit-bootparamd-0.17-r4.ebuild 1453 BLAKE2B c53af8280c334424dc10104f11f9d47450787512ce18ced1c5e54059f16ebe3aec35dba6424cc9a9d94e0a95dea920361fb21050aba0742b09454a4156725b18 SHA512 d8d3eb01fbf466f3b24516e629f9181720a0540ba27e79823570a1846fdfd1eb6508cc41033e1b2b72a6d53658ef3a60f6bc78f04d9b59853889927f54ba641e
+EBUILD netkit-bootparamd-0.17-r4.ebuild 1452 BLAKE2B 54bf24bdb77a6e0c93ab084382f41979a271a0b8cbb4805a118781e96072faf16d6af70a0a6225af0c90265b3d1325868f4baee7b0f0ba59af93103fc06acf3b SHA512 e5dc4aad3c38d127c94a3ce96b93a9f5486f2bf0a01a5012d25be3be988325d53978691f5133956dc50b2820b5b71ce3a9c7471b586895fe66e65ab035fa9b3f
 MISC metadata.xml 338 BLAKE2B 24f41b1f254dff65a886a6d2d2449940349c1995efe4eac132ea52fa848b9474faa762224d86d82551154620aced2af9f4ab32e41afbef73994a8287af8a0d4e SHA512 d054668c4f93e1bb54cdb4bf6557feb53c07416435ca091498173a33cdc148e5292b2a8126b15fd9a57a993db536cee43ee0fecea0879adcdd83247017573dcf
diff --git a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r2.ebuild b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r2.ebuild
deleted file mode 100644
index f9f3947fb5b1..000000000000
--- a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Netkit - bootparamd"
-HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-SRC_URI="mirror://debian/pool/main/n/netkit-bootparamd/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~hppa ~mips ppc sparc x86"
-IUSE=""
-
-DEPEND="!<=net-misc/netkit-bootpd-0.17-r2"
-RDEPEND=${DEPEND}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/0.17-jumpstart.patch
-}
-
-src_compile() {
-	# Note this is not an autoconf configure
-	./configure || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	into /usr
-	dosbin rpc.bootparamd/bootparamd || die "installing binary failed"
-	dosym bootparamd /usr/sbin/rpc.bootparamd
-	doman rpc.bootparamd/bootparamd.8
-	dosym bootparamd.8.gz /usr/share/man/man8/rpc.bootparamd.8.gz
-	doman rpc.bootparamd/bootparams.5
-	dodoc README ChangeLog
-	newdoc rpc.bootparamd/README README.bootparamd
-}
diff --git a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r3.ebuild b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r3.ebuild
deleted file mode 100644
index f0ac67f05819..000000000000
--- a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Netkit - bootparamd"
-HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-SRC_URI="mirror://debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc sparc x86"
-IUSE=""
-
-DEPEND="!<=net-misc/netkit-bootpd-0.17-r2"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/0.17-jumpstart.patch
-
-	# don't reset LDFLAGS (bug #335457), manpages into /usr/share/man
-	sed -i -e '/^LDFLAGS=/d ; /MANDIR=/s:man:share/man:' configure || die
-
-	sed -i -e 's:install -s:install:' rpc.bootparamd/Makefile || die
-}
-
-src_configure() {
-	# Note this is not an autoconf configure
-	CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ./configure || die
-}
-
-src_install() {
-	dodir usr/bin usr/sbin usr/share/man/man8 || die
-	emake INSTALLROOT="${D}" install || die
-
-	newconfd "${FILESDIR}"/bootparamd.confd bootparamd || die
-	newinitd "${FILESDIR}"/bootparamd.initd bootparamd || die
-
-	doman rpc.bootparamd/bootparams.5 || die
-	dodoc README ChangeLog || die
-	newdoc rpc.bootparamd/README README.bootparamd || die
-}
diff --git a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
index a601d0e5e6d7..63c9f4c0496e 100644
--- a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
+++ b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc sparc x86"
+KEYWORDS="amd64 ~hppa ~mips ppc sparc x86"
 IUSE="+libtirpc"
 
 DEPEND="
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 7b20328383ef..844739efed2a 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -28,6 +28,7 @@ DIST openssh-7.6p1+x509-11.2.diff.gz 466657 BLAKE2B 3f4f108e2d97eb292c215bc3a6e2
 DIST openssh-7.6p1-hpnssh14v12-r1.tar.xz 15440 BLAKE2B e140852a3ce63e4f744ed4b18b474cf88d09ca55509e5a16d26eef5cf8574466b472073eef56e19467932959d9ba7e941ab561d9ea0704dfee3fd08a6ba7ba8c SHA512 9d0450ec99fe550d790e471cb7815d0863788cf9c41dfef653d102f02be3d38a09e5103e537658279216a5815c1a075ded9f011e05ce216beee2c7daeea8c75a
 DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
 DIST openssh-7.7p1-hpnssh14v14-gentoo1.patch.xz 21448 BLAKE2B 51d9324990d8098707359f355b9212679db38569e566f47659ffdae8046bdbb4e6873bd67ecb7da0b5706c5243f44f82089f08ecbc59c7e39062fceb4be78316 SHA512 63d2ffbcfe121ddedaa07955b1025d2c6e196ea694464610437368835cf46dd507d4d17361548cae93db53a1e3d93d9c409910620bbd0cd619d82b6215c833b5
+DIST openssh-7.7p1-hpnssh14v15-gentoo1.patch.xz 22060 BLAKE2B 81a7f3d1346718c154b39920c126eb0b00ae43f1369d882b8a1bd0b885668805639d869581fb49a8e7c67b61d72a904fde45841e4396af426b136d6d2f0a0dc3 SHA512 7b437bc061677aeabe561ad74bb19bc6f85369119ad8a92fb430fb5c1394c2bb3afd472ee66b285362b2041f871c56633dc94fec33cb062c6b1817d63c1d4a78
 DIST openssh-7.7p1-patches-1.0.tar.xz 8176 BLAKE2B 196b756f72bb3fccc927e31ae1b94adc3c9116de25258ac599c3653cd1234ff33f3dc608515a5ef56bea05191621974342bdb164b721c94d2c29a0de74731742 SHA512 9d56e306a5886a19d58c7a42389a82d8b912bb9250f97f64e9bf9752fc92e671539b24b0568f21072fb1ba7185e6bd1ec33511a39d26d48a699a911b910121c9
 DIST openssh-7.7p1-sctp-1.0.patch.xz 7380 BLAKE2B 6ad40972ece131ff148ede6ba94d63bffc606e0bcabb959d4c9056196cb6f4fddc285f97d7b49b73fde7ee84e3c981c07bddb058ad88eb7c7c2fe716e657c630 SHA512 bc5f50805ba25415f93f61b6654e5bcbaef673b0af48d339116ca9c94b6152afae294c5a9144adeb40190da97c2fc73b43e3ac7ac34feb4a647628327a7cac0a
 DIST openssh-7.7p1-x509-11.3.1.patch.xz 362672 BLAKE2B 55b8b0ef00dc4d962a0db1115406b7b1e84110870c74198e9e4cb081b2ffde8daca67cb281c69d73b4c5cbffde361429d62634be194b57e888a0b434a0f42a37 SHA512 f84744f6d2e5a15017bce37bfa65ebb47dbafeac07ea9aab46bdc780b4062ff70687512d9d512cab81e3b9c701adb6ce17c5474f35cb4b49f57db2e2d45ac9ac
@@ -39,4 +40,5 @@ EBUILD openssh-7.6_p1-r4.ebuild 11099 BLAKE2B 975314f6b62e9191bf6300becb51f6282e
 EBUILD openssh-7.6_p1-r5.ebuild 11292 BLAKE2B 0f8a0e888c539172a72cba3fbc08727de705df525c188e71f6f3e0fc7a4f314fc18b60e2c5fa09c35953b0684dc0ab69c0413172463588deba215af2688d22b1 SHA512 5fdc1fe303b7e183da3948fb177c5963e13df98cb61f24a81f291ff67c4820dc0afd8bc9d34077a966ccf5fc9fb7ff8f936689246f54686512ec45f61e3b7a97
 EBUILD openssh-7.7_p1-r1.ebuild 14657 BLAKE2B b7539268f745f7edf9f654992a0971dd6d77c609b19f945ba3230a3901b85a675f8c951d146089efc238d66e9a0b5d38e1ab5272133e2af8aa4c7989dad8461d SHA512 e2bd77e37b10bb12350da25468a7f1733985dd375824e572a2de0df84cefdeb7bb1fda30014f9a5a3b86aa546c8419264f2b5b761a77482bf3a4fa65bf8a4e72
 EBUILD openssh-7.7_p1-r2.ebuild 15138 BLAKE2B d11f235d48f444750b33cc0964a997caf441601cde53249dea80ab060690562a596f8c1f99acc41d12bd8ecbe96aa4f3bcb328f123899de28d37667ae60d268a SHA512 833d01ce84557187c1109091ae04f3b53b6119debd412c14424219d7054f88aa6ab01644ab0ebe2beda50cec22f6c7bffbbee13091c369137aebb15542d250d9
+EBUILD openssh-7.7_p1-r3.ebuild 15119 BLAKE2B 76116b847961f3e5d57f47245a3edab2e86b81aa7906d4fd8cbc894d7f300d87fe6c9f8323821d5652d85971ec3e249a8b67568c9e4fa74550123df6f164461a SHA512 bd61079fc0731c03c57300696a7cad1ba75052139971cded7a7fe99b91d428a86350fe2979962e27a664a56957b8ee99f73131b9dc22881b40f66d417aca6ef8
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.7_p1-r3.ebuild b/net-misc/openssh/openssh-7.7_p1-r3.ebuild
new file mode 100644
index 000000000000..b06772ba1b8c
--- /dev/null
+++ b/net-misc/openssh/openssh-7.7_p1-r3.ebuild
@@ -0,0 +1,427 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_VER="14v15-gentoo1" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz"
+SCTP_VER="1.0" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz"
+
+# Disable LDAP support until someone will rewrite the patch,
+# upstream removed auth_parse_options() via commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3
+#LDAP_VER="0.3.14" LDAP_PATCH="${PN}-lpk-7.7p1-${LDAP_VER}.patch.xz"
+
+PATCH_SET="openssh-7.7p1-patches-1.0"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )}
+	${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~whissi/dist/openssh/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !ldap !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-1.0.1:0=[bindist=]
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S="${WORKDIR}/${PARCH}"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use sctp && maybe_fail sctp SCTP_PATCH)
+		$(use X509 && maybe_fail X509 X509_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT%/}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${FILESDIR}"/${PN}-7.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+
+		einfo "Disabling broken X.509 agent test ..."
+		sed -i \
+			-e "/^ agent$/d" \
+			"${S}"/tests/CA/config || die "Failed to disable broken X.509 agent test"
+
+		# The following patches don't apply on top of X509 patch
+		rm "${WORKDIR}"/patch/2002_all_openssh-7.7p1_upstream_bug2840.patch || die
+		rm "${WORKDIR}"/patch/2009_all_openssh-7.7p1_make-shell-tests-portable.patch || die
+	fi
+
+	if use ldap ; then
+		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
+
+		einfo "Patching version.h to expose LDAP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_LDAP               \"-ldap-${LDAP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in LDAP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_LDAP' )
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		eapply "${WORKDIR}"/${HPN_PATCH%.*}
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+			
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use hpn ; then
+		einfo "Patching packet.c for X509 and/or HPN patch set ..."
+		sed -i \
+			-e "s/const struct sshcipher/struct sshcipher/" \
+			"${S}"/packet.c || die "Failed to patch ssh_packet_set_connection() (packet.c)"
+	fi
+
+	if use X509 || use sctp || use ldap || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	eapply "${WORKDIR}"/patch/*.patch
+
+	eapply_user #473004
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX%/}"/etc/ssh
+		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX%/}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX%/}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+		# We apply the ldap and sctp patch conditionally, so can't pass --without-{ldap,sctp}
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use sctp && use_with sctp)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.5 sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED%/}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED%/}"/etc/ssh/sshd_config || die
+	fi
+
+	if use ldap && [[ -n ${LDAP_PATCH} ]] ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	keepdir /var/empty
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
+		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index a398a9b8a9bf..ef34f657a155 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -8,5 +8,5 @@ DIST wget-1.19.4.tar.gz 4310657 BLAKE2B 3f2e5a32e897101761d449f079bf9df38e60b682
 DIST wget-1.19.5.tar.gz 4455797 BLAKE2B 988b80090ff1f62cb527afb33c03b7c6a68bbc1649d42f62061e05e416bebf5b2e9546ebafad3c9cdbf1199a8d2b84f4427c921f23338b02631da357da9b3d61 SHA512 0d4964e0f5adb0c023edc831bde9c9f13f3222f6efc1ce93250d234ab937e92b53921624532fb0e6586151ddfdee6df9a7ca91a2a99b3d16e2e68401c625301b
 EBUILD wget-1.19.1-r2.ebuild 3365 BLAKE2B b0fb802be67226322409b35fa6c99814e2747ae85fbfdd95344a49b1aacd8b8c0208848b24cffdd663d4bf0475b41474aa151d4f4bffd3caf1d937cd3e8d144a SHA512 ae46574e6e5bf12161278346fc32eb93c7dd4fc2e776ddebaed9bd857639d9a3c234a818000ba6361a82262d5ee3b05c390efeebd4ec1bf2b7a219e06449ff26
 EBUILD wget-1.19.4.ebuild 3187 BLAKE2B fdd1edc8d6721bfadedd62c3afe979dc111e8950242dd77aa314aa207f012452d6dde1cb9dca2d8366b6a58d3184657034deaf4faf1367127bf638d31753712d SHA512 12ea494dabd74b3f2532952fe07cc6c00753f0ea91b1606c9d4e6b96a7f6595da60be2bb4f8f8e227af4129c736fb72c62fedcbecb56a8ee0c3cc9c1c6a25a32
-EBUILD wget-1.19.5.ebuild 3184 BLAKE2B eb58bbb3d53028be59618c6bfd440f163212fa383b8bf1b804840c758bfb436d267973ea82e6496df4fc4cbbf0579910169a1e76a67bd01d60bb880f99098231 SHA512 7071883b57b6706466d733e1fd70b1bc1f7fb63bf80e5ad101dc7d1afde87cdb77f9e53d93cf38045ab300d8f77ab6b3e3405f445597ae782e5dcc25080e3965
+EBUILD wget-1.19.5.ebuild 3182 BLAKE2B a622065ca4431aa96b7d617707621b06d65de80f5afe46f7c603a94785b59dc46fcbca21fb50ad68ad7c4724e611c0a26ad2d62a9480fa6bdd996147f6969c94 SHA512 dccddf85ebc904eca0590d662121d8bf1cc1360a48484981b3d16aa12dda371292907fc43da47e758a6444ac94a35267237368516978a069fb0d8a17dabb65a4
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/wget-1.19.5.ebuild b/net-misc/wget/wget-1.19.5.ebuild
index 5de649dedc6c..b4d33f3b37ca 100644
--- a/net-misc/wget/wget-1.19.5.ebuild
+++ b/net-misc/wget/wget-1.19.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 251c8faed8b7..4705c5d366c2 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,8 @@
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.04.25.tar.gz 2947762 BLAKE2B 6c6ee1e67eab82418bcc2f5f4556b02eba77ddf830603096e29dd793bf052403379838bf2d920d7ebc39be9ec4e7aba33799435f2980c991873d636d10be5e9a SHA512 89eda20c45575bbf894138b2fd41e38abf3cc21504fe141754544c436bf6030fa94a1496abf6b8c4bfdc77bdf1c8c1d320bf0f1a0ecc2d007409ef9421922c15
 DIST youtube-dl-2018.05.01.tar.gz 2956847 BLAKE2B d1f5a07cfb92ec5d1b7ef075cf7c9de7ce7621b54a186a8e3a14ba0504090b1fc2ad6475b06b62355c383d31ba1905a7b7b6d9276eccdf545290ed4a11f5b293 SHA512 656a15a65d05bd59b188e95126325f9391800adb4b30a858549f190ab4f8b188b6e495456ebdde58c0997b0723e6effd4181183b9afbac11f7799171c4e3875d
+DIST youtube-dl-2018.05.09.tar.gz 2962389 BLAKE2B bcdf235ce91cd2ac7ddf98d36112d9e23d8d181f5998e5e9bb2638d6acd1aff010f390dc7ae2c9d558c07b20f9d5ea1183444ead6a6a797ef980d8dc10c8b927 SHA512 cf62dff3f8427f0d31dceeebd7b6d8748ba004cd1077076b72f02c2779a8147ce07a7a40cd356a51d0f0dea3008a83f20dea73f6de5c1150cae311c552457a31
 EBUILD youtube-dl-2017.11.15.ebuild 2376 BLAKE2B 184105b328f74b20fbb61357b33aeff4b3d4a984179398c9ebbd67a3973a0e0730b98e3414e52d7cf89c7bb15340491d110dc0480b033d4c49714c0cd3ff387c SHA512 baefa087e59c737053e923f7a384ab22ba727f3b9ffd02fad2d80d0fea957babe2ca40f19889eabbf4237416df9cdacfe4b5df2b106a3a7dd4fe1aed9c62a49f
-EBUILD youtube-dl-2018.04.25.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
 EBUILD youtube-dl-2018.05.01.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
+EBUILD youtube-dl-2018.05.09.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.04.25.ebuild b/net-misc/youtube-dl/youtube-dl-2018.05.09.ebuild
index 37bffad45c8e..37bffad45c8e 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.04.25.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.05.09.ebuild
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index c885308349ac..ec9efc4680cb 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/ldapvi/Manifest b/net-nds/ldapvi/Manifest
index 2217afd09b00..f87559482b5d 100644
--- a/net-nds/ldapvi/Manifest
+++ b/net-nds/ldapvi/Manifest
@@ -1,7 +1,3 @@
-AUX ldapvi-1.7+glibc-2.10.patch 1251 BLAKE2B 0daf5e513081524af798ce1bdb2598aa6fc23fcbeeac2d154e786385145db3997eb461ea8b92d3c779f6a0a945c86d73cb65a209038ac6ac9dc95aee4870293a SHA512 f69acbdccff7804d1c7ec216bf9f37b09b0077005aea8f8b1e36c1bfd3b29833fd2bb85f83d55fd8031d37d7dd52f373f1e351dd7ea68338ca5cee9f2f419e45
-AUX ldapvi-1.7-vim-encoding.patch 396 BLAKE2B 80ebd7db9389b9cbea84e0df86ca1cba0ecb45e3e59a68076ce03b42c2b442e7d86d34e1911be21d90ff9cfd67ec6aabd8a0ebfc88d7c3b3ff4be88e6d21efbc SHA512 30c5e36a747f9dfb2b6ccf73a9094f6485c6507436906a5b52b2b685f0ae9e72d16e351e4466cd5f445bb308627bd3255f7b0c29b6daa0bc4bb545091b345a12
-DIST ldapvi-1.7.tar.gz 119503 BLAKE2B a04c52d1d113e4d8afcda12e648cd89d71a6f247ff400bbc7c68597fa4046de58bb0611746df5fb6e9df31ac8a3ad94d1df431d46912185d37d63fa8d24392e3 SHA512 4b38cee0763aa33703afbd5e358a458b1468abf58e43ea885879b2117bc1c0bbc375d91c6a43467ec08035b8b3b7dd4b024f2937c37741c7a5513ea9192aed36
 DIST ldapvi-1.7_p20101214.tar.bz2 1490491 BLAKE2B 21bb7b6113e89ce848e7a8efcec063dbfe9c32331c1125456a96dc6edc4e09d17245307a041a7d7804fac20bcce5b38677d719fb53d993fb874134bbd4d4df19 SHA512 2d2a744a36364793f406f37ecf6e546914d697457dec37b81544f4979f4c692756b2a1c3ea6fcbaba5e3238b2bf758ab3e0bd9a9a0794c4da734d65286bd5925
-EBUILD ldapvi-1.7-r1.ebuild 834 BLAKE2B c9407f6a998a12ec642a53dc7cee2464df1a33797c56c6c35c631053cc9a4ac71abed03390382bc6b2a5a113cc9324df331a61eb479094ed7d3a935188f44443 SHA512 106641b5cdb1fa7b274010322b3a1c0941153b9fe9cb828bc9bd4ca233cb80871c7b5f6de6cb1733fe45c85df77850735b469cd5ddf563408549afb86630d6ad
-EBUILD ldapvi-1.7_p20101214.ebuild 932 BLAKE2B 2022194c40da83dab6742d7f7713366b9e762effb201d34ac267ff1f538b170ed6f8af1f62a6a695059c0e9f2df0ca5f1643957d63ae4d8cdff18da060505b32 SHA512 5707649f3c820fa2eb9164d3fef072fbd1706e9f1879e7bad805875c95cd73b828dd46ca3f3ca0cea087691f6276d9edfd44c2da972956b8f438f15829cd5eeb
+EBUILD ldapvi-1.7_p20101214.ebuild 931 BLAKE2B 45ce069e6a4a5411ba96c1bb2aceb0553b375050d193afd85dec40aa5484f8b5bd712fb398a0bd0e9d5992c6b7a1699948af56ef221154146549ce3cc3df9da5 SHA512 f25907d10aa79f446109e4137c922c175f98c2da3969ada4f029c11e5ada65a9d6097aab1edb01622ac428ae3b210c039bdd7daee2d874f4fdd145b59a3bec25
 MISC metadata.xml 474 BLAKE2B 45e25e966ab1b5bf2a4915bc8273a06bceab035e5abeccf8261677d187a8aab25390e65c473a0b1d0dd125ed6a241a4aef4a208c5373af0f5f62fdb15cfbf31a SHA512 840afe9dd11eeda2b3d29387b2043c6973deaad32ffd8f70ccde46eae0dbd1d09a179a6e29cb61e60a0c9ae0bfb13b96298be4cac02a97f444550fadcc34ea9c
diff --git a/net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch b/net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch
deleted file mode 100644
index df2a20c71245..000000000000
--- a/net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: ldapvi-1.7/common.h
-===================================================================
---- ldapvi-1.7.orig/common.h
-+++ ldapvi-1.7/common.h
-@@ -273,7 +273,7 @@ void pipeview_wait(int pid);
- char *home_filename(char *name);
- void read_ldapvi_history(void);
- void write_ldapvi_history(void);
--char *getline(char *prompt, char *value);
-+char *ldapvi_getline(char *prompt, char *value);
- char *get_password();
- char *append(char *a, char *b);
- void *xalloc(size_t size);
-Index: ldapvi-1.7/ldapvi.c
-===================================================================
---- ldapvi-1.7.orig/ldapvi.c
-+++ ldapvi-1.7/ldapvi.c
-@@ -470,7 +470,7 @@ change_mechanism(bind_options *bo)
- 		bo->authmethod = LDAP_AUTH_SASL;
- 		puts("Switching to SASL authentication.");
- 	}
--	bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech);
-+	bo->sasl_mech = ldapvi_getline("SASL mechanism", bo->sasl_mech);
- }
- 
- static int
-Index: ldapvi-1.7/misc.c
-===================================================================
---- ldapvi-1.7.orig/misc.c
-+++ ldapvi-1.7/misc.c
-@@ -315,7 +315,7 @@ write_ldapvi_history()
- }
- 
- char *
--getline(char *prompt, char *value)
-+ldapvi_getline(char *prompt, char *value)
- {
- 	tdialog d;
- 	init_dialog(&d, DIALOG_DEFAULT, prompt, value);
diff --git a/net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch b/net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch
deleted file mode 100644
index d9431bed2de1..000000000000
--- a/net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-From https://bugzilla.redhat.com/show_bug.cgi?id=691958
-
---- ldapvi-1.7/ldapvi.c
-+++ ldapvi-1.7/ldapvi.c
-@@ -1414,7 +1414,7 @@ write_file_header(FILE *s, cmdline *cmdline)
- 	int nlines = 0;
- 
- 	if (print_binary_mode == PRINT_UTF8 && !cmdline->ldif) {
--		fputs("# -*- coding: utf-8 -*- vim:encoding=utf-8:\n", s);
-+		fputs("# -*- coding: utf-8 -*- \n", s);
- 		nlines++;
- 	}
- 	if (cmdline->ldif) {
diff --git a/net-nds/ldapvi/ldapvi-1.7-r1.ebuild b/net-nds/ldapvi/ldapvi-1.7-r1.ebuild
deleted file mode 100644
index 0aebcb276659..000000000000
--- a/net-nds/ldapvi/ldapvi-1.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Manage LDAP entries with a text editor"
-HOMEPAGE="http://www.lichteblau.com/ldapvi/"
-SRC_URI="http://www.lichteblau.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ~sparc x86"
-IUSE="ssl"
-
-RDEPEND="sys-libs/ncurses
-	>=net-nds/openldap-2.2
-	dev-libs/popt
-	>=dev-libs/glib-2
-	sys-libs/readline
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}+glibc-2.10.patch"
-	epatch "${FILESDIR}/${P}-vim-encoding.patch"
-}
-
-src_configure() {
-	econf $(use_with ssl libcrypto openssl) || die
-}
-
-src_install() {
-	dobin ldapvi || die
-	doman ldapvi.1 || die
-	dodoc NEWS manual/{bg.png,html.xsl,manual.{css,xml}} || die
-}
diff --git a/net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild b/net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild
index 9763222901dc..5cad67220358 100644
--- a/net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild
+++ b/net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
+KEYWORDS="amd64 ~hppa ppc ~sparc x86"
 IUSE="gnutls sasl"
 
 RDEPEND="
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index fcff76b8dccf..86cad8919011 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 99b552e7cc0f..55cce03b2ea2 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -6,6 +6,6 @@ DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8c
 DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
-EBUILD bitcoin-qt-0.15.1.ebuild 7197 BLAKE2B 1aa41f45e03b1c567fda197271007a17f07c3600e6759a4a9dfa0be918ff6878d8b81582647316efbe15d386e6499ebdd54b161ce8afe97c81e10a4ea92ef757 SHA512 7d452b1526df5815d309987beaee84086d4091c198b0e31bc2c80f6a6baeab5a99aff4b4b366d3c06829c070f87683bcabbfb6c14a22d7f551c0b53cd8b5bc5d
+EBUILD bitcoin-qt-0.15.1.ebuild 7198 BLAKE2B ba06d49cb5eb176fef2d617029856b90adc534d236ae117b413e9dc75bfda39250f15c9d4e7b39b89eee305eb6d795e28d049e79936bb510b9b3777387a6eb39 SHA512 bdbb8b14bb79604111b574daf6682a6ec330ad4c3c6b33ab966da5e47d957f841a17e3b1533261e2d851d3b095e86e65eb9665ff7f372868151b1c5bd3110d66
 EBUILD bitcoin-qt-0.16.0-r1.ebuild 5182 BLAKE2B bf0dab729c8bbd7c79aa9b732b974afed7fd91413674cdb36071100ae8c701160f3c0326c403a0f7484cc284e4cb1c513a832c0e64328771f97c99f802e47dcc SHA512 327af32f1dd507c3f5c5464c1f6d63e3691b484409d1998e1d5ce7dae5cdd3677fcdd59780e1ea0226f8fea01e8d4a6fee77f6f956230933669aed9aa32afa8b
 MISC metadata.xml 1485 BLAKE2B e372351807fa1375c29e2fe88cd15e9aa85111069c8876ae1d806bcd509692fc4d173c37c94a8e5bf63d9d1f25b0ddb8895b2cad4e957c4cb11cd29fe837b8c7 SHA512 ebdf31d2908f1828a57b3728a86b65b1818d7ccee0d2725b3f049fb624cc32d72db48b53ce5f99c98cce7926a3e5840eae375227a5ec6ec6719f7c12ae858c20
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
index 0e17c7c80524..3e86deab6af5 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 
 SRC_URI="
 	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
diff --git a/net-p2p/mktorrent/Manifest b/net-p2p/mktorrent/Manifest
index 4a1a7addf2f9..7971aab2b80e 100644
--- a/net-p2p/mktorrent/Manifest
+++ b/net-p2p/mktorrent/Manifest
@@ -1,5 +1,5 @@
 DIST mktorrent-1.0.tar.gz 23089 BLAKE2B debfdbf2691fd1baa9f1647ef1cd64a4e5d8cbcabd77fb7c8a4b7ec5c1abbf4fa56ae54ea51afc58b0807cde8d525c4ac7106d38576e52a71e2776ba0bfcacda SHA512 f103c8860c008796c2dc604fcabce7374264fd7814237fcad5f9dab0fe10e927b0e2d9b58e7462dd198265a7d83fe30fd68313c7dce4029d8c331a6f2d4622de
-DIST mktorrent-1.1.tar.gz 23314 BLAKE2B 97893553c99f3a6f994876b4689db2536cdaef30f9a392cf3ef800d5d92323336f836a9a3f92aff807a449bcc8553582275c4b36d98e1a1e99835945a7f4b43d SHA512 2a7ce83950711cf5be098693ad79273b29bcd8a5ef345ea296c7b6b83c532dd3463b347c7137234f1890cb4ea663ee5a5b1878591bc8fb4386d94e4f65410859
+DIST mktorrent-96090fb175f3cef17ae2499e98c2868363106927.tar.gz 24575 BLAKE2B 85f4c1088a5db91ba9bfa9391c82d81c87436a5ee920441c4e05a0e22d535aa1f3c60a0f2c6918a313f911ce9a586ab0ce725212926ad703f7daeaa4ee8b3e14 SHA512 2016cf9c81c6d35f3e482bb5cf8d0083664cee7131bc57f94ba5d0482df7d9b53e49a622035e1e93b6cebb50da9a29d8d00e2a65d3b84a872d98ed51e75a3a8a
 EBUILD mktorrent-1.0-r1.ebuild 773 BLAKE2B 2d2be9f07b8d12e50d14fb7855abd73c86ad881c213da8d53de7c216a9e93b4fb52cfa2d0f825ce147b83871cb3c638fddc556ff67ff24af7d996abd461b7fc2 SHA512 0d0bb8c9cd8c14d7c6ecbd7bc7b59576ad1a1ba2ee27afba9ad2e2231e8fd48d47f657097d27f266ebe5a708e4c1e1cac1f9ddcad00838ccba757b89771e3b84
-EBUILD mktorrent-1.1.ebuild 840 BLAKE2B f7a531b3c88a1c691f0cd11b1a3786f1b518887598af81b91610e5053ab0645c03394af181a3734b5e697c51249f3c64ce5287bebf28ed04e81ba3908cd35bc3 SHA512 d21464e051987db10ee0cf3632e9477443f01ccd95a24af56bc934707c3034614994a7477d2c5e3e06ef9fb4fab4aed0239c305c85d68e599fa1ada63ed79a5c
+EBUILD mktorrent-1.1_p20180502.ebuild 984 BLAKE2B 12ac4b99a2ed57bd3bfd9bf937e8dbf2a8601a24311f60c7ea6a910dcd6748e20d40491ae16b7913df66ec6e77bd6e88d6a0fca35004749822190a33b45dfbaa SHA512 712658efe2504b105091c244e41cdeec65d3b4878d2b9c53765f8f87e38016b9196f0688944a3588996dcbe39319e67bb036c5eaee96d32582a1e03b1bc950f3
 MISC metadata.xml 446 BLAKE2B f5298ced2a3c59bc990eebd8d183815e8449191b11e48e31aea3948944cf67e79ab649922c104a0a644d8f4de6bab044175a2bb64fe3124f4a317fb98be7deb9 SHA512 6dc7c65acabf5e556235a4c5e95d77301d8aa92acf2d82d6c50afe761095637c8f08616d40b6a34270894ba9baf9bfef33f060e3c8fe67e3ee92a9bfad1f68b7
diff --git a/net-p2p/mktorrent/mktorrent-1.1.ebuild b/net-p2p/mktorrent/mktorrent-1.1.ebuild
deleted file mode 100644
index 3cb3f2a2413a..000000000000
--- a/net-p2p/mktorrent/mktorrent-1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Simple command line utility to create BitTorrent metainfo files"
-HOMEPAGE="https://github.com/Rudde/mktorrent"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Rudde/mktorrent.git"
-else
-	SRC_URI="https://github.com/Rudde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="threads +ssl debug"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	tc-export CC
-
-	emake \
-		USE_LONG_OPTIONS=1 \
-		USE_LARGE_FILES=1 \
-		DEBUG=$(usex debug) \
-		USE_OPENSSL=$(usex ssl) \
-		USE_PTHREADS=$(usex threads)
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README
-}
diff --git a/net-p2p/mktorrent/mktorrent-1.1_p20180502.ebuild b/net-p2p/mktorrent/mktorrent-1.1_p20180502.ebuild
new file mode 100644
index 000000000000..6e9c5fe03dae
--- /dev/null
+++ b/net-p2p/mktorrent/mktorrent-1.1_p20180502.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Simple command line utility to create BitTorrent metainfo files"
+HOMEPAGE="https://github.com/Rudde/mktorrent"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Rudde/mktorrent.git"
+else
+	COMMIT_ID="96090fb175f3cef17ae2499e98c2868363106927"
+	SRC_URI="https://github.com/Rudde/${PN}/archive/${COMMIT_ID}.tar.gz -> ${PN}-${COMMIT_ID}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="threads +ssl debug"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	tc-export CC
+
+	local myemakeargs=(
+		USE_LONG_OPTIONS=1
+		USE_LARGE_FILES=1
+		DEBUG=$(usex debug)
+		USE_OPENSSL=$(usex ssl)
+		USE_PTHREADS=$(usex threads)
+		)
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+}
diff --git a/net-p2p/pybitmessage/Manifest b/net-p2p/pybitmessage/Manifest
index c7452d6e9c79..725617fdb2db 100644
--- a/net-p2p/pybitmessage/Manifest
+++ b/net-p2p/pybitmessage/Manifest
@@ -1,5 +1,5 @@
 DIST pybitmessage-0.4.2.tar.gz 547565 BLAKE2B 8cb7bc0407601f06c5d0040fa03372e95c34e21aed79021001f7067b3340c60a08f7ab7d2c6578e78e1f7bf09a5adc5805252a27cf8e1bda27de6d1495382e35 SHA512 5e783243db4f507ec221092f6da18d25bb15a8c83f28aab7c1796a063d2608c0115c9d636cc73b66a09264a4ff69dda9ba373eff81640b1dd9595100dcdc4917
 DIST pybitmessage-0.6.3.2_p20180326.tar.gz 1102343 BLAKE2B 55d1458858c1431f341feae10b151590bf8dc577d5a52e5ddfbb629853373339f80d0fb9a855cc82deb50ee952d7a356c0140b67ed1d28108a5c8f19d3b97305 SHA512 836dc5a2fbea96bd46bd50e6462ccb118f22591e9d838af80f05bcce3efa8434942b112725a0b5b161d9c0a544520931e56cfc01c33ea4d231bdc02c112c5894
 EBUILD pybitmessage-0.4.2.ebuild 1491 BLAKE2B bd2a91e4a9142decd90587706e12319806e7ac3d25ed239cf0ad3bef70288b8e8383f5b0c247239778d7cd9e5f3ae56ba41beb32d19a82fa817b7473ab117f63 SHA512 158c5280052bcc4d359f96232e712c85167b088253b08c623c1453e8e8d261edcea09c4c8ae0f9fc72ffeaee63ec8084c6391b1989e6f293adf1bfe98f5fc1cf
-EBUILD pybitmessage-0.6.3.2_p20180326.ebuild 1704 BLAKE2B 108f5cccbf216bf7c11a2592f47f331de3f9c501ac09eb4c4bf9017104597fed2ef50f422a577d49f104b6d876ea656435ef040e871ba614855f8b1bba80ad0e SHA512 4034cd2ef003a2b18fd0c25c9819df63a2a2052d85f4d5e3e9aa726689481fed38be7796bcfdf1f57f00b52aedbb2416f1b6065522df5c43b289991a1b9e26ec
+EBUILD pybitmessage-0.6.3.2_p20180326-r1.ebuild 1715 BLAKE2B 1a90206fc5edb53bc6e40b0b31396dd88b080ad6d0699374815b66bf19a4df299f3be72cde1bca3d3d5dbf9a9d420264941ff82ffa2fa6f365bf0ad5b7780e24 SHA512 ba1aad10c2942ccb7aa7380ed1e6f8cec0d01732308d1a05caf1746c129a43ab565bdc19a1b18ce88db0eb69bb1480b8814c6e11b4653ef3e140e97ba48cf3d7
 MISC metadata.xml 1156 BLAKE2B 9b20373355740d63c1d8e9d2d0b1c569d2d8944a7a477b871a3bc9ec741321fb71670ab9dde1753348369c91e9c2ca17a05d6830ce8ffa9288599e595d06f654 SHA512 0a5d180118567c9d120584a03ed920f2f73931653f714ad7d68ea38cc427e8e443e7a518cc5039f61dcfea9d0c13f889c82124d2009f51bc13e96381bce77c0d
diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326-r1.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326-r1.ebuild
new file mode 100644
index 000000000000..5c6c63027b57
--- /dev/null
+++ b/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326-r1.ebuild
@@ -0,0 +1,70 @@
+# 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"
+
+COMMIT=b210fd84d1053d3a57a888ecc8444f580d4b0651
+inherit distutils-r1 gnome2-utils
+
+MY_PN="PyBitmessage"
+
+DESCRIPTION="Reference client for Bitmessage: a P2P communications protocol"
+HOMEPAGE="https://bitmessage.org"
+SRC_URI="https://github.com/g1itch/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug libnotify libressl ncurses opencl qrcode sound"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	|| (
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/u-msgpack[${PYTHON_USEDEP}]
+	)
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.3.1[gui,pyqt5(+),${PYTHON_USEDEP}]
+	debug? ( dev-python/python-prctl[${PYTHON_USEDEP}] )
+	libnotify? (
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		dev-python/notify2[${PYTHON_USEDEP}]
+		x11-themes/hicolor-icon-theme
+	)
+	!libressl? ( dev-libs/openssl:0[-bindist] )
+	libressl? ( dev-libs/libressl )
+	ncurses? ( dev-python/pythondialog[${PYTHON_USEDEP}] )
+	opencl? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyopencl[${PYTHON_USEDEP}]
+	)
+	qrcode? ( dev-python/qrcode[${PYTHON_USEDEP}] )
+	sound? ( || (
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+		media-sound/gst123
+		media-libs/gst-plugins-base:1.0
+		media-sound/mpg123
+		media-sound/alsa-utils
+	) )
+"
+
+S="${WORKDIR}"/${MY_PN}-${COMMIT}
+
+src_install () {
+	distutils-r1_src_install
+	einstalldocs
+	# The man page is not installed because it's basically empty.
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326.ebuild
deleted file mode 100644
index b06261624b06..000000000000
--- a/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-COMMIT=b210fd84d1053d3a57a888ecc8444f580d4b0651
-inherit distutils-r1 gnome2-utils
-
-MY_PN="PyBitmessage"
-
-DESCRIPTION="Reference client for Bitmessage: a P2P communications protocol"
-HOMEPAGE="https://bitmessage.org"
-SRC_URI="https://github.com/g1itch/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug libnotify libressl ncurses opencl qrcode sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
-	|| (
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/u-msgpack[${PYTHON_USEDEP}]
-	)
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/QtPy[gui,pyqt5,${PYTHON_USEDEP}]
-	debug? ( dev-python/python-prctl[${PYTHON_USEDEP}] )
-	libnotify? (
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		x11-themes/hicolor-icon-theme
-	)
-	!libressl? ( dev-libs/openssl:0[-bindist] )
-	libressl? ( dev-libs/libressl )
-	ncurses? ( dev-python/pythondialog[${PYTHON_USEDEP}] )
-	opencl? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyopencl[${PYTHON_USEDEP}]
-	)
-	qrcode? ( dev-python/qrcode[${PYTHON_USEDEP}] )
-	sound? ( || (
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-		media-sound/gst123
-		media-libs/gst-plugins-base:1.0
-		media-sound/mpg123
-		media-sound/alsa-utils
-	) )
-"
-
-S="${WORKDIR}"/${MY_PN}-${COMMIT}
-
-src_install () {
-	distutils-r1_src_install
-	einstalldocs
-	# The man page is not installed because it's basically empty.
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 9abe75210f80..bc970cbad56e 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 26bb7d326a9d..69fae37d93f2 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -16,7 +16,7 @@ DIST cups-2.2.7-source.tar.gz 10330296 BLAKE2B 015a64758ee8d2559f4259ff36bf702b9
 DIST cups-2.3b4-source.tar.gz 10130356 BLAKE2B 10dd250516bafa1df0e8d123fbfff44f290180771d5d9bca0879ca985435299277d42e2222969cb1d6f9b5e55ad86f3dd7ebd246724edcb257b42ddb3d7e91b4 SHA512 5613b18bfc28c53fb738feb3e0a96ec6b4cec8575479f50dc06f835e109de52af6f5d0c247c84b9b22285e92ea9694839269c27b67c641cc5f81a68a1f818b31
 EBUILD cups-2.1.4.ebuild 10148 BLAKE2B 8c1fb902b3f7531b212c22315869360c30fccfe4f354052386f9e4d8c28df07ffc78de6cb8a3d24c83329d025c2dd385cdcb59cfb58b001f68e77012bb44269f SHA512 29453995a34ccdd7303365d7c2f5abe457e81897080fefd8c42b82f3133d7833774d9276e2f5569f1a268dbd9c28fcaf35b9ae740f32ba1b163d43857546c1ab
 EBUILD cups-2.2.6.ebuild 9835 BLAKE2B 0a9b787a1691f452ab5b441b2f4a7afcfbb752ade54648428ec823a80098996c63a3a37200df3204ae01e751eccf7b19cb6d548e4171f4949cf677fb4d6fef81 SHA512 bdf1f5a77acc7ad782603c92ad7bb4aaaff178683edf465dfe88b9ecac8315d3996b0f89869acb6ee60e118b34d1225ac0648d1162b704aff74ad6b4f72f6bcb
-EBUILD cups-2.2.7.ebuild 9957 BLAKE2B afa6181c1cf3123eaebc75048dd5f0816415c4c9b5586b69bb84103f62011ff4258c63b5916c85e540f26656ea410f725244f3506e619d879b6577a735a0b4b0 SHA512 425ef7271c595c7a11f134dc8024fc68e1198345bdad4307e001f8e4ed84f9b34064f338bb167f1ce0aec1ddf65bced6995888683b591a15a5bedde0c0005769
+EBUILD cups-2.2.7.ebuild 9955 BLAKE2B 1cac2b39b226da9ce2bef0f895baa8a80d5af4d51b38a45a95346d722f9fdb44f30c836777d13b1fda99a08953fca8d2cec54776b6b5dea55ec5c53cb3d2688b SHA512 356de8b602576d7152ce9b33516e3fcc6103f42c3d5296657443e1420473804602b71c63550f3b27e2c36873ab8a4356e6cc36869d0c0ffc617a7d1a76402157
 EBUILD cups-2.3_beta4.ebuild 9877 BLAKE2B 39ada1548f440a4d91602ba56d4451382783e2d851e3b0891ccdae42c54d71915f69cd5fa868c6ed60e266c5ecd4bd73a18f644630b4e196a9942bdb99fd83e3 SHA512 b141f3a9da543989a82af2c1bdef94bc8ee173710e6607efd0c0bbf95ff4e921373aa7cc7ddf739edd32e38b7a8e3052ebfc2737c68a34007f95c8d6393b92e4
 EBUILD cups-9999.ebuild 9877 BLAKE2B 39ada1548f440a4d91602ba56d4451382783e2d851e3b0891ccdae42c54d71915f69cd5fa868c6ed60e266c5ecd4bd73a18f644630b4e196a9942bdb99fd83e3 SHA512 b141f3a9da543989a82af2c1bdef94bc8ee173710e6607efd0c0bbf95ff4e921373aa7cc7ddf739edd32e38b7a8e3052ebfc2737c68a34007f95c8d6393b92e4
 MISC metadata.xml 677 BLAKE2B ca19e7bd0d56a0a78771a30efcbd867cd0ab1eba7aaf3add8d384721ac70ed8809bc8a171df43887d772f81dcfd54f31bc13267a9a3a88da44b51322aff87c15 SHA512 f7ed769c4f662ea52ed9e24702b91948a376e7d5a59b305f6d89950d0ea40130e6d471cc0bee373a63338f590bce3b6df5a09e56a166ba7fdd960f82e7648717
diff --git a/net-print/cups/cups-2.2.7.ebuild b/net-print/cups/cups-2.2.7.ebuild
index 23b3b6a01ce3..de36758d8efa 100644
--- a/net-print/cups/cups-2.2.7.ebuild
+++ b/net-print/cups/cups-2.2.7.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="https://github.com/apple/cups/releases/download/v${PV}/${P}-source.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
 fi
 
 DESCRIPTION="The Common Unix Printing System"
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 4b89fe36607c..b48d396eef3e 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -5,7 +5,7 @@ DIST gutenprint-5.2.13-pre1.tar.bz2 6971542 BLAKE2B 50ea5051760ea5a03e2d72c1ae39
 DIST gutenprint-5.2.13.tar.bz2 6995005 BLAKE2B 7f9fe4bfee907fa6fe6de9bde674368701a221ea12459438053c231cc0e181601eb4fc700a95531135aecff2de6b2f41c2c78d89ad4445773efe0c11a8f45a35 SHA512 6a60a5e462bfd754ac4389b7e926715c06847c660df17e40d48cd57ece99a7ea6098bfd16c067cb27d8aef7ef705a2fdca9f05209d1f3ebf168b0ab16af4e36e
 DIST gutenprint-5.3.0-pre1.tar.bz2 6979423 BLAKE2B 39093c48b8212da7b1bf1e9fb4c9b8b79a0a5bb67b2846b2ba7c94bbb35e6d0cb03e951984ecaa2e3e8c785c70e5fdf52eadc553b18494edc229026b73974227 SHA512 0b72a76f48351f49eea35338e04a533d9419333339f5eb2c20bc0535a337ce2f77b7f1a1050d0de3e1b3220504fa1ce3b39fa6eee7013b7b3a45fc347b3ee83d
 EBUILD gutenprint-5.2.12.ebuild 2030 BLAKE2B f4b5a84f19bbcddd0e182635decd5ddce805879d4e25436a75da8e5db75a41dd81526034b24c6a2d54484f89284e48d1e239505425076c708b0a17010b7be9a5 SHA512 cf904aa171bdf0d37d22b0b9d3dd8d2d047d24c7844d2401dbae473abcbb41625775fa4d356f38af74511725e701f8d4c2bcdb9d88329ec13a37b3e64893ce4e
-EBUILD gutenprint-5.2.13.ebuild 2083 BLAKE2B 634183c6ce24ef198f9157fc268914ba2283e361295b13dff2cfed2a308d43f562858844c855dc4173c2e913f8f2ae64214065816143210c9e896514a8f13a52 SHA512 5e540ff6db6b6f2c731c82ccefbd5bfae854b44d5de12467df1f37af98d20ad0af4da3ec884f6d83249c2f1d8c548e11eb3073068738a231300c1ebf0428de70
+EBUILD gutenprint-5.2.13.ebuild 2082 BLAKE2B 9849d79449cc4d3c42552303fd90643a9e46c1b5ec84f974fdddbb0065b59943f79342d92d104630df291e543f3657637a40b63dc54d43c0c28d7a1fd5d9dcab SHA512 a8e246dfe846b82461298245de4486ec0e1eb53044f67a690b7147b7ff507b06ea8f9cff084632dbeeaec82817efcf9c1e0420cf8730faf81cb787b493463c32
 EBUILD gutenprint-5.2.13_pre1.ebuild 2083 BLAKE2B 634183c6ce24ef198f9157fc268914ba2283e361295b13dff2cfed2a308d43f562858844c855dc4173c2e913f8f2ae64214065816143210c9e896514a8f13a52 SHA512 5e540ff6db6b6f2c731c82ccefbd5bfae854b44d5de12467df1f37af98d20ad0af4da3ec884f6d83249c2f1d8c548e11eb3073068738a231300c1ebf0428de70
 EBUILD gutenprint-5.3.0_pre1.ebuild 2084 BLAKE2B 921781cb1468aac2b1e88c60589885a5dd71d4b97d901389490ead11aaa6f2a44a65a6a7bc0e2adc14b75f63a795e9035a66a7bcf15c97bc4c0d4d7fe728fee9 SHA512 28eeace987d40f049c6e73146d8ab332dd220ff8cf4dde69a438a1857d45891aafdbdf941e774390f23b3a5d6f49056a15c9ab3a4aa0f9730d0105710d6262bf
 MISC metadata.xml 339 BLAKE2B 1090eefd725cc9e37f9c8e77daddb80c3791098af5ba2405dd2746426a46722bef0ed8706654100559735d9f29c2be45eec525cadc0653776dda60453abca786 SHA512 b2153b9425e34eb5561da4d5ea99c08bdfac03b036a94b0c471f985635e2a75f843956cd94d99cbb0d2e2b71b6a14493892bd8efa6eeecf2309ac4b964d9d6a6
diff --git a/net-print/gutenprint/gutenprint-5.2.13.ebuild b/net-print/gutenprint/gutenprint-5.2.13.ebuild
index 53882ab7a0f1..0194908ff7a7 100644
--- a/net-print/gutenprint/gutenprint-5.2.13.ebuild
+++ b/net-print/gutenprint/gutenprint-5.2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="cups gimp gtk nls readline ppds static-libs"
 REQUIRED_USE="gimp? ( gtk )"
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index b8bed1823f4b..042e21a8cc6b 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index e11d11c6a142..c3b99aff3e89 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,5 +1,3 @@
-DIST openfortivpn-1.5.0.tar.gz 52302 BLAKE2B 8e776d089eee5a33a80b36684f006b3a4bda56405f50b134edfb371f174341299362f2d7e79f8c0b86bd9c255f253cdd195c2598f462d4f3ee262727ab31d135 SHA512 2ee56baf83b4ca604512dfb0f518c03731be18c08399a4482190ea9c8cf0c14a570e31ae3b1bcd32067203a008d02a7d4414000f817b178b4cdbd171035be76c
 DIST openfortivpn-1.6.0.tar.gz 55606 BLAKE2B 649ca2a8112313fc7b63d89867efe33c4cf8e75cb4c2f7f19839e1f569ac04e3ace841b17ac0e7aa9b51a7e6d9b1f7910925761d5052cac6ef5aec1e257b93bc SHA512 547dca62022f56271717191a10a645b8a1c554568536f0695ef73d8c2883926e957dc070570648ed672786374a01b110de34b4ea19c4ae8cb2e3657c27716c69
-EBUILD openfortivpn-1.5.0.ebuild 767 BLAKE2B 67fe0d47c07b12a9bc581ebaa3a94bf0c708156710d235ba27336ec49cd0f0a85c5690e93f3be90fe080b24fb254feadd029061cc18a0c98d6082d522f0587d4 SHA512 b32b571035164d8f55f2e4c089db69f7f6237e9cec0c8f30e993941fba55db7810adc60e77d0c1eef837f7bfa2358e5cdf2eb4ea2fde9ba7b9e0ce289125aaa1
 EBUILD openfortivpn-1.6.0.ebuild 767 BLAKE2B bc3393b80a0f0ee6c4c8a64b3d74e09bcc9fba52bf82e15963ede1b3005405f2ada2f24e6923674f19fa740c1aca75ed3aeb2d01c9bc48785da20528b71f12a4 SHA512 d56b5b9924f93f91345bbc0f7d103914e37b8f5226c7ead92040d58e7f326aea1f0feb209b3eaae4f33b6b966f3fbfda7fce9396f34b017d53e6086aac6417cd
 MISC metadata.xml 473 BLAKE2B aee10343291eb84a3f404dddaed244e982587a4f74aa1e9e0d3dc6d2d888a77a03dd944e2c607cd51d895d193387e2cd81cd1c3f10d212ab52ed4df68081882b SHA512 d2807f01f5e74e765e1ee6fc23b917c78987f7f73672cfa019ab4e96c387105a5e8f90a53b1ffbf079f832a7bbaf74a9938cb2f9bb2fcc7a7deb76cf99b9469f
diff --git a/net-vpn/openfortivpn/openfortivpn-1.5.0.ebuild b/net-vpn/openfortivpn/openfortivpn-1.5.0.ebuild
deleted file mode 100644
index 0027219ec510..000000000000
--- a/net-vpn/openfortivpn/openfortivpn-1.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info
-
-DESCRIPTION="A Fortinet compatible VPN client"
-HOMEPAGE="https://github.com/adrienverge/openfortivpn"
-SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception openssl"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libressl"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-dialup/ppp
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~PPP ~PPP_ASYNC"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	keepdir /etc/openfortivpn
-}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 96f4b58b5bb9..0c241f204ff5 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 9bbd3ff4ef63..5b2f94fa0a4a 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -3,8 +3,8 @@ AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaf
 DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8
 DIST gnuradio-3.7.11.tar.gz 4357123 BLAKE2B ae43e9f7e20605de484c4dc31bc33b9b99e5fba269d8d394e9053f4451083b2d6048c1d1fe19a774c0cc686c13e758f0b6e719cf15d05c5867e2ac1c4eecf789 SHA512 a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14
 EBUILD gnuradio-3.6.5.1-r2.ebuild 5313 BLAKE2B 5fa23624df4cf4d28504bd9aa1ec2cfe7340299077483481467675dad50629d8b6c3b29b77587bc43b7b1d542a3b9c04ca41470456760fb40efb2d91d089e205 SHA512 8492ef981cc6d401d0c57354e188c3d926eb04c078d7a6997173e926fb22d43b2d4881ea359d77a9491f1e7f67802248982266c680a50624a550b8865be6bb95
-EBUILD gnuradio-3.7.11-r2.ebuild 7041 BLAKE2B 4a834c6cefed163dda5bef9214165e78d3338d7d6714b22c6cdff7ed5a07302c19ae74e71e37eb3b484240459a9372121871219bb72e0faea976d3580e845d8d SHA512 70aedd5f4076876b7ca2ee2b4693bd06a429f7ca693786f3a46e4f65b613cf2f570c93c75bf873e314fe35026075c8a0bc3dc65151ff039d65eece2e185e01d9
-EBUILD gnuradio-3.7.9999.ebuild 7118 BLAKE2B a4e3ca07361a1ca4a8c62d15da6ac0e69c936a9fc813d2a0e65db115e9f9311ad37566694414384c97697b653ad6ccb4fbccdb300903bee244c6592573bd51ed SHA512 49ea88bc2da5dd1da4d8e0041d122c6a4ff782ab0267e7ab5ae3c1f68282a4e0a51369f4093c0c0f97c03f6b06a59ba3fdb489f0441e5d270b9ebee816de31e3
+EBUILD gnuradio-3.7.11-r3.ebuild 7041 BLAKE2B 9a40f508949f38e6c7672c624a68ba6cfc565e1fd9d61532ad5e530f203e0ab3c9c4fd84b4f70b5d4402950f71f915c2915e3d1d9819c65fdd2ddedc0487bc44 SHA512 fb7282d0f0a84000606c62a3979ae64a328442eda383314485b5f89767ed53120d7ecea151da6ed1b497d9af3a0f8338af8164330d142bb2790d87ed220d3648
+EBUILD gnuradio-3.7.9999.ebuild 7118 BLAKE2B c273e8e3b8711fc3b807524f960502e6c5d175711c71665ea050d470ca2c9d211b465031e3ea69f6c6bc73e6f7fc6d9a37213535f0ed1a8edc0a569609d03b69 SHA512 ea8da7a36fa73e27540b51818f5988f0c0b386ceecd8c5e8734d1ce0b0478fc6291cbdb4ca7ef6867dfa1c40ec451bd23eb132aaca1abcad66488edd38aad7fc
 EBUILD gnuradio-3.8.9999.ebuild 6667 BLAKE2B 2862df44998833ec1e2d19bcba050745e0815c3727af7f9af7c97476c3407f33211e7b65417001615a5d6178a89040d7827c053d9592751d950e2725f8f57bbc SHA512 9f900f81223c54847e30b669d89079c09da2e0f00bacf6baa624d52382dd2387e5558bd45d4ec44788264920232fe75055d42b08d03fd35cfd9ab0618e2926dc
-EBUILD gnuradio-9999.ebuild 7118 BLAKE2B a4e3ca07361a1ca4a8c62d15da6ac0e69c936a9fc813d2a0e65db115e9f9311ad37566694414384c97697b653ad6ccb4fbccdb300903bee244c6592573bd51ed SHA512 49ea88bc2da5dd1da4d8e0041d122c6a4ff782ab0267e7ab5ae3c1f68282a4e0a51369f4093c0c0f97c03f6b06a59ba3fdb489f0441e5d270b9ebee816de31e3
+EBUILD gnuradio-9999.ebuild 7118 BLAKE2B c273e8e3b8711fc3b807524f960502e6c5d175711c71665ea050d470ca2c9d211b465031e3ea69f6c6bc73e6f7fc6d9a37213535f0ed1a8edc0a569609d03b69 SHA512 ea8da7a36fa73e27540b51818f5988f0c0b386ceecd8c5e8734d1ce0b0478fc6291cbdb4ca7ef6867dfa1c40ec451bd23eb132aaca1abcad66488edd38aad7fc
 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
diff --git a/net-wireless/gnuradio/gnuradio-3.7.11-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r2.ebuild
deleted file mode 100644
index 6ffd07496ff3..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.11-r2.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="http://gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-#tests are entirely broken on newer gcc even with -fpermissive added to *FLAGS
-RESTRICT=test
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		audio? ( || ( alsa oss jack portaudio ) )
-		alsa? ( audio )
-		oss? ( audio )
-		jack? ( audio )
-		portaudio? ( audio )
-		analog? ( filter )
-		digital? ( filter analog )
-		dtv? ( fec )
-		pager? ( filter analog )
-		qt4? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib:=
-	)
-	fcd? ( virtual/libusb:1 )
-	filter? ( sci-libs/scipy )
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	qt4? (
-		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
-		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
-		>=dev-qt/qtcore-4.4:4
-		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6[qt4(+)]
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
-	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	vocoder? ( media-sound/gsm )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	wxwidgets? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	>=dev-lang/swig-3.0.5
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	grc? ( x11-misc/xdg-utils )
-	oss? ( virtual/os-headers )
-	test? ( >=dev-util/cppunit-1.9.14 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-src_prepare() {
-	gnome2_environment_reset #534582
-
-	epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	default
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
-	#audio provider is still automagic
-	#zeromq missing deps isn't fatal
-	#remaining QA issues, these appear broken:
-	#ENABLE_ENABLE_PERFORMANCE_COUNTERS
-	#ENABLE_GR_AUDIO_ALSA
-	#ENABLE_GR_AUDIO_JACK
-	#ENABLE_GR_AUDIO_OSS
-	#ENABLE_GR_AUDIO_PORTAUDIO
-	#ENABLE_GR_CORE
-	mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_VOLK=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_AUDIO=ON
-		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
-		-DENABLE_GR_ANALOG="$(usex analog)"
-		-DENABLE_GR_ATSC="$(usex atsc)"
-		-DENABLE_GR_CHANNELS="$(usex channels)"
-		-DENABLE_GR_DIGITAL="$(usex digital)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_SPHINX="$(usex doc)"
-		-DENABLE_GR_DTV="$(usex dtv)"
-		-DENABLE_GR_FCD="$(usex fcd)"
-		-DENABLE_GR_FEC="$(usex fec)"
-		-DENABLE_GR_FILTER="$(usex filter)"
-		-DENABLE_GRC="$(usex grc)"
-		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
-		-DENABLE_GR_LOG="$(usex log)"
-		-DENABLE_GR_NOAA="$(usex noaa)"
-		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
-		-DENABLE_GR_PAGER="$(usex pager)"
-		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
-		-DENABLE_TESTING="$(usex test)"
-		-DENABLE_GR_TRELLIS="$(usex trellis)"
-		-DENABLE_GR_UHD="$(usex uhd)"
-		-DENABLE_GR_UTILS="$(usex utils)"
-		-DENABLE_GR_VOCODER="$(usex vocoder)"
-		-DENABLE_GR_WAVELET="$(usex wavelet)"
-		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
-		-DENABLE_GR_QTGUI="$(usex qt4)"
-		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
-		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
-		-DENABLE_GR_CORE=ON
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	if use doc || use examples; then
-		#this doesn't appear useful
-		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/scripts/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
new file mode 100644
index 000000000000..92d9cdd94c3c
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="http://gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
+#tests are entirely broken on newer gcc even with -fpermissive added to *FLAGS
+RESTRICT=test
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+		audio? ( || ( alsa oss jack portaudio ) )
+		alsa? ( audio )
+		oss? ( audio )
+		jack? ( audio )
+		portaudio? ( audio )
+		analog? ( filter )
+		digital? ( filter analog )
+		dtv? ( fec )
+		pager? ( filter analog )
+		qt4? ( filter )
+		uhd? ( filter analog )
+		fcd? ( || ( alsa oss ) )
+		wavelet? ( analog )
+		wxwidgets? ( filter analog )"
+
+# bug #348206
+# comedi? ( >=sci-electronics/comedilib-0.8 )
+# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
+RDEPEND="${PYTHON_DEPS}
+	>=dev-lang/orc-0.4.12
+	dev-libs/boost:0=[${PYTHON_USEDEP}]
+	!<=dev-libs/boost-1.52.0-r6:0/1.52
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/fftw:3.0=
+	alsa? (
+		media-libs/alsa-lib:=
+	)
+	fcd? ( virtual/libusb:1 )
+	filter? ( sci-libs/scipy )
+	grc? (
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
+	)
+	jack? (
+		media-sound/jack-audio-connection-kit
+	)
+	log? ( dev-libs/log4cpp )
+	portaudio? (
+		>=media-libs/portaudio-19_pre
+	)
+	qt4? (
+		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
+		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
+		>=dev-qt/qtcore-4.4:4
+		>=dev-qt/qtgui-4.4:4
+		x11-libs/qwt:6[qt4(-)]
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
+	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	vocoder? ( media-sound/gsm )
+	wavelet? (
+		>=sci-libs/gsl-1.10
+	)
+	wxwidgets? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	)
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+	"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	>=dev-lang/swig-3.0.5
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+	gnome2_environment_reset #534582
+
+	epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+	# Useless UI element would require qt3support, bug #365019
+	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
+	default
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
+	#audio provider is still automagic
+	#zeromq missing deps isn't fatal
+	#remaining QA issues, these appear broken:
+	#ENABLE_ENABLE_PERFORMANCE_COUNTERS
+	#ENABLE_GR_AUDIO_ALSA
+	#ENABLE_GR_AUDIO_JACK
+	#ENABLE_GR_AUDIO_OSS
+	#ENABLE_GR_AUDIO_PORTAUDIO
+	#ENABLE_GR_CORE
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_VOLK=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_ATSC="$(usex atsc)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_SPHINX="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FCD="$(usex fcd)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
+		-DENABLE_GR_LOG="$(usex log)"
+		-DENABLE_GR_NOAA="$(usex noaa)"
+		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
+		-DENABLE_GR_PAGER="$(usex pager)"
+		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
+		-DENABLE_GR_QTGUI="$(usex qt4)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_GR_CORE=ON
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# We install the mimetypes to the correct locations from the ebuild
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+
+	python_fix_shebang "${ED}"
+}
+
+src_test()
+{
+	ctest -E qtgui
+}
+
+pkg_postinst()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+
+	if use grc ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
+				|| die "icon resource installation failed"
+			xdg-icon-resource install --noupdate --context apps --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
+				|| die "icon resource installation failed"
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
+
+pkg_postrm()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+
+	if use grc ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
+				application-gnuradio-grc || ewarn "icon uninstall failed"
+			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
+				gnuradio-grc || ewarn "icon uninstall failed"
+
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index 3d07d554355d..a9059f4080f2 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -75,7 +75,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
 		>=dev-qt/qtcore-4.4:4
 		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6[qt4(+)]
+		x11-libs/qwt:6[qt4(-)]
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 3d07d554355d..a9059f4080f2 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -75,7 +75,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
 		>=dev-qt/qtcore-4.4:4
 		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6[qt4(+)]
+		x11-libs/qwt:6[qt4(-)]
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index d2ff913fd6f7..4792cc0fb9d7 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,10 +1,6 @@
-DIST wireless-regdb-2016.05.02.tar.xz 16508 BLAKE2B 15017851a72c9fd8bd12b6154418c49e2d8f51d7b4e14beef0e4019af9d07f2af4c80102ed45e35b13af4a0730853f59847ba8b4ef962a6e6e62ecbdcfd11c29 SHA512 3a81b57430b934978be97a0532c1cd04fdcadd0528279b5fbd8723134f50e5f54ef0ddb4de74c4a397e51c6588b88714dff4cd37ebf059f02f15efed96f705ed
-DIST wireless-regdb-2016.06.10.tar.xz 16596 BLAKE2B ae7dcf2602f675929e6a74f9e5584454574a839c52dc0dbd3043d933dc112d773242fed69f4288b8446d403f6fd6407acc2686bc9131e0ec038438d14e5f01a4 SHA512 8064d18232924d86633df9e1195e9521f8f9ca0216f1e664591e3163d583085971b743b9fbbce196e650f239c231caebb7807c5019fcb409b950c6fbd8396f22
-DIST wireless-regdb-2017.03.07.tar.xz 16848 BLAKE2B 8db0fdf0aac1c1faf34ef69eae9abfd32e9cafb97e123fbd6bbbfffd430ab4f00a03a36a5ba6f4a4a9124799efb3067185ca34939d44ec586c228155e8ffcecc SHA512 91e2458feb5bf4d4b7d9008afd9c2d40b700d53cb898855f6278b93a7779aefeed283bfff2dd77b89bcbcc98c5e131f5187730356e5bba858d96774d610ab450
 DIST wireless-regdb-2017.12.23.tar.xz 21444 BLAKE2B 0fa2b2e998d255c574c810b1bd3cc142d8e33cab476f5be91977e55ee9cec092f53ebca742817b28377a446ed4839c9239117643f28e3d0937f05f18123e4514 SHA512 4169ad538939350c70ff2af719e66e1ef3b3bb8ccb71802d0de1c29629ca4c90a6c31ea764207cca63ed928847b0f6c6c561e3b73d5c41b3207da0008e2dc49e
-EBUILD wireless-regdb-20160502.ebuild 921 BLAKE2B a9440bdbc3c99eaef7a75444fad7a8594044e712cc0adff02db655324e87eb2953dfe23d7f8c8986501bfcd121bdd2038dca2a4f5eaa923922efabe8c0c29bb5 SHA512 a368f96429681ae0aa9b1110e5d11ed43948e01c38b99151d24e95913bf9ec2ee3a6252416330fa129c14058d58a01f82f9a4671b70d6073266a11fe16728693
-EBUILD wireless-regdb-20160610.ebuild 921 BLAKE2B a9440bdbc3c99eaef7a75444fad7a8594044e712cc0adff02db655324e87eb2953dfe23d7f8c8986501bfcd121bdd2038dca2a4f5eaa923922efabe8c0c29bb5 SHA512 a368f96429681ae0aa9b1110e5d11ed43948e01c38b99151d24e95913bf9ec2ee3a6252416330fa129c14058d58a01f82f9a4671b70d6073266a11fe16728693
-EBUILD wireless-regdb-20170307.ebuild 921 BLAKE2B cb0d44fca0b8cf7fb9d2a6a58917d046ccfb0bcbc7eae8866bfbec28a1023fa99cb857ab33e972cc8df9e41d06d3c1381234382038aba4aca28cf3a929909c6c SHA512 63a8a84b7378654a354ca7a68ef17a8cd1f27365d10324dae72479ac1df5d305a22ebb9de495837b4cadb52b18e10ed31b73eae35cdac8af663ee8941146ad67
+DIST wireless-regdb-2018.05.09.tar.xz 22768 BLAKE2B 6c384b2f1303013572b53380d23b38b00e3b87300897ec79a5dbb8de1d8e9f9b6c1302f19e306384141e894c3f8fbbca48fbc6c78d721979e0657a3d8156fb18 SHA512 37b20960e82f48d25b441d2656f09687d9f16a55ca18be56f805c0d6a689454e2ec372ccaecec201799e6610d8275c0556a1e249bb8758d8964908b3a78d6c41
 EBUILD wireless-regdb-20171223-r1.ebuild 1076 BLAKE2B 8637fc982f8ecb9b717fa7d3090facd20690190fa0d423fa0ca745a8de233de13170c575c5af696b840f7fff2f311d94d1a9b2eb87d81edc01cd693296835ed4 SHA512 5a14a0890ed1adc8ef76d08145dcc62aaa27c24521928c7b6db2bbc53741ee9fa3b8aba60b6f6691d74a052157d3a098d13190f9476acc056bedeedc96da7de6
 EBUILD wireless-regdb-20171223.ebuild 921 BLAKE2B b4468cb0bc864b8c78157eb706d94b2982f2cc33c6b458be6f760260da3cbad191cfabd94086e9840baf13e9655781791adec325059c85aa652ebdac867f1cec SHA512 aa24eda52c76c3a34b994aa5b8b16e4df05a1dd89af754141704b5a26ce16b25c63e17b70b1f357cdbbba5bf268ef082047c72a17d92490342c4fb84554238e2
+EBUILD wireless-regdb-20180509.ebuild 1076 BLAKE2B 8637fc982f8ecb9b717fa7d3090facd20690190fa0d423fa0ca745a8de233de13170c575c5af696b840f7fff2f311d94d1a9b2eb87d81edc01cd693296835ed4 SHA512 5a14a0890ed1adc8ef76d08145dcc62aaa27c24521928c7b6db2bbc53741ee9fa3b8aba60b6f6691d74a052157d3a098d13190f9476acc056bedeedc96da7de6
 MISC metadata.xml 457 BLAKE2B b9df8d376a76636ad2c8b8e78414889163936311a12421871a57d28c83c249da98a275b37a9b4a32ab979b194eb2ca000f34503dfe01a18c7c61e4044478ffd6 SHA512 0ee51061d82f0d81f263b479b1932666109450df0bf8c72faca8881f0417f2940245a0099ddc785526b95dcfffcc255de8a07f27356239781921dec10827c4bd
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20160502.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20160502.ebuild
deleted file mode 100644
index 78f4a5a33963..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20160502.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20160610.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20160610.ebuild
deleted file mode 100644
index 78f4a5a33963..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20160610.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20170307.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20170307.ebuild
deleted file mode 100644
index 2a733247c7ae..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20170307.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
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20180509.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20180509.ebuild
new file mode 100644
index 000000000000..23973a6371c7
--- /dev/null
+++ b/net-wireless/wireless-regdb/wireless-regdb-20180509.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
+DESCRIPTION="Binary regulatory database for CRDA"
+HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory"
+SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
+}
+
+src_install() {
+	# This file is not ABI-specific, and crda itself always hardcodes
+	# this path.  So install into a common location for all ABIs to use.
+	insinto /usr/lib/crda
+	doins regulatory.bin
+
+	insinto /etc/wireless-regdb/pubkeys
+	doins sforshee.key.pub.pem
+
+	# Linux 4.15 now complains if the firmware loader
+	# can't find these files #643520
+	insinto /lib/firmware
+	doins regulatory.db
+	doins regulatory.db.p7s
+
+	doman regulatory.bin.5
+	dodoc README db.txt
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index be5d0c64fd5a..607ad7554b21 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index c57fc9bfb4ad..2b07bcf07856 100644
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -21,7 +21,7 @@ LIBDIR_alpha="lib"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage tdfx voodoo"
+VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
 
 # 2007/02/05 - Chris Gianelloni <wolf31o2@gentoo.org>
 # Defaults for audio drivers. These are copied from x86 (minus modems), since
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index b9851f4fbe6a..a1b7280cd611 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -121,9 +121,6 @@ vpopmail
 # We don't have any virtual/mpi (bug 111807)
 mpi
 
-# Modular X: mask non-alpha cards
-video_cards_vesa
-
 # Matt Turner <mattst88@gentoo.org>
 # llvm is not keyworded
 video_cards_amdgpu
diff --git a/profiles/arch/amd64-fbsd/make.defaults b/profiles/arch/amd64-fbsd/make.defaults
index 6d49239ef0e1..f512d12af10d 100644
--- a/profiles/arch/amd64-fbsd/make.defaults
+++ b/profiles/arch/amd64-fbsd/make.defaults
@@ -21,9 +21,7 @@ LDFLAGS_x86_fbsd="-m elf_i386_fbsd -L/usr/lib32"
 
 CPU_FLAGS_X86="mmx mmxext sse sse2"
 
-VIDEO_CARDS="apm ark chips cirrus cyrix dummy i128 intel mach64 mga \
-	nv r128 radeon rendition s3 s3virge savage siliconmotion sis \
-	sisusb tga trident tseng via vmware"
+VIDEO_CARDS="dummy intel mga nv r128 radeon siliconmotion via vmware"
 
 # Vanilla FreeBSD has: lib for native 64 bits libs, lib32 for 32-bits emulation.
 # Let's do this too as this also happens to be more standard among other linux
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index f344a7da1c55..307f4ea24127 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -121,6 +121,7 @@
 -video_cards_intel
 -video_cards_nvidia
 -video_cards_siliconmotion
+-video_cards_vesa
 -video_cards_via
 -video_cards_virtualbox
 -video_cards_vmware
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 351716712a48..7efb190bb3b6 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -2,6 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Andreas Sturmlechner <asturm@gentoo.org> (07 May 2018)
+# Requires unstable dev-python/PyQt4
+media-sound/pulseaudio qt4
+
+# Andreas Sturmlechner <asturm@gentoo.org> (07 May 2018)
+# Requires not stabilised dev-python/restkit
+dev-python/wsgiproxy2 test
+dev-python/pyquery test
+
+# Andreas Sturmlechner <asturm@gentoo.org> (07 May 2018)
+# Requires not stabilised Qt5
+app-i18n/ibus kde
+dev-qt/qtchooser test
+
+# Andreas Sturmlechner <asturm@gentoo.org> (07 May 2018)
 # Requires not stabilised dev-python/matplotlib
 dev-python/numpydoc test
 dev-python/ipython matplotlib
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index ab0c94fb997e..b5359fbb5015 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -110,8 +110,6 @@ video_cards_nv
 video_cards_r128
 video_cards_radeon
 video_cards_tdfx
-video_cards_vesa
-video_cards_via
 video_cards_voodoo
 
 # Matt Turner <mattst88@gentoo.org>
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 478086fd0fa0..91c3f277d6b7 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (06 May 2018)
+# Not stable, bug #642822
+qt5
+
 # Brian Evans <grknight@gentoo.org> (16 Dec 2017)
 # Needs dev-lang/php:7.1 stable
 php_targets_php7-1
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index d296ac03f110..701fa0507204 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -211,8 +211,6 @@ video_cards_nv
 video_cards_r128
 video_cards_radeon
 video_cards_tdfx
-video_cards_vesa
-video_cards_via
 video_cards_voodoo
 
 # Matt Turner <mattst88@gentoo.org>
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 7545b9fc9f77..7b56f996c3ac 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -129,6 +129,7 @@ video_cards_i915
 video_cards_i965
 video_cards_intel
 video_cards_nvidia
+video_cards_vesa
 video_cards_via
 video_cards_vmware
 video_cards_virtualbox
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 3639d4ee5d8b..157329615fb7 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -234,7 +234,6 @@ video_cards_r600
 video_cards_radeon
 video_cards_radeonsi
 video_cards_tdfx
-video_cards_vesa
 video_cards_voodoo
 
 # 25 Jul 2005 Guy Martin <gmsoft@gentoo.org>
diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index 476c229a5a63..dbfa5efa2134 100644
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -21,7 +21,7 @@ CHOST_ia64="${CHOST}"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage tdfx vesa voodoo"
+VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
 
 # 2006/12/23 - Diego Pettenò <flameeyes@gentoo.org>
 # Defaults for audio drivers - Took from x86 profile
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index de834a719094..16cf105d8adf 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -152,10 +152,6 @@ video_cards_r300
 video_cards_r600
 video_cards_radeonsi
 
-# 2006/02/05 - Donnie Berkholz <dberkholz@gentoo.org>
-# Modular X: mask for architectures on which they aren't available
-video_cards_vesa
-
 # Diego Pettenò <flameeyes@gentoo.org>
 # Until xine-lib's keywording can be maintained, please leave it masked.
 xine
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 57c5d7770ef5..418e2b908510 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -15,7 +15,7 @@ FCFLAGS="${CFLAGS}"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage tdfx trident voodoo"
+VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
 
 # 2006/12/06 - Diego Pettenò <flameeyes@gentoo.org>
 # Defaults for PowerPC sound driver
diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index fe54e02e4ef5..7f43ef6c4888 100644
--- a/profiles/arch/powerpc/ppc64/make.defaults
+++ b/profiles/arch/powerpc/ppc64/make.defaults
@@ -35,7 +35,7 @@ IUSE_IMPLICIT="abi_ppc_64"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev mach64 mga nv r128 radeon vesa"
+VIDEO_CARDS="fbdev mga nv r128 radeon"
 
 # Enable abi_ppc_64 for packages that don't have it forced.
 ABI_PPC="64"
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index fc28c68580d2..9500eba21f4a 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -112,10 +112,6 @@ lcd_devices_stv5730
 # Both
 lcd_devices_t6963
 
-# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
-# Modular X: mask for architectures on which they aren't available
-video_cards_vesa
-
 # Intel Integrated Primitive (sci-libs/ipp) support
 ipp
 
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index d539fc4b5686..bf9dbcfa2b33 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -106,7 +106,6 @@ video_cards_r600
 video_cards_radeon
 video_cards_radeonsi
 video_cards_tdfx
-video_cards_vesa
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
 # virtual/opencl is not keyworded
diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask
index e95b7df40d7a..648703d97228 100644
--- a/profiles/arch/sh/use.mask
+++ b/profiles/arch/sh/use.mask
@@ -89,8 +89,6 @@ video_cards_nv
 video_cards_r128
 video_cards_radeon
 video_cards_tdfx
-video_cards_vesa
-video_cards_via
 video_cards_voodoo
 
 # Matt Turner <mattst88@gentoo.org>
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 0053c3734d92..daa11d4de6af 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -37,5 +37,4 @@ MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X1
 
 # 2006/10/05 - Gustavo Zacarias <gustavoz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mach64 mga r128 radeon sunbw2 suncg14 suncg3 \
-	suncg6 sunffb sunleo tdfx voodoo"
+VIDEO_CARDS="fbdev glint mga r128 radeon tdfx voodoo"
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 0fbf87849226..aa67ba2a5f99 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (08 May 2018)
+# Mask USE=games to avoid unkeyworded games-util/qstat.
+net-analyzer/monitoring-plugins game
+
 # Mart Raudsepp <leio@gentoo.org> (30 Mar 2018)
 # Mask USE=mp3 for media-plugins/gst-plugins-meta:1.0 since
 # media-plugins/gst-plugins-mpg123 is not keyworded (bug #635466)
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index d9033f513d31..55bb8b3a0bcf 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -17,6 +17,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (7 May 2018)
+# sci-visualization/gnuplot is not stable.
+app-admin/sysstat isag
+dev-util/ddd gnuplot
+sci-libs/libqalculate gnuplot
+sci-mathematics/octave gnuplot
+
 # Mart Raudsepp <leio@gentoo.org> (02 Sep 2017)
 # Drop stable gstreamer on sparc, can move to use.stable.mask
 # after gstreamer:0.10 is gone; #601354
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index df91e130720f..b67efceb34f9 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -184,7 +184,6 @@ hdf5
 # 2006/02/05 - Donnie Berkholz <dberkholz@gentoo.org>
 # Modular X: mask for architectures on which they aren't available
 video_cards_nv
-video_cards_vesa
 video_cards_nouveau
 
 # Matt Turner <mattst88@gentoo.org>
diff --git a/profiles/arch/x86-fbsd/make.defaults b/profiles/arch/x86-fbsd/make.defaults
index abf5cc1cad8a..85fb647de9b4 100644
--- a/profiles/arch/x86-fbsd/make.defaults
+++ b/profiles/arch/x86-fbsd/make.defaults
@@ -18,9 +18,7 @@ DEFAULT_ABI="x86_fbsd"
 ABI="x86_fbsd"
 LIBDIR_x86_fbsd="lib"
 
-VIDEO_CARDS="apm ark chips cirrus cyrix dummy i128 intel mach64 mga \
-	nv r128 radeon rendition s3 s3virge savage siliconmotion sis \
-	sisusb tga trident tseng via vmware"
+VIDEO_CARDS="dummy intel mga nv r128 radeon siliconmotion via vmware"
 
 # Unhide the CPU_FLAGS_X86 USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 61982cc07f41..348be1819f00 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -138,6 +138,7 @@
 -video_cards_siliconmotion
 -video_cards_vmware
 -video_cards_geode
+-video_cards_vesa
 -video_cards_via
 -video_cards_virtualbox
 -video_cards_qxl
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 5c26824c66cd..14e2eb45d763 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
+# Depends on obsolete dev-libs/sni-qt and dead Qt4.
+kde-plasma/plasma-desktop qt4
+
 # Mike Gilbert <floppym@gentoo.org> (01 May 2018)
 # Requires >=media-video/ffmpeg-4 (bug 654208).
 >=www-client/chromium-67 system-ffmpeg
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index f1326439248d..47c5a5b16a63 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (11 May 2018)
+# USE=doc uses non-BSD 'cp' syntax, bug #655444.
+>=dev-lang/nasm-2.13 doc
+
 # Fabian Groffen <grobian@gentoo.org> (07 Dec 2016)
 # unkeyworded notmuch dependency, bug #587560
 mail-client/mutt notmuch
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index 27aa02ac3c9c..d1411f9dbb9e 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -10,6 +10,8 @@ app-portage/layman python_targets_pypy python_targets_pypy3
 app-admin/webapp-config python_targets_pypy python_targets_pypy3
 app-portage/diffmask python_targets_pypy python_targets_pypy3
 app-portage/flaggie python_targets_pypy python_targets_pypy3
+app-portage/gentoopm python_targets_pypy python_targets_pypy3
+app-portage/gpyutils python_targets_pypy python_targets_pypy3
 
 # Jason Zaman <perfinion@gentoo.org> (27 Jun 2015)
 # SystemD has no support in the SELinux policy at the moment.
diff --git a/profiles/hardened/linux/powerpc/ppc64/use.mask b/profiles/hardened/linux/powerpc/ppc64/use.mask
index 0bef9ecd3c13..3abb7f43138f 100644
--- a/profiles/hardened/linux/powerpc/ppc64/use.mask
+++ b/profiles/hardened/linux/powerpc/ppc64/use.mask
@@ -19,11 +19,6 @@ portaudio
 mozilla
 seamonkey
 
-# 2006/03/20 - Donnie Berkholz <dberkholz@gentoo.org>
-# Modular X: mask for architectures on which they aren't available
-video_cards_vesa
-video_cards_via
-
 # Masked p2p for bug #155302 <josejx@gentoo.org>
 p2p
 
diff --git a/profiles/package.mask b/profiles/package.mask
index 9a9a1e3ceb72..829fc1d60887 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,111 @@
 
 #--- END OF EXAMPLES ---
 
+# Johannes Huber <johu@gentoo.org> (11 May 2018)
+# Masked for removal in 30 days (bug #655466). Fails to
+# fetch distfile (bug #655454). Access not existing
+# directories (bug #467128).Uses deprecated EAPI 2
+# (bug #648050).
+media-fonts/bitstream-cyberbit
+
+# Mikle Kolyada <zlogene@gentoo.org> (10 May 2018)
+# The upstream is totally dead (the last release is from 2006).
+# Does not compile against gcc-6, uses old EAPI=3 (#564998, #644262).
+# Use dev-libs/memcached istead. Removal in 30 days.
+dev-libs/libmemcache
+
+# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
+# Depends on dead Qt4. Masked for removal in 30 days.
+dev-python/pyside-tools
+
+# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
+# Depends on dead Qt4, newer versions do not provide a GUI.
+# Masked for removal, bug #649572
+<x11-misc/synergy-1.9.0
+
+# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
+# Depends on dead Qt4, does not build, needs someone to bump to Qt5.
+# Masked for removal in 30 days. Bugs #588892, #588898, #649656
+media-libs/libprojectm-qt
+media-sound/projectm-pulseaudio
+media-sound/projectm-jack
+
+# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
+# Depends on dead Qt4, no revdeps. Masked for removal in 30 days.
+dev-libs/sni-qt
+
+# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
+# Depends on dead Qt4, dead upstream.
+# Masked for removal in 30 days. Bugs #408651, #642950, #651622
+media-gfx/structure-synth
+
+# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
+# Depends on dead Qt4, dead upstream.
+# Masked for removal in 30 days. Bug #640258
+dev-util/valkyrie
+
+# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
+# Depends on dead Qt4, severely outdated, no one does the bump.
+# Masked for removal in 30 days. Bugs #489190, #648666
+media-gfx/ipe
+
+# Andreas Sturmlechner <asturm@gentoo.org> (8 May 2018)
+# Breaking consumers by internal header cleanup and removal of deprecated
+# qt5_use_modules from Qt5CoreMacros.cmake. File bugs with fixes upstream
+# and against the qt-5.11 tracker (bug #653646).
+~dev-qt/assistant-5.11.0_rc
+~dev-qt/designer-5.11.0_rc
+~dev-qt/linguist-5.11.0_rc
+~dev-qt/linguist-tools-5.11.0_rc
+~dev-qt/pixeltool-5.11.0_rc
+~dev-qt/qdbus-5.11.0_rc
+~dev-qt/qdbusviewer-5.11.0_rc
+~dev-qt/qdoc-5.11.0_rc
+~dev-qt/qt3d-5.11.0_rc
+~dev-qt/qtbluetooth-5.11.0_rc
+~dev-qt/qtcharts-5.11.0_rc
+~dev-qt/qtconcurrent-5.11.0_rc
+~dev-qt/qtcore-5.11.0_rc
+~dev-qt/qtdatavis3d-5.11.0_rc
+~dev-qt/qtdbus-5.11.0_rc
+~dev-qt/qtdeclarative-5.11.0_rc
+~dev-qt/qtdiag-5.11.0_rc
+~dev-qt/qtgraphicaleffects-5.11.0_rc
+~dev-qt/qtgui-5.11.0_rc
+~dev-qt/qthelp-5.11.0_rc
+~dev-qt/qtimageformats-5.11.0_rc
+~dev-qt/qtlocation-5.11.0_rc
+~dev-qt/qtmultimedia-5.11.0_rc
+~dev-qt/qtnetworkauth-5.11.0_rc
+~dev-qt/qtnetwork-5.11.0_rc
+~dev-qt/qtopengl-5.11.0_rc
+~dev-qt/qtpaths-5.11.0_rc
+~dev-qt/qtplugininfo-5.11.0_rc
+~dev-qt/qtpositioning-5.11.0_rc
+~dev-qt/qtprintsupport-5.11.0_rc
+~dev-qt/qtquickcontrols2-5.11.0_rc
+~dev-qt/qtquickcontrols-5.11.0_rc
+~dev-qt/qtscript-5.11.0_rc
+~dev-qt/qtscxml-5.11.0_rc
+~dev-qt/qtsensors-5.11.0_rc
+~dev-qt/qtserialbus-5.11.0_rc
+~dev-qt/qtserialport-5.11.0_rc
+~dev-qt/qtspeech-5.11.0_rc
+~dev-qt/qtsql-5.11.0_rc
+~dev-qt/qtsvg-5.11.0_rc
+~dev-qt/qttest-5.11.0_rc
+~dev-qt/qttranslations-5.11.0_rc
+~dev-qt/qtvirtualkeyboard-5.11.0_rc
+~dev-qt/qtwayland-5.11.0_rc
+~dev-qt/qtwebchannel-5.11.0_rc
+~dev-qt/qtwebengine-5.11.0_rc
+~dev-qt/qtwebsockets-5.11.0_rc
+~dev-qt/qtwebview-5.11.0_rc
+~dev-qt/qtwidgets-5.11.0_rc
+~dev-qt/qtx11extras-5.11.0_rc
+~dev-qt/qtxmlpatterns-5.11.0_rc
+~dev-qt/qtxml-5.11.0_rc
+
 # Hans de Graaff <graaff@gentoo.org> (7 May 2018)
 # Old slots that are ruby23-only and no longer maintained
 # upstream, and that do not have packages depend on them.
@@ -127,63 +232,6 @@ x11-libs/libXp
 # See: https://bugs.gentoo.org/653678
 >=media-video/ffmpeg-4.0
 
-# Andreas Sturmlechner <asturm@gentoo.org> (21 Apr 2018)
-# Breaking consumers by internal header cleanup and removal of deprecated
-# qt5_use_modules from Qt5CoreMacros.cmake. File bugs with fixes upstream
-# and against the qt-5.11 tracker (bug #653646).
-~dev-qt/assistant-5.11.0_beta4
-~dev-qt/designer-5.11.0_beta4
-~dev-qt/linguist-5.11.0_beta4
-~dev-qt/linguist-tools-5.11.0_beta4
-~dev-qt/pixeltool-5.11.0_beta4
-~dev-qt/qdbus-5.11.0_beta4
-~dev-qt/qdbusviewer-5.11.0_beta4
-~dev-qt/qdoc-5.11.0_beta4
-~dev-qt/qt3d-5.11.0_beta4
-~dev-qt/qtbluetooth-5.11.0_beta4
-~dev-qt/qtcharts-5.11.0_beta4
-~dev-qt/qtconcurrent-5.11.0_beta4
-~dev-qt/qtcore-5.11.0_beta4
-~dev-qt/qtdatavis3d-5.11.0_beta4
-~dev-qt/qtdbus-5.11.0_beta4
-~dev-qt/qtdeclarative-5.11.0_beta4
-~dev-qt/qtdiag-5.11.0_beta4
-~dev-qt/qtgraphicaleffects-5.11.0_beta4
-~dev-qt/qtgui-5.11.0_beta4
-~dev-qt/qthelp-5.11.0_beta4
-~dev-qt/qtimageformats-5.11.0_beta4
-~dev-qt/qtlocation-5.11.0_beta4
-~dev-qt/qtmultimedia-5.11.0_beta4
-~dev-qt/qtnetworkauth-5.11.0_beta4
-~dev-qt/qtnetwork-5.11.0_beta4
-~dev-qt/qtopengl-5.11.0_beta4
-~dev-qt/qtpaths-5.11.0_beta4
-~dev-qt/qtplugininfo-5.11.0_beta4
-~dev-qt/qtpositioning-5.11.0_beta4
-~dev-qt/qtprintsupport-5.11.0_beta4
-~dev-qt/qtquickcontrols2-5.11.0_beta4
-~dev-qt/qtquickcontrols-5.11.0_beta4
-~dev-qt/qtscript-5.11.0_beta4
-~dev-qt/qtscxml-5.11.0_beta4
-~dev-qt/qtsensors-5.11.0_beta4
-~dev-qt/qtserialbus-5.11.0_beta4
-~dev-qt/qtserialport-5.11.0_beta4
-~dev-qt/qtspeech-5.11.0_beta4
-~dev-qt/qtsql-5.11.0_beta4
-~dev-qt/qtsvg-5.11.0_beta4
-~dev-qt/qttest-5.11.0_beta4
-~dev-qt/qttranslations-5.11.0_beta4
-~dev-qt/qtvirtualkeyboard-5.11.0_beta4
-~dev-qt/qtwayland-5.11.0_beta4
-~dev-qt/qtwebchannel-5.11.0_beta4
-~dev-qt/qtwebengine-5.11.0_beta4
-~dev-qt/qtwebsockets-5.11.0_beta4
-~dev-qt/qtwebview-5.11.0_beta4
-~dev-qt/qtwidgets-5.11.0_beta4
-~dev-qt/qtx11extras-5.11.0_beta4
-~dev-qt/qtxmlpatterns-5.11.0_beta4
-~dev-qt/qtxml-5.11.0_beta4
-
 # Brian Evans <grknight@gentoo.org> (20 Apr 2018)
 # Likely to break a lot of software
 # Masked for initial testing
@@ -195,11 +243,6 @@ x11-libs/libXp
 # See tracker bug #653464
 >=app-text/poppler-0.64.0
 
-# Andreas Sturmlechner <asturm@gentoo.org> (10 Apr 2018)
-# Depends on dead Qt4. Switch to media-gfx/scantailor-advanced instead.
-# Masked for removal in 30 days. Bug #633386
-media-gfx/scantailor
-
 # Jason Zaman <perfinion@gentoo.org> (08 Apr 2018)
 # Dead upstream, for an old version of Xfce
 # Masked for removal in 30 days.
@@ -280,6 +323,7 @@ media-plugins/gst-plugins-mad:1.0
 # Sebastian Pipping <sping@gentoo.org> (11 Mar 2018)
 # Breaks XFCE, 1.19.6 was fine (in that regard). Bug #650228
 >=x11-base/xorg-server-1.19.7
+>=x11-base/xorg-drivers-1.20
 
 # Tim Harder <radhermit@gentoo.org> (01 Mar 2018)
 # Masked for testing.
@@ -478,6 +522,10 @@ app-xemacs/xemacs-packages-all
 # versions of gjs.  Will unmask when gnome-3.26 is ready for testing
 # or when upstream releases an official tarball.
 dev-lang/spidermonkey:52
+# Lars Wendler <polynomial-c@gentoo.org> (09 May 2018)
+# Depends on masked spidermonkey:52.
+# Please remove both masks together.
+>=sys-auth/polkit-0.114
 
 # Nicolas Bock <nicolasbock@gentoo.org> (17 Jul 2017)
 # Keep shotwell development series masked.
@@ -540,8 +588,8 @@ net-wireless/cpyrit-cuda
 # Bernard Cafarelli <voyageur@gentoo.org> (8 May 2017)
 # Coordinated conversion to wxGTK:3.0-gtk3
 # Drop mask after migration of existing wxGTK:3.0 users
-=net-ftp/filezilla-3.30.0-r300
 =net-ftp/filezilla-3.31.0-r300
+=net-ftp/filezilla-3.33.0-r300
 =dev-util/codeblocks-17.12-r300
 
 # Mart Raudsepp <leio@gentoo.org> (16 Feb 2017)
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 7d4b5781c883..5c5d06c7d969 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -108,9 +108,9 @@ arm64           default/linux/arm64/17.0/systemd                dev
 
 # HPPA Profiles
 # @MAINTAINER: hppa@gentoo.org
-hppa            default/linux/hppa/13.0                         stable
-hppa            default/linux/hppa/13.0/desktop                 dev
-hppa            default/linux/hppa/13.0/developer               dev
+hppa            default/linux/hppa/13.0                         exp
+hppa            default/linux/hppa/13.0/desktop                 exp
+hppa            default/linux/hppa/13.0/developer               exp
 hppa            default/linux/hppa/17.0                         exp
 hppa            default/linux/hppa/17.0/desktop                 exp
 hppa            default/linux/hppa/17.0/developer               exp
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index c8c0df37a1ae..8cdca896fc69 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -3,28 +3,28 @@ alsaproject	ftp://ftp.alsa-project.org/pub
 apache		http://apache.lauf-forum.at/ http://apache.mirror.digionline.de/ http://apache.mirror.iphh.net/ http://artfiles.org/apache.org/ http://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ http://ftp.fau.de/apache/ http://ftp.halifax.rwth-aachen.de/apache/ http://ftp.heikorichter.name/apache/ http://mirror.23media.de/apache/ http://apache.mirrors.hoobly.com/ http://www.gtlib.gatech.edu/pub/apache/ http://apache.osuosl.org/
 cpan		http://cpan.metacpan.org http://search.cpan.org/CPAN http://www.cpan.org
 cran		http://cran.r-project.org http://cran.us.r-project.org
-debian		http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.kr.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/
+debian		http://deb.debian.org/debian/ http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.kr.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/
 fedora-dev	http://archives.fedoraproject.org/pub/archive/fedora/linux/
-freebsd		http://ftp.freebsd.org/pub/FreeBSD/
-gentoo		http://gentoo.osuosl.org/distfiles http://ftp.halifax.rwth-aachen.de/gentoo/distfiles http://gentoo-distfiles.mirrors.tds.net/distfiles http://gentoo.ussg.indiana.edu/distfiles
+freebsd		https://download.freebsd.org/ftp/
+gentoo		https://gentoo.osuosl.org/distfiles https://ftp.halifax.rwth-aachen.de/gentoo/distfiles http://gentoo-distfiles.mirrors.tds.net/distfiles http://gentoo.ussg.indiana.edu/distfiles
 gimp		https://ftp.fau.de/gimp/gimp/ ftp://ftp.fau.de/gimp/gimp/ http://artfiles.org/gimp.org/pub/gimp/ http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ http://pirbot.com/mirrors/gimp/gimp/
 github		https://github.com/downloads
 gmt		ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.iag.usp.br/pub/gmt/ ftp://ftp.geologi.uio.no/pub/gmt/ ftp://ftp.star.nesdis.noaa.gov/pub/sod/lsa/gmt
 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/
+gnu		https://ftpmirror.gnu.org/https://ftpmirror.gnu.org/ https://artfiles.org/gnu.org/ https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/
+gnu-alpha	https://www.mirrorservice.org/sites/alpha.gnu.org/gnu/ https://gnualpha.uib.no/ https://mirrors.fe.up.pt/pub/gnu-alpha/ http://alpha.gnu.org/gnu/ http://www.nic.funet.fi/pub/gnu/alpha/gnu/ http://mirror.lihnidos.org/GNU/alpha/gnu/ http://mirrors.ibiblio.org/gnu/alpha/gnu/ ftp://ftp.funet.fi/pub/gnu/alpha/gnu/ ftp://gnualpha.uib.no/pub/gnualpha/ ftp://mirrors.fe.up.pt/pub/gnu-alpha/ ftp://alpha.gnu.org/gnu/
+gnupg		https://artfiles.org/gnupg.org/ https://www.mirrorservice.org/sites/ftp.gnupg.org/ https://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ https://mirrors.dotsrc.org/gcrypt/ ftp://ftp.gnupg.org/gcrypt/
 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
+imagemagick	https://www.imagemagick.org/download/ https://mirror.checkdomain.de/imagemagick/ https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/ https://ftp.nluug.nl/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
-kernel		http://www.kernel.org/pub
+kernel		https://www.kernel.org/pub
 lokigames	http://updates.lokigames.com
 mplayer		http://www1.mplayerhq.hu/MPlayer http://www2.mplayerhq.hu/MPlayer http://www5.mplayerhq.hu/MPlayer http://www7.mplayerhq.hu/MPlayer http://www8.mplayerhq.hu/MPlayer ftp://ftp1.mplayerhq.hu/MPlayer/ ftp://ftp6.mplayerhq.hu/MPlayer/ ftp://ftp7.mplayerhq.hu/MPlayer/ ftp://ftp8.mplayerhq.hu/MPlayer/
-mysql		http://gd.tuwien.ac.at/db/mysql/ ftp://gd.tuwien.ac.at/db/mysql/ http://mysql.mirror.kangaroot.net/ ftp://mysql.mirror.kangaroot.net/pub/mysql/ http://mysql.blic.net/ http://mysql.online.bg/ ftp://mysql.online.bg/ http://mysql.linux.cz/ ftp://ftp.fi.muni.cz/pub/mysql/ http://mirrors.dotsrc.org/mysql/ ftp://mirrors.dotsrc.org/mysql/ http://mirrors.ircam.fr/pub/mysql/ ftp://mirrors.ircam.fr/pub/mysql/ http://sunsite.informatik.rwth-aachen.de/mysql/ ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/ http://ftp.gwdg.de/pub/misc/mysql/ ftp://ftp.gwdg.de/pub/misc/mysql/ ftp://ftp.fu-berlin.de/unix/databases/mysql/ http://mysql.mirrors.ovh.net/ftp.mysql.com/ ftp://mysql.mirrors.ovh.net/ftp.mysql.com/ http://ftp.ntua.gr/pub/databases/mysql/ ftp://ftp.ntua.gr/pub/databases/mysql/ http://mysql.mirrors.crysys.hit.bme.hu/ ftp://ftp.crysys.hu/pub/mysql/ http://ftp.heanet.ie/mirrors/www.mysql.com/ ftp://ftp.heanet.ie/mirrors/www.mysql.com/ http://na.mirror.garr.it/mirrors/MySQL/ ftp://na.mirror.garr.it/mirrors/MySQL/ http://mirror.leaseweb.com/mysql/ ftp://mirror.leaseweb.com/mysql/ http://sunsite.icm.edu.pl/mysql/ ftp://sunsite.icm.edu.pl/pub/unix/mysql/ http://mysql.nfsi.pt/ ftp://ftp.nfsi.pt/pub/mysql/ http://mirrors.xservers.ro/mysql/ http://ftp.arnes.si/mysql/ ftp://ftp.arnes.si/packages/mysql/ http://ftp.sunet.se/pub/unix/databases/relational/mysql/ ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/ http://mirror.switch.ch/ftp/mirror/mysql/ ftp://mirror.switch.ch/mirror/mysql/ http://ftp.itu.edu.tr/Mirror/Mysql/ ftp://ftp.itu.edu.tr/Mirror/Mysql/ http://www.mirrorservice.org/sites/ftp.mysql.com/ ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/ http://mirrors.dedipower.com/www.mysql.com/ http://mirrors.ukfast.co.uk/sites/ftp.mysql.com/ ftp://mirrors.ukfast.co.uk/ftp.mysql.com/ http://mirror.csclub.uwaterloo.ca/mysql/ ftp://mirror.csclub.uwaterloo.ca/mysql/ http://mysql.mirror.rafal.ca/ ftp://mysql.mirror.rafal.ca/pub/mysql/ http://opensource.become.com/mysql/ http://mysql.mirrors.hoobly.com/ http://mysql.he.net/ http://mirror.trouble-free.net/mysql_mirror/ http://mysql.llarian.net/ ftp://mysql.llarian.net/pub/mysql ftp://mirror.anl.gov/pub/mysql/ http://mysql.mirrors.pair.com/ ftp://ftp.linorg.usp.br/mysql/ http://linorg.usp.br/mysql ftp://linorg.usp.br/mysql http://mysql.mirrors.arminco.com/ http://mysql.spd.co.il/ http://ftp.iij.ad.jp/pub/db/mysql/ ftp://ftp.iij.ad.jp/pub/db/mysql/ http://ftp.jaist.ac.jp/pub/mysql/ ftp://ftp.jaist.ac.jp/pub/mysql/ http://mysql.cdpa.nsysu.edu.tw/ ftp://mysql.cdpa.nsysu.edu.tw/Unix/Database/MySQL/ http://mysql.mirrors.ilisys.com.au/ http://mysql.inspire.net.nz/ ftp://mysql.inspire.net.nz/mysql/
+mysql		https://artfiles.org/mysql/ https://www.mirrorservice.org/sites/ftp.mysql.com/ https://ftp.gwdg.de/pub/misc/mysql/ https://ftp.jaist.ac.jp/pub/mysql/ http://mysql.he.net/ http://mysql.mirrors.ovh.net/ftp.mysql.com/ http://mirror.switch.ch/ftp/mirror/mysql/ http://vesta.informatik.rwth-aachen.de/mysql/ http://ftp.ntua.gr/pub/databases/mysql/ http://mysql.linux.cz/ http://linorg.usp.br/mysql/
 nongnu		http://download.savannah.nongnu.org/releases/ http://ftp.cc.uoc.gr/mirrors/nongnu.org/ http://ftp.twaren.net/Unix/NonGNU/ http://mirror.csclub.uwaterloo.ca/nongnu/ ftp://mirror.csclub.uwaterloo.ca/nongnu/ http://mirrors.fe.up.pt/pub/nongnu/ ftp://mirrors.fe.up.pt/pub/nongnu/ http://nongnu.askapache.com/ http://nongnu.uib.no/ ftp://nongnu.uib.no/pub/nongnu/ http://savannah.c3sl.ufpr.br/ ftp://savannah.c3sl.ufpr.br/savannah-nongnu/ ftp://ftp.twaren.net/Unix/NonGNU/
 openbsd		https://mirrors.evowise.com/pub/OpenBSD/
-openssl		ftp://ftp.openssl.org ftp://ftp.linux.hr/pub/openssl/ http://artfiles.org/openssl.org/ ftp://ftp.pca.dfn.de/pub/tools/net/openssl/ ftp://guest.kuria.katowice.pl/pub/openssl/ ftp://ftp.fi.muni.cz/pub/openssl/ http://openssl.skazkaforyou.com/
+openssl		https://artfiles.org/openssl.org/ https://www.mirrorservice.org/sites/ftp.openssl.org/ ftp://ftp.openssl.org
 opera		ftp://ftp.opera.com/pub/opera ftp://ftp.tu-cottbus.de/pub/net/opera ftp://ftp.task.gda.pl/pub/opera ftp://ftp.ntua.gr/pub/www/Opera ftp://ftp.rediris.es/mirror/opera ftp://ftp.heanet.ie/pub/opera
 postgresql	https://ftp.postgresql.org/pub/
 pypi		https://pypi.org/packages/source https://files.pythonhosted.org/packages/source
@@ -35,7 +35,7 @@ ruby		https://cache.ruby-lang.org/pub/ruby/ ftp://ftp.fu-berlin.de/unix/language
 samba		https://download.samba.org/pub/samba/ ftp://ftp.samba.gr.jp/pub/samba http://ftp.cc.uoc.gr/mirrors/samba
 sabayon         http://sabayon.c3sl.ufpr.br/distfiles http://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/distfiles http://ftp.rnl.ist.utl.pt/pub/sabayon/distfiles http://ftp.fsn.hu/pub/linux/distributions/sabayon/distfiles http://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/distfiles http://cross-lfs.sabayonlinux.org/distfiles http://sabayon.mirror.dkm.cz/pub/sabayon/distfiles http://mirror.internode.on.net/pub/sabayon/distfiles http://na.mirror.garr.it/mirrors/sabayonlinux/distfiles http://distfiles.sabayon.org
 snobol4		ftp://ftp.snobol4.org/snobol/old/
-sourceforge	http://download.sourceforge.net
+sourceforge	https://download.sourceforge.net
 sourceforge.jp	http://iij.dl.sourceforge.jp http://osdn.dl.sourceforge.jp http://globalbase.dl.sourceforge.jp http://jaist.dl.sourceforge.jp
 ubuntu		http://mirror.internode.on.net/pub/ubuntu/ubuntu/ http://mirror.tcc.wa.edu.au/ubuntu/ http://ubuntu.uni-klu.ac.at/ubuntu/ http://mirror.dhakacom.com/ubuntu-archive/ http://ubuntu.c3sl.ufpr.br/ubuntu/ http://ubuntu.uni-sofia.bg/ubuntu/ http://hr.archive.ubuntu.com/ubuntu/ http://cz.archive.ubuntu.com/ubuntu/ http://archive.ubuntu.mirror.dkm.cz/ http://ftp.cvut.cz/ubuntu/ http://wwwftp.ciril.fr/pub/linux/ubuntu/archives/ http://ftp.stw-bonn.de/ubuntu/ http://ftp-stud.hs-esslingen.de/ubuntu/ http://mirror.netcologne.de/ubuntu/ http://mirror.unej.ac.id/ubuntu/ http://mirror.network32.net/ubuntu/ http://kr.archive.ubuntu.com/ubuntu/ http://mirror.nforce.com/pub/linux/ubuntu/ http://mirror.amsiohosting.net/archive.ubuntu.com/ http://nl3.archive.ubuntu.com/ubuntu/ http://mirror.timeweb.ru/ubuntu/ http://ubuntu.mirror.su.se/ubuntu/ http://free.nchc.org.tw/ubuntu/ http://ftp.yzu.edu.tw/ubuntu/ http://mirror.aptus.co.tz/pub/ubuntuarchive/ http://ubuntu.volia.net/ubuntu-archive/ http://mirror.sax.uk.as61049.net/ubuntu/ http://mirror.pnl.gov/ubuntu/ http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/ http://mirrors.namecheap.com/ubuntu/
 vdr-developerorg http://projects.vdr-developer.org/attachments/download
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 840ab42affd3..11ad638288e4 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2468,8 +2468,6 @@ dev-python/PyQt5:xmlpatterns - Build bindings for the QtXmlPatterns module
 dev-python/PythonQt:extensions - Install extensions
 dev-python/QtPy:designer - Build bindings for the QtDesigner module and enable the designer plugin
 dev-python/QtPy:gui - Build bindings for the QtGui module
-dev-python/QtPy:pyqt5 - Enable the dev-python/PyQt5 backend
-dev-python/QtPy:pyside - Enable the dev-python/pyside backend
 dev-python/QtPy:svg - Build bindings for the QtSvg module
 dev-python/QtPy:testlib - Build bindings for the QtTest module
 dev-python/QtPy:webengine - Build bindings for the QtWebEngine module
@@ -2542,10 +2540,7 @@ dev-python/netaddr:cli - Enable netaddr shell with dev-python/ipython
 dev-python/networkx:scipy - Enables scipy backend
 dev-python/nltk:numpy - Use numpy for the saved word tokenizer
 dev-python/numexpr:mkl - Enable support for Intel Vector Math Library, part of sci-libs/mkl.
-dev-python/pandas:R - Enable support for R via dev-python/rpy
-dev-python/pandas:excel - Pull a few Python packages for Microsoft Excel i/o
 dev-python/pandas:full-support - Pull all packages to give pandas full support
-dev-python/pandas:html - Enable HTML i/o via dev-python/beautifulsoup
 dev-python/passlib:bcrypt - bcrpyt hash algoryptm support
 dev-python/passlib:scrypt - accelerated scrypt algoythm support
 dev-python/passlib:totp - time based one time password support
@@ -2583,8 +2578,6 @@ dev-python/pyside:xmlpatterns - Build QtXmlPatterns module
 dev-python/python-caja:gtk3 - Build with GTK+3 instead of GTK+2
 dev-python/python-stdnum:vies - Enable VIES
 dev-python/pyudev:pygobject - Install PyGobject bindings
-dev-python/pyudev:pyside - Install PySide bindings
-dev-python/pyudev:qt4 - Install PyQt4 bindings
 dev-python/pyudev:qt5 - Install PyQt5 bindings
 dev-python/pyyaml:libyaml - enable support for C implementation using libyaml
 dev-python/pyzor:gdbm - Enables the Gdbm back-end database engine for pyzord
@@ -2752,7 +2745,6 @@ dev-qt/qtwebengine:widgets - Enable QtWidgets support
 dev-qt/qtwebkit:geolocation - Enable physical position determination via dev-qt/qtpositioning
 dev-qt/qtwebkit:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-qt/qtwebkit:gstreamer - Enable HTML5 audio/video support via media-libs/gstreamer using SLOT 1.0
-dev-qt/qtwebkit:gstreamer010 - Enable HTML5 audio/video support via media-libs/gstreamer using SLOT 0.10
 dev-qt/qtwebkit:multimedia - Enable HTML5 audio/video support via dev-qt/qtmultimedia
 dev-qt/qtwebkit:orientation - Enable device orientation detection via dev-qt/qtsensors
 dev-qt/qtwebkit:printsupport - Enable printing via dev-qt/qtprintsupport
@@ -3440,8 +3432,10 @@ kde-apps/kate:addons - Build and install additional plugins
 kde-apps/kde-apps-meta:pim - Pull in KDE PIM suite
 kde-apps/kde-apps-meta:sdk - Pull in developer-specific meta-packages
 kde-apps/kdeadmin-meta:cron - Installs KDE application for virtual/cron configuration
+kde-apps/kdeedu-meta:webengine - Enable kde-apps/kalzium and kde-apps/parley, requiring dev-qt/qtwebengine
 kde-apps/kdegraphics-mobipocket:thumbnail - Enables thumbnail generation
 kde-apps/kdemultimedia-meta:cdrom - Include packages for optical discs
+kde-apps/kdenetwork-meta:telepathy - Enable support for Plasma Telepathy (instant messaging) integration via kde-apps/plasma-telepathy-meta
 kde-apps/kdenlive:freesound - Enable freesound.org credentials support via dev-qt/qtwebkit to download files
 kde-apps/kdenlive:gles2 - Use GLES 2.0 or later instead of full OpenGL
 kde-apps/kdenlive:jogshuttle - Enable support for Jog-Shuttle devices
@@ -3462,6 +3456,7 @@ kde-apps/kio-extras:sftp - Enable SFTP protocol support using net-libs/libssh
 kde-apps/kmag:keyboardfocus - Enable keyboard focus tracking
 kde-apps/konqueror:activities - Enable kactivities support
 kde-apps/konqueror:speech - Build text-to-speech plugin
+kde-apps/konqueror:webengine - Enable dev-qt/qtwebengine as web browser engine (fallback is kde-misc/kwebkitpart)
 kde-apps/kopete:addbookmarks - Automatically add incoming urls to bookmarks.
 kde-apps/kopete:autoreplace - Automatically replace selected text
 kde-apps/kopete:contactnotes - Enables writing personal notes for contacts.
@@ -3584,7 +3579,6 @@ kde-plasma/plasma-workspace:appstream - Enable AppStream software metadata suppo
 kde-plasma/plasma-workspace:geolocation - Enables dataengine providing location information
 kde-plasma/plasma-workspace:prison - Enable support for barcodes/QRcodes
 kde-plasma/plasma-workspace:qalculate - Enable Qalculate runner using sci-libs/libqalculate
-kde-plasma/powerdevil:brightness-control - Enable screen brightness control using app-misc/ddcutil
 kde-plasma/powerdevil:consolekit - Enable sys-auth/consolekit support instead of logind session tracking
 kde-plasma/powerdevil:wireless - Enable wireless energy saving actions via kde-frameworks/bluez-qt and kde-frameworks/networkmanager-qt
 kde-plasma/systemsettings:classic - Enable classic mode plugin, requires kde-frameworks/khtml
@@ -4572,6 +4566,7 @@ media-sound/mangler:espeak - Text to speech engine
 media-sound/mangler:g15 - Logitech g15 lcd support
 media-sound/mangler:opus - Codec specialized for speech over the internet
 media-sound/mixxx:hid - Enable HID controller support
+media-sound/mixxx:opus - Enable support for opus codec via media-libs/opusfile.
 media-sound/mixxx:shout - Enable broadcasting support via media-libs/libshout
 media-sound/moc:cache - Enable tags caching support
 media-sound/moc:magic - Use libmagic to determine mimetypes
@@ -4712,8 +4707,7 @@ media-sound/supercollider:gpl3 - Build GPL-3 licensed code (recommended)
 media-sound/supercollider:server - Build with internal server
 media-sound/supercollider:vim - Enable the SCVIM user interface
 media-sound/supercollider:wiimote - Build sclang with Wii Remote support
-media-sound/teamspeak-server-bin:doc - Install TeamSpeak complete documentation.
-media-sound/teamspeak-server-bin:tsdns - Install TeamSpeak DNS.
+media-sound/teamspeak-server-bin:tsdns - Install TeamSpeaks own DNS service.
 media-sound/tomahawk:hatchet - Enable support for the synchronisation through Hatchet
 media-sound/tomahawk:telepathy - Enable support for the real-time communication framework telepathy
 media-sound/traverso:lv2 - Add support for Ladspa V2
@@ -5730,6 +5724,8 @@ net-im/kadu:otr - Enable char encryption via OTR library
 net-im/kadu:phonon - Enables phonon audio plugin
 net-im/kadu:sdk - Install Kadu SDK (cmake module, API headers)
 net-im/kadu:speech - Enables speech module
+net-im/libcommuni:qml - Install optional qml files.
+net-im/libcommuni:uchardet - Use app-i18n/uchardet, which is upstreams default, instead of dev-libs/icu, which makes impossible to run tests.
 net-im/mcabber:aspell - Adds support for app-text/aspell spell checker.
 net-im/mcabber:otr - Enable encrypted conversations using Off-The-Records messaging
 net-im/pidgin:gadu - Enable Gadu Gadu protocol support
@@ -8589,6 +8585,7 @@ x11-base/xorg-server:xephyr - Build the Xephyr server
 x11-base/xorg-server:xnest - Build the Xnest server
 x11-base/xorg-server:xorg - Build the Xorg X server (HIGHLY RECOMMENDED)
 x11-base/xorg-server:xvfb - Build the Xvfb server
+x11-base/xorg-x11:fonts - Install fonts from X.Org
 x11-drivers/nvidia-drivers:X - Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries
 x11-drivers/nvidia-drivers:compat - Install non-GLVND libGL for backwards compatibility
 x11-drivers/nvidia-drivers:driver - Install the kernel driver module
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 14863a7b1936..39bf5f25e8bd 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/audio_common/Manifest b/ros-meta/audio_common/Manifest
index 8dc09df4c46c..baa94019168f 100644
--- a/ros-meta/audio_common/Manifest
+++ b/ros-meta/audio_common/Manifest
@@ -1,16 +1,6 @@
-DIST audio_common-0.2.10.tar.gz 182304 BLAKE2B a47d8c8a1a8257ef81724f39a9f3c09f32360af20fb3070c6e20943ecac7fa8a98c9a0d38e0bdceccbc283eb6b8a44d5cc658049180661e65fec1b36d072c833 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b
-DIST audio_common-0.2.11.tar.gz 182449 BLAKE2B b2fb69866476016452ec28381f03f378e79593d9e18e15604a96efe8a4ae3a3ff1ffdd71271a1d7230e92eb91a3fd5b16137302946dacf7422841fe46bc00ed0 SHA512 01ff1aaca6568ef0683501f0bf9ed6b451beddec5c2fc01362f91ba466bcea318fe1e998bde1424d824fa1f39922a2a397d5990d774478e355b6781cbbd7ea72
-DIST audio_common-0.2.12.tar.gz 182493 BLAKE2B cb45be6fb8879ef8de3305de14f40a7c7a06b8c645476290a335ba72810b9c79fa78a08217f56579cb17341befa3b4b6a18b0a95a41a4ecbda11469ba2825552 SHA512 0d0b4814ad58e34ed0c605425f648c7bc2bc43e57ff2b44b23862bfc6f8ad3381b7aac2fb365b5c8194248ce769a33d5dd01ddd0add87303ce3fd6fcfd63f267
-DIST audio_common-0.2.7.tar.gz 173982 BLAKE2B 3ba57b3d4767899871cf66f7f06a79f2b989d5943835eb97bcac1772febbd64896182748f3a37217ed2d6579c3db0da67f3093f99a9a17e0e13378f8453f0d5b SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3
-DIST audio_common-0.2.8.tar.gz 175497 BLAKE2B 53a2f9b1cb383112c3b8297ab3f1ed8340e50999bfd0f90d28f9914625031b25f9a606920192ae5209d45e4b1eef6aac15b567ff2fcc25182073d11c42355366 SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706
-DIST audio_common-0.2.9.tar.gz 182112 BLAKE2B 788be43714d4063ea0442dcc80fbdff2c55cb2f0a7811ebfa1b7140f3eba78ca8a8161c0b9ef4d35f009f75a33239f64ae26d1b626a3e72c7b9de9d15f21c360 SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a
 DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
-EBUILD audio_common-0.2.10.ebuild 445 BLAKE2B 29102438426520b303d050239c1e99849d1d144db61ffad6cc0cda90eadb69c7c377696248f60072ee505b02c2f1503df301f35d1968a6268047656accaa8aaf SHA512 08cf87d7e7fa9011bb2f96abaff0672c8908d15780ba9e31fe7c43c396c7ddf064060c85b896be9d5dd13da95f80d05cc4cf93b37b735d790f960f9d46c503eb
-EBUILD audio_common-0.2.11.ebuild 445 BLAKE2B 29102438426520b303d050239c1e99849d1d144db61ffad6cc0cda90eadb69c7c377696248f60072ee505b02c2f1503df301f35d1968a6268047656accaa8aaf SHA512 08cf87d7e7fa9011bb2f96abaff0672c8908d15780ba9e31fe7c43c396c7ddf064060c85b896be9d5dd13da95f80d05cc4cf93b37b735d790f960f9d46c503eb
-EBUILD audio_common-0.2.12.ebuild 445 BLAKE2B 29102438426520b303d050239c1e99849d1d144db61ffad6cc0cda90eadb69c7c377696248f60072ee505b02c2f1503df301f35d1968a6268047656accaa8aaf SHA512 08cf87d7e7fa9011bb2f96abaff0672c8908d15780ba9e31fe7c43c396c7ddf064060c85b896be9d5dd13da95f80d05cc4cf93b37b735d790f960f9d46c503eb
-EBUILD audio_common-0.2.7.ebuild 445 BLAKE2B 29102438426520b303d050239c1e99849d1d144db61ffad6cc0cda90eadb69c7c377696248f60072ee505b02c2f1503df301f35d1968a6268047656accaa8aaf SHA512 08cf87d7e7fa9011bb2f96abaff0672c8908d15780ba9e31fe7c43c396c7ddf064060c85b896be9d5dd13da95f80d05cc4cf93b37b735d790f960f9d46c503eb
-EBUILD audio_common-0.2.8.ebuild 445 BLAKE2B 29102438426520b303d050239c1e99849d1d144db61ffad6cc0cda90eadb69c7c377696248f60072ee505b02c2f1503df301f35d1968a6268047656accaa8aaf SHA512 08cf87d7e7fa9011bb2f96abaff0672c8908d15780ba9e31fe7c43c396c7ddf064060c85b896be9d5dd13da95f80d05cc4cf93b37b735d790f960f9d46c503eb
-EBUILD audio_common-0.2.9.ebuild 445 BLAKE2B 29102438426520b303d050239c1e99849d1d144db61ffad6cc0cda90eadb69c7c377696248f60072ee505b02c2f1503df301f35d1968a6268047656accaa8aaf SHA512 08cf87d7e7fa9011bb2f96abaff0672c8908d15780ba9e31fe7c43c396c7ddf064060c85b896be9d5dd13da95f80d05cc4cf93b37b735d790f960f9d46c503eb
+DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
 EBUILD audio_common-0.3.1.ebuild 445 BLAKE2B c5d2309725f5be1d4f3a8ff93b85ae4314294a16ba938173d7300841ae37566b73998329b2b0725a0893cde72eb65e332286b28e27c692d89a5d38183983b735 SHA512 a935365402497017e18f8d3076d95410f8548934226eb3a1356ba4676bc2fceb6dbc8a9e9b5ff22ef973ad3d62d0aa630ce828fcf4755939784b66ddd9df15e7
+EBUILD audio_common-0.3.2.ebuild 445 BLAKE2B fbd3db94de88e4a4dbd29c2de6712055c2c98f740ece29ffff014ec7dd5d35b6c3938a0a32bd93142498f6a968780a047adb7f3e048feda886a1d50f3a32b96b SHA512 9f66a6664f8f668f2075e1addb695b1497535a20629b70d318924478b773122c7e1296646f55c231ae64c9b75e4ef580091ff37fbbfa94c257e6ddbb6fb4957e
 EBUILD audio_common-9999.ebuild 445 BLAKE2B 29102438426520b303d050239c1e99849d1d144db61ffad6cc0cda90eadb69c7c377696248f60072ee505b02c2f1503df301f35d1968a6268047656accaa8aaf SHA512 08cf87d7e7fa9011bb2f96abaff0672c8908d15780ba9e31fe7c43c396c7ddf064060c85b896be9d5dd13da95f80d05cc4cf93b37b735d790f960f9d46c503eb
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/ros-meta/audio_common/audio_common-0.2.10.ebuild b/ros-meta/audio_common/audio_common-0.2.10.ebuild
deleted file mode 100644
index 3961f5718b5c..000000000000
--- a/ros-meta/audio_common/audio_common-0.2.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common code for working with audio in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/audio_capture
-	dev-ros/audio_common_msgs
-	dev-ros/audio_play
-	dev-ros/sound_play
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/audio_common/audio_common-0.2.11.ebuild b/ros-meta/audio_common/audio_common-0.2.11.ebuild
deleted file mode 100644
index 3961f5718b5c..000000000000
--- a/ros-meta/audio_common/audio_common-0.2.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common code for working with audio in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/audio_capture
-	dev-ros/audio_common_msgs
-	dev-ros/audio_play
-	dev-ros/sound_play
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/audio_common/audio_common-0.2.12.ebuild b/ros-meta/audio_common/audio_common-0.2.12.ebuild
deleted file mode 100644
index 3961f5718b5c..000000000000
--- a/ros-meta/audio_common/audio_common-0.2.12.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common code for working with audio in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/audio_capture
-	dev-ros/audio_common_msgs
-	dev-ros/audio_play
-	dev-ros/sound_play
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/audio_common/audio_common-0.2.7.ebuild b/ros-meta/audio_common/audio_common-0.2.7.ebuild
deleted file mode 100644
index 3961f5718b5c..000000000000
--- a/ros-meta/audio_common/audio_common-0.2.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common code for working with audio in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/audio_capture
-	dev-ros/audio_common_msgs
-	dev-ros/audio_play
-	dev-ros/sound_play
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/audio_common/audio_common-0.2.8.ebuild b/ros-meta/audio_common/audio_common-0.2.8.ebuild
deleted file mode 100644
index 3961f5718b5c..000000000000
--- a/ros-meta/audio_common/audio_common-0.2.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common code for working with audio in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/audio_capture
-	dev-ros/audio_common_msgs
-	dev-ros/audio_play
-	dev-ros/sound_play
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/audio_common/audio_common-0.2.9.ebuild b/ros-meta/audio_common/audio_common-0.2.9.ebuild
deleted file mode 100644
index 3961f5718b5c..000000000000
--- a/ros-meta/audio_common/audio_common-0.2.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common code for working with audio in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/audio_capture
-	dev-ros/audio_common_msgs
-	dev-ros/audio_play
-	dev-ros/sound_play
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/audio_common/audio_common-0.3.2.ebuild b/ros-meta/audio_common/audio_common-0.3.2.ebuild
new file mode 100644
index 000000000000..7b04768cb702
--- /dev/null
+++ b/ros-meta/audio_common/audio_common-0.3.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common code for working with audio in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/audio_capture
+	dev-ros/audio_common_msgs
+	dev-ros/audio_play
+	dev-ros/sound_play
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/diagnostics/Manifest b/ros-meta/diagnostics/Manifest
index ee8e58314aef..5325eb548fc5 100644
--- a/ros-meta/diagnostics/Manifest
+++ b/ros-meta/diagnostics/Manifest
@@ -3,10 +3,12 @@ DIST diagnostics-1.8.8.tar.gz 508404 BLAKE2B 9bf90d268ac23d0007133ddc5f2ac0d6ba4
 DIST diagnostics-1.8.9.tar.gz 525881 BLAKE2B 6de75f5fa961da199daab1a6ae1c2b34b0edbd70c09e58f7384c76f9dd0c3a51cc8b0f20688dbdcafe164ade3a0e3bdc894064cc269f6b8fb0e31faa6f4d9654 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80
 DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
 DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
+DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
 EBUILD diagnostics-1.8.10.ebuild 569 BLAKE2B 47025f98f1a9c4552dc967a4d613391e8a6503361bfe50fb2720c190b29dc7172a2d4e629d0e4f4f9b1e026cd7bb5c3e7bae94960a89c907231e1ac23800feed SHA512 ba6dde552100b37a396c318c1c5a15f7cac1dd616cbf92f03632c40decb9daf0863761382293f421f7a787355b7274ae089f3263661cc91bc1eafedd915e2d48
 EBUILD diagnostics-1.8.8.ebuild 569 BLAKE2B 389a2a63b6d012917956493e85a3f929f72248877dbcfb59a079a74a46c80673ed8c13d0ab961a2e5556277c0e916ebcc3a6b971bba4dcbb15c5d1dac4d789c1 SHA512 28737fa918f226a6e24d8130aa1360b0628ca08632fb9b540a1829c814354ebe4b38372a82e71d5103436abcb2a117b7b44be52fdc7a5b220a1b024098e361e5
 EBUILD diagnostics-1.8.9.ebuild 569 BLAKE2B 389a2a63b6d012917956493e85a3f929f72248877dbcfb59a079a74a46c80673ed8c13d0ab961a2e5556277c0e916ebcc3a6b971bba4dcbb15c5d1dac4d789c1 SHA512 28737fa918f226a6e24d8130aa1360b0628ca08632fb9b540a1829c814354ebe4b38372a82e71d5103436abcb2a117b7b44be52fdc7a5b220a1b024098e361e5
 EBUILD diagnostics-1.9.0.ebuild 592 BLAKE2B 55e330b9057e5d2878b82c327c83b6322dfcf66e1fdab13b4da66fe880f6ffa8f8070b66a1b5b5114af9f9b16a90eb02cce9fb7286f0960dd374eb59c2b2aadc SHA512 fc9660d9f93fdb9d214f779d42d8cefb01e7525119a774b7804ea8c7509249476a627f5bd9501511db927c27ca2ee6f316ecfbb2a2e21af884c3ecc4a75ebd59
 EBUILD diagnostics-1.9.2.ebuild 592 BLAKE2B 55e330b9057e5d2878b82c327c83b6322dfcf66e1fdab13b4da66fe880f6ffa8f8070b66a1b5b5114af9f9b16a90eb02cce9fb7286f0960dd374eb59c2b2aadc SHA512 fc9660d9f93fdb9d214f779d42d8cefb01e7525119a774b7804ea8c7509249476a627f5bd9501511db927c27ca2ee6f316ecfbb2a2e21af884c3ecc4a75ebd59
+EBUILD diagnostics-1.9.3.ebuild 592 BLAKE2B b89f82ecfd14a2b2812b099619eaa15b843bc4487d6c3d9ae9b7f945244520c33b8252f6b2c47ebf2b9b05be8cf0b2a9878a9dd57f456d67f6b55a62daee4558 SHA512 1fa61769d3d05c5768c1623e53b84af04f8be1adfed25753cd23f4d55d9e449db823351bcd96d2705b9ae0fa60aaafef68cdc20bfbb832d2a550eb20db65ae19
 EBUILD diagnostics-9999.ebuild 592 BLAKE2B 55e330b9057e5d2878b82c327c83b6322dfcf66e1fdab13b4da66fe880f6ffa8f8070b66a1b5b5114af9f9b16a90eb02cce9fb7286f0960dd374eb59c2b2aadc SHA512 fc9660d9f93fdb9d214f779d42d8cefb01e7525119a774b7804ea8c7509249476a627f5bd9501511db927c27ca2ee6f316ecfbb2a2e21af884c3ecc4a75ebd59
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/ros-meta/diagnostics/diagnostics-1.9.3.ebuild b/ros-meta/diagnostics/diagnostics-1.9.3.ebuild
new file mode 100644
index 000000000000..1fe9aeabc105
--- /dev/null
+++ b/ros-meta/diagnostics/diagnostics-1.9.3.ebuild
@@ -0,0 +1,25 @@
+# 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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Packages related to gathering, viewing, and analyzing diagnostics data from robots"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_aggregator
+	dev-ros/diagnostic_analysis
+	dev-ros/diagnostic_common_diagnostics
+	dev-ros/diagnostic_updater
+	dev-ros/rosdiagnostic
+	dev-ros/self_test
+	dev-ros/test_diagnostic_aggregator
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/perception_pcl/Manifest b/ros-meta/perception_pcl/Manifest
index 4746dc3cfc65..6ebb88f147a3 100644
--- a/ros-meta/perception_pcl/Manifest
+++ b/ros-meta/perception_pcl/Manifest
@@ -1,16 +1,6 @@
-DIST perception_pcl-1.3.0.tar.gz 66060 BLAKE2B c685b60a62e86b1d535168260f6ffc454ad8f2756b187161458316f2970555b4ae4cc628683d6ca4eca90beefffcf532a94cd95c4ff0b5afc0ab986e24c6c4db SHA512 203fcc2c1d71bfd6890c4e5664b29404bea666f277eee88d4725766bc21fb7aac3aced467be2f3352e3c172a7175ab8c4124d5652dad03d6a7b661748ec94175
-DIST perception_pcl-1.4.0.tar.gz 66252 BLAKE2B 3f432a131118cc269fb3286d52dd0215c494da60cc2df2f78e2374078e25ee6f6c3b2f31e018ea7d0869f417b0a7dce441542f1152df77e8b542a5d78f1d72fd SHA512 aae295245305a518d9dc5b9175fdfc8e69a5132dbef1ecbe951736a110a4353076d823574dcfc0cbb3666ff2a3fc269b614b7d22562316a3ed97554b8bcf263a
-DIST perception_pcl-1.4.1.tar.gz 66440 BLAKE2B 9670227e66b42c36a63de282eb015efe60de3f97ddb07e482b25df79e77980997d5bdf62a6f1c39fd09d52545f0324d7083ae298fed211056cbebded6f18db42 SHA512 550300f1bd7bb718371b9725f9d48f4337e6d7175bdfc4a8a116a17da24609a363c804f11224efde6c9f62a6cca648425872017e9a90371a34f808c305f50f50
-DIST perception_pcl-1.5.1.tar.gz 66945 BLAKE2B a4ba43188386a39e5d73d0b4b67833ce1f6a6c6ce2e3912d743aae755116f2e5f6cc78ca9ea0d11b5e7ab5f07591872eca2df668e746df3dd0f9a79acc4554f4 SHA512 d7fd77e8afeccd45226404c57a267af19b0c98cb61123bdb1b1330fc3833b6bc1a72e775a3eba6a6f8df212af23328894617cf45a4c028278ef408a1d0ef74ce
-DIST perception_pcl-1.5.2.tar.gz 67004 BLAKE2B 6193ca81637df71c6e990d70425cc23b7284a756dc96d341ed5f9fc25d1404747dccc0a24d9de08428d7bec43bb13874619b70f57ef7fe35fbc72aeb0954dc77 SHA512 503f46d71dbf58e985422c6f31c3491189dbd9494bc68221026721dc889a34633be867b20f8b5cc8bec77f500cb4133061be1eb1775afd2a4edcdac13cb629f5
-DIST perception_pcl-1.5.3.tar.gz 67101 BLAKE2B 963d65d348068e574fd0d7431597409d607e779f017b3a645b1add5599baeed559898e5a9873d6b3ead6ea812cfda80b96f9ccfea482801b3c76d17bf234c26b SHA512 e34089f48cfe40f0209a7d4a3a0fb2402c1d1fc35bdf7a57970374bcec50185efcbb1e56b08ee64810a43e83fdf7e45ecddd09ff9660b47399b9f751be80df8b
 DIST perception_pcl-1.5.4.tar.gz 73829 BLAKE2B cfc6e964691da42717d134e0b639ef4af4491074de171a84d081bf66c061a51b7c2da750ff539dd784a7a4c34cfdfe18d7d2e38c4e6d0370fbc441f9b3a6196d SHA512 e9da9b2f9b602b67bceec9b0adf515b500d77c9e5c2dbdc1f63bf5a91419bbf7f9f41d602646b8197dffcf7a077b63eb402a507dbc6bb96405a8f4d64576e36e
-EBUILD perception_pcl-1.3.0.ebuild 381 BLAKE2B f6cca2b63dae4491d472fad5dc5dd354da8e36cf458bb51a9d80c09cb1f5e33e15207e72535b66b1924a6d2060ce593d6577acc61d4d66dcffad95ae9179bd67 SHA512 cda3607ca11a9f6731a4852fb9cf126ab87cfe2e819407ea2775321fd9a9dacf4bc01c586bd532b3dbe798cf2852ac33a301d4c043efeb68d103bdd528b41ebc
-EBUILD perception_pcl-1.4.0.ebuild 381 BLAKE2B f6cca2b63dae4491d472fad5dc5dd354da8e36cf458bb51a9d80c09cb1f5e33e15207e72535b66b1924a6d2060ce593d6577acc61d4d66dcffad95ae9179bd67 SHA512 cda3607ca11a9f6731a4852fb9cf126ab87cfe2e819407ea2775321fd9a9dacf4bc01c586bd532b3dbe798cf2852ac33a301d4c043efeb68d103bdd528b41ebc
-EBUILD perception_pcl-1.4.1.ebuild 381 BLAKE2B f6cca2b63dae4491d472fad5dc5dd354da8e36cf458bb51a9d80c09cb1f5e33e15207e72535b66b1924a6d2060ce593d6577acc61d4d66dcffad95ae9179bd67 SHA512 cda3607ca11a9f6731a4852fb9cf126ab87cfe2e819407ea2775321fd9a9dacf4bc01c586bd532b3dbe798cf2852ac33a301d4c043efeb68d103bdd528b41ebc
-EBUILD perception_pcl-1.5.1.ebuild 381 BLAKE2B 527415132369cf09251a5ea14121c50e2c9e1484d0fecdfb9329dec3ad8738d2f487155716d5ea2ade758346b713597d4a2d4844d97ba5e95411a31efca6afce SHA512 c5a71bad50fb9a8ea8c8488e54e75702399d1cd838006f3553d9e07e916ee1ac28ee6ccfc50608be148b17e724e02c7103142f1f06a5f996212fa7e4d61e1fa5
-EBUILD perception_pcl-1.5.2.ebuild 381 BLAKE2B 527415132369cf09251a5ea14121c50e2c9e1484d0fecdfb9329dec3ad8738d2f487155716d5ea2ade758346b713597d4a2d4844d97ba5e95411a31efca6afce SHA512 c5a71bad50fb9a8ea8c8488e54e75702399d1cd838006f3553d9e07e916ee1ac28ee6ccfc50608be148b17e724e02c7103142f1f06a5f996212fa7e4d61e1fa5
-EBUILD perception_pcl-1.5.3.ebuild 381 BLAKE2B 527415132369cf09251a5ea14121c50e2c9e1484d0fecdfb9329dec3ad8738d2f487155716d5ea2ade758346b713597d4a2d4844d97ba5e95411a31efca6afce SHA512 c5a71bad50fb9a8ea8c8488e54e75702399d1cd838006f3553d9e07e916ee1ac28ee6ccfc50608be148b17e724e02c7103142f1f06a5f996212fa7e4d61e1fa5
+DIST perception_pcl-1.6.1.tar.gz 82552 BLAKE2B a442c9df193e38b6aca9e45ec3a469d6603bc2c909fc8c33ad612b2b6448956863555608cb0a0102593e2e71aa7f54ae88b677c2bfbde7df23b114ff4ca83c8f SHA512 c0b63833dd12f3eee5f5ec1e5d8f8bd9c001f1f1787572717a0845fa9a18862bb49a134638f9f0bde5587ac26ab8fd9e6534fcd5ed6b69842780a6fd3762fb5c
 EBUILD perception_pcl-1.5.4.ebuild 381 BLAKE2B 3713f9a5fdd6a88a3bf7f6bdfba2d03bae31601fc38812ccba4c7414a8899e059a78211038ecb055b1899c89b0fc2ed056b2d2d9eca3f951227ec998c007c818 SHA512 320691fce86bc1e045d54216fcb7200ed341ce416364f70f2920259675e92d4f8d2cde9879dd2774a93fde24891ea481e257afcd85b43bb0cba14e5f46565809
-EBUILD perception_pcl-9999.ebuild 381 BLAKE2B f6cca2b63dae4491d472fad5dc5dd354da8e36cf458bb51a9d80c09cb1f5e33e15207e72535b66b1924a6d2060ce593d6577acc61d4d66dcffad95ae9179bd67 SHA512 cda3607ca11a9f6731a4852fb9cf126ab87cfe2e819407ea2775321fd9a9dacf4bc01c586bd532b3dbe798cf2852ac33a301d4c043efeb68d103bdd528b41ebc
+EBUILD perception_pcl-1.6.1.ebuild 406 BLAKE2B 60b7e102147421e44251bd0d991b6b7a687ed35dbdbd25fbd71a36a9c48255bee137061804208dee4a6e939cdfb8e95050541549b7aed56b0393e17c5407a49e SHA512 d8e93b0da589104eaa755287405568ac764ea49427c3d947c4f432d8e60695e54b5d09d7be552bf5fd04fae8cef342cfab4363330941b0bbf869ae00f56d2731
+EBUILD perception_pcl-9999.ebuild 406 BLAKE2B 60b7e102147421e44251bd0d991b6b7a687ed35dbdbd25fbd71a36a9c48255bee137061804208dee4a6e939cdfb8e95050541549b7aed56b0393e17c5407a49e SHA512 d8e93b0da589104eaa755287405568ac764ea49427c3d947c4f432d8e60695e54b5d09d7be552bf5fd04fae8cef342cfab4363330941b0bbf869ae00f56d2731
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/ros-meta/perception_pcl/perception_pcl-1.3.0.ebuild b/ros-meta/perception_pcl/perception_pcl-1.3.0.ebuild
deleted file mode 100644
index 58129f4dcde5..000000000000
--- a/ros-meta/perception_pcl/perception_pcl-1.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pcl_ros
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/perception_pcl/perception_pcl-1.4.0.ebuild b/ros-meta/perception_pcl/perception_pcl-1.4.0.ebuild
deleted file mode 100644
index 58129f4dcde5..000000000000
--- a/ros-meta/perception_pcl/perception_pcl-1.4.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pcl_ros
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/perception_pcl/perception_pcl-1.4.1.ebuild b/ros-meta/perception_pcl/perception_pcl-1.4.1.ebuild
deleted file mode 100644
index 58129f4dcde5..000000000000
--- a/ros-meta/perception_pcl/perception_pcl-1.4.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pcl_ros
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/perception_pcl/perception_pcl-1.5.1.ebuild b/ros-meta/perception_pcl/perception_pcl-1.5.1.ebuild
deleted file mode 100644
index 29e3769bac4a..000000000000
--- a/ros-meta/perception_pcl/perception_pcl-1.5.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pcl_ros
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/perception_pcl/perception_pcl-1.5.2.ebuild b/ros-meta/perception_pcl/perception_pcl-1.5.2.ebuild
deleted file mode 100644
index 29e3769bac4a..000000000000
--- a/ros-meta/perception_pcl/perception_pcl-1.5.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pcl_ros
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/perception_pcl/perception_pcl-1.5.3.ebuild b/ros-meta/perception_pcl/perception_pcl-1.5.3.ebuild
deleted file mode 100644
index 29e3769bac4a..000000000000
--- a/ros-meta/perception_pcl/perception_pcl-1.5.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pcl_ros
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/perception_pcl/perception_pcl-1.6.1.ebuild b/ros-meta/perception_pcl/perception_pcl-1.6.1.ebuild
new file mode 100644
index 000000000000..7d954d9b1638
--- /dev/null
+++ b/ros-meta/perception_pcl/perception_pcl-1.6.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/pcl_conversions
+	dev-ros/pcl_ros
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/perception_pcl/perception_pcl-9999.ebuild b/ros-meta/perception_pcl/perception_pcl-9999.ebuild
index 58129f4dcde5..7d954d9b1638 100644
--- a/ros-meta/perception_pcl/perception_pcl-9999.ebuild
+++ b/ros-meta/perception_pcl/perception_pcl-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/pcl_conversions
 	dev-ros/pcl_ros
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros/Manifest b/ros-meta/ros/Manifest
index f3f4f5886b30..b22514340b5b 100644
--- a/ros-meta/ros/Manifest
+++ b/ros-meta/ros/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
 DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
+DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
 EBUILD ros-1.14.1.ebuild 490 BLAKE2B f2d6840d640d28029dbe1f1c5e8a36643220df53e5e72231e6279f38cd7204a73c2a7ff1280e5365c303429aab192c73e16537db7639f3a809542ff071567aa3 SHA512 3c631a67215eb0cbc202e2edc48d8d48df3c3be0488de6efa5c6081fb1bcbcc776c5c21361c79645d5d1cb2c302c29d2f22b0f4d5a59aea909370ecbda7fc541
 EBUILD ros-1.14.2.ebuild 490 BLAKE2B f2d6840d640d28029dbe1f1c5e8a36643220df53e5e72231e6279f38cd7204a73c2a7ff1280e5365c303429aab192c73e16537db7639f3a809542ff071567aa3 SHA512 3c631a67215eb0cbc202e2edc48d8d48df3c3be0488de6efa5c6081fb1bcbcc776c5c21361c79645d5d1cb2c302c29d2f22b0f4d5a59aea909370ecbda7fc541
 EBUILD ros-1.14.3.ebuild 490 BLAKE2B 9f1ba678e74b3486bea7a366b4c87389006cbead0a8ce1c810bf40b8882bb20c66fcae94f2168db77da44d7a7ce1a1d6ec9bd083cc80de94faa8feda633311d6 SHA512 12ac0448b3702c92f35e6cbc6c0aa6d1f7415d84c424c48d3af5224392e0c1bd4ef7f81289210142fb6443942412df2e3263e8934a65b25cf56271657e8d464d
+EBUILD ros-1.14.4.ebuild 490 BLAKE2B 9f1ba678e74b3486bea7a366b4c87389006cbead0a8ce1c810bf40b8882bb20c66fcae94f2168db77da44d7a7ce1a1d6ec9bd083cc80de94faa8feda633311d6 SHA512 12ac0448b3702c92f35e6cbc6c0aa6d1f7415d84c424c48d3af5224392e0c1bd4ef7f81289210142fb6443942412df2e3263e8934a65b25cf56271657e8d464d
 EBUILD ros-9999.ebuild 490 BLAKE2B 7a5ab1e6b901bd181f35a3d767926451a8195d53f651e3a893479c12b3664e8b17ebf02f0528f10b6681a3c75d18916ab6338629a1707611d8bf81496099cc33 SHA512 8fd338361276575ca5ba022691922780d9f44528bbeea1bbc0a838bb556883e473be3176fe70d24ee4e8a7d91ac311b0e45d00b7dbb5db79ae2838a1d69153a5
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/ros-meta/ros/ros-1.14.4.ebuild b/ros-meta/ros/ros-1.14.4.ebuild
new file mode 100644
index 000000000000..8380a767a4d6
--- /dev/null
+++ b/ros-meta/ros/ros-1.14.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=ros
+
+inherit ros-catkin
+
+DESCRIPTION="ROS packaging system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbash
+	dev-ros/rosboost_cfg
+	dev-ros/rosclean
+	dev-ros/roscreate
+	dev-ros/rosmake
+	dev-ros/rosunit
+
+	dev-ros/mk
+	dev-ros/rosbuild
+	dev-ros/roslang
+	dev-ros/roslib
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/roscpp_core/Manifest b/ros-meta/roscpp_core/Manifest
index aaf42a1aa82a..b5eac3349a5c 100644
--- a/ros-meta/roscpp_core/Manifest
+++ b/ros-meta/roscpp_core/Manifest
@@ -1,7 +1,9 @@
+DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
 DIST roscpp_core-0.6.5.tar.gz 34493 BLAKE2B 9804fe6f23192e0e19bfb26e0671ad36189b936701e45755adb0c54e25c1c92dabd6f645bd014451bcd21f45af39be2f1c24727d1231cc52b62caba4d01ca4ff SHA512 32314cac55716b074416fac6665a8dec3a6a64abfac55be709f50b7ca1cbd993797d176bc2aefe2ae8b233b21e8464f330ad31de98bf60edc63149215dcb0cda
 DIST roscpp_core-0.6.7.tar.gz 34845 BLAKE2B cdb2385069a74d670061bc2245421e31216e1c9ace5c96f83d1875ddcf460f2ad425b10db3330253e2a49f3bc415cf3c72ab885cb121c9477ae54a385893a7b8 SHA512 d93afb6e0e88bb01b13af0334a7977411fac8f89dd06fc69a32b95bab4ead05d6cb564b089ee846fe542be180f6418664f8328a6a9e753a55b34e5a0a1d61bf4
 DIST roscpp_core-0.6.8.tar.gz 35003 BLAKE2B 7b4c02652693f76326df83d17164d3268f8b0eda0ddfe8f73d286ae09d7fbb3f8f433ab92527167fb918b55c53aeaa4e26d6876dac51d9d35e0b18b185d89867 SHA512 5fa9f8714059fbc864583662cd411d64470565cc2c372a09a63708a8cc06140d2ce8b84a7025837a49f2c09c7fee5092ec42d5625de4bfd2d9410baf7821b5df
 DIST roscpp_core-0.6.9.tar.gz 35069 BLAKE2B 5718611730419de3fd5dbd7c26792857c75306f4155916fe9570e494a0b1f0b9ca167a06654e1d5b1e1d20aa8cbd17c306bc91e7d0e803c8691d78c6c456fcec SHA512 87360695e71a020e869633c19187851242b84686b87842b388273f9874ff72e4e587eaf55dc10d099e55bc8db17c2ae7efdd5a9ff553a006b7f7c4ea5e1c84d9
+EBUILD roscpp_core-0.6.10.ebuild 440 BLAKE2B 16b8ee7e778c936f50e9996be7d84bc2e0fcce5c289526bd33e510068b41c2299b539bbfa6e11cba26fc69744ffb80ec0b9e6049c54a4d3949d271c5862e4957 SHA512 56acc7d239994e0c1a194654ea7aff3808117de03ced59b11b5429059b0b51edc0c078483c83d7ac4a9363e0d87fd842e2516d4c3cffc70107ed7fe8245816d4
 EBUILD roscpp_core-0.6.5.ebuild 440 BLAKE2B eaeba100a8cba2364642381c5d16a0db8d591aab78f876f1d88cb127bf55d2760f3d58c2a87eb6f165ce5a5a9557f2413905491aca3284f254be666f51db9a7f SHA512 c19160c6021835790eae06c6d5f18e4a05b78e1a46bfc01c8dc0b03aac901c09751491f0fa54fc3fb7df13b5810d8a01fb14a4ecb8b296be6de95c1b8a36f075
 EBUILD roscpp_core-0.6.7.ebuild 440 BLAKE2B eaeba100a8cba2364642381c5d16a0db8d591aab78f876f1d88cb127bf55d2760f3d58c2a87eb6f165ce5a5a9557f2413905491aca3284f254be666f51db9a7f SHA512 c19160c6021835790eae06c6d5f18e4a05b78e1a46bfc01c8dc0b03aac901c09751491f0fa54fc3fb7df13b5810d8a01fb14a4ecb8b296be6de95c1b8a36f075
 EBUILD roscpp_core-0.6.8.ebuild 440 BLAKE2B 16b8ee7e778c936f50e9996be7d84bc2e0fcce5c289526bd33e510068b41c2299b539bbfa6e11cba26fc69744ffb80ec0b9e6049c54a4d3949d271c5862e4957 SHA512 56acc7d239994e0c1a194654ea7aff3808117de03ced59b11b5429059b0b51edc0c078483c83d7ac4a9363e0d87fd842e2516d4c3cffc70107ed7fe8245816d4
diff --git a/ros-meta/roscpp_core/roscpp_core-0.6.10.ebuild b/ros-meta/roscpp_core/roscpp_core-0.6.10.ebuild
new file mode 100644
index 000000000000..c4465ab79b4d
--- /dev/null
+++ b/ros-meta/roscpp_core/roscpp_core-0.6.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Underlying data libraries for roscpp messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+	dev-ros/roscpp_traits
+	dev-ros/roscpp_serialization
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 7e50995d9732..d02e90ac2405 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 9a4b337145d5..dbd4f76ac979 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,6 +1,4 @@
-DIST pcl-1.8.0.tar.gz 66811948 BLAKE2B 11493146c12d4f0126a9e831911fe38b1ad9a7b6e66a9c3680055a3c88d59520399e7a47f81f60fdf5cc4cebe04d3337e3d3374f5c0eb13e61d94b6836f22efa SHA512 185470e980a208bd7213e1087dbc81b9741ae6e8783984e306d34d3e0e4fa69d42aa9c3a2a276d260d11cb89fff9c6cf324401938a66cd3883bdeaa38994e6a1
 DIST pcl-1.8.1.tar.gz 66787596 BLAKE2B d02439bc0c0b9cf179f5840822dcad9b3cd128c53325d5f1a5b67e0153c8b4c5150cd65763e17d2c28f91325eb9ae33d9fa6e673a17681b05d19c46eaf0bdb9d SHA512 9e7c87fb750a176712f08d215a906012c9e8174b687bbc8c08fa65de083b4468951bd8017b10409015d5eff0fc343885d2aae5c340346118b1a251af7bdd5cd7
-EBUILD pcl-1.8.0.ebuild 2228 BLAKE2B 916758207e3f8ea2f4b95dcb72986f3dff0d5587e671b2b30471ed548a7c8c7a25b1088957fdcbebb82bcf366042ed3079935233ec54382aaf4b22b20384cf99 SHA512 3a2fd249e12e1529476d9efb04ab3a2dffd6303fcb5825668238c04562eaba439f83ed0dbf08c04b81923e83a58f53a44132cf6d20466d1311366b3b6961cc80
 EBUILD pcl-1.8.1.ebuild 2228 BLAKE2B 916758207e3f8ea2f4b95dcb72986f3dff0d5587e671b2b30471ed548a7c8c7a25b1088957fdcbebb82bcf366042ed3079935233ec54382aaf4b22b20384cf99 SHA512 3a2fd249e12e1529476d9efb04ab3a2dffd6303fcb5825668238c04562eaba439f83ed0dbf08c04b81923e83a58f53a44132cf6d20466d1311366b3b6961cc80
 EBUILD pcl-9999.ebuild 2228 BLAKE2B 916758207e3f8ea2f4b95dcb72986f3dff0d5587e671b2b30471ed548a7c8c7a25b1088957fdcbebb82bcf366042ed3079935233ec54382aaf4b22b20384cf99 SHA512 3a2fd249e12e1529476d9efb04ab3a2dffd6303fcb5825668238c04562eaba439f83ed0dbf08c04b81923e83a58f53a44132cf6d20466d1311366b3b6961cc80
 MISC metadata.xml 1125 BLAKE2B 27e8b272d41bf690e99b28e7b9af140412e3d5641f56131c1c8ece113262f3222444a487a3e6a050fcf7fb8c8c404f284bc731780fa557d56241e0e0ad18613f SHA512 d5676bf63401993065215538dd0725f13a99251117e7e61cf9614ea765eb0b9388a8866aa74fb6840dba4ead49f763070076cd328c60ab0830ff11bee827e7cf
diff --git a/sci-libs/pcl/pcl-1.8.0.ebuild b/sci-libs/pcl/pcl-1.8.0.ebuild
deleted file mode 100644
index 9475d9da7036..000000000000
--- a/sci-libs/pcl/pcl-1.8.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-HOMEPAGE="http://pointclouds.org/"
-DESCRIPTION="2D/3D image and point cloud processing"
-LICENSE="BSD"
-SLOT="0/1.8"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
-
-RDEPEND="
-	>=sci-libs/flann-1.7.1
-	dev-libs/boost:=[threads]
-	dev-cpp/eigen:3
-	opengl? ( virtual/opengl media-libs/freeglut )
-	openni? ( dev-libs/OpenNI )
-	openni2? ( dev-libs/OpenNI2 )
-	pcap? ( net-libs/libpcap )
-	png? ( media-libs/libpng:0= )
-	qhull? ( media-libs/qhull )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtcore:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtopengl:5
-	)
-	usb? ( virtual/libusb:1 )
-	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-"
-DEPEND="${RDEPEND}
-	!!dev-cpp/metslib
-	doc? ( app-doc/doxygen )
-	tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
-	test? ( >=dev-cpp/gtest-1.6.0 )
-	virtual/pkgconfig"
-
-REQUIRED_USE="
-	openni? ( usb )
-	openni2? ( usb )
-	tutorials? ( doc )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLIB_INSTALL_DIR=$(get_libdir)"
-		"-DWITH_CUDA=$(usex cuda TRUE FALSE)"
-		"-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
-		"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
-		"-DWITH_PNG=$(usex png TRUE FALSE)"
-		"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
-		"-DWITH_QT=$(usex qt5 TRUE FALSE)"
-		"-DWITH_VTK=$(usex vtk TRUE FALSE)"
-		"-DWITH_PCAP=$(usex pcap TRUE FALSE)"
-		"-DWITH_OPENNI=$(usex openni TRUE FALSE)"
-		"-DBUILD_OPENNI=$(usex openni TRUE FALSE)"
-		"-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)"
-		"-DBUILD_OPENNI2=$(usex openni2 TRUE FALSE)"
-		"-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
-		"-DWITH_DOCS=$(usex doc TRUE FALSE)"
-		"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
-		"-DBUILD_TESTS=$(usex test TRUE FALSE)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 9218dc9b96f0..3901d1f834c7 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 18ac3f58eeb8..d2ba8c325ee6 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,12 +1,10 @@
 AUX gnuplot-5.0.1-fix-underlinking.patch 483 BLAKE2B 1719635d947a5d53fa5b6def65286aa1064e5a80d36d42670890bdda7dc849add342e3574dbee85f0546d953491271354c6946cc157207af700ab1cfde6d0249 SHA512 b5ac3ed830f201ba6018a81bc4860e6da0e41cc9cdc1ac8acc225bf41a0006cbd6e2f8e061ab2bd013ad55b105a02e915e256a09ca4e4faaf4791ea1c3199f28
 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c
 AUX gnuplot-5.2.2-regis.patch 1171 BLAKE2B 57d2faba0f01ca27de0ff39b9b9d01faeffcbedacd240c39aa7756fffa27aa2f6d28d3cf5d24f2b6a88399ada1538676f408851957e5df026411dffb32665689 SHA512 fe9154eb6687426542fd51b42b80378e1755007e81628be6bb318a8aaabd90dc7cadb85362162e7e323a0cf60b6bcd0509bb0318888c17bb5e4330f4c00f1f6b
-DIST gnuplot-5.0.1.tar.gz 4963747 BLAKE2B 12ef41cf34a5cb8768391a00508656af5f642b1abd9be895a29814dfb4aed5c9fa611a780063667c95e7154382d64e8fbb5d93bef601d5d1dddc9e7bbad9ce0f SHA512 f68ccef8ecad0d5f7c2eb5dc2c97ba14abba6e3324c36bb9ede5f87eef613942376a26e42e55fa8e9c908e2b732aa0b9f34d6d5c386e3d5cf9685bbca60fa094
 DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
 DIST gnuplot-5.2.2.tar.gz 5282973 BLAKE2B a15c72aaa8d62079ea3e9f20fa9fe3aaaf6036cf8dc67a784dee79ac7bd0ad7bfac754c9583b50c46deeef2f1bcd920d1094a5d1e19a1dae75405de8c3249621 SHA512 51d5b2234dae358580cc2794ed63f8a5b950baf73edc5362f5bb18d77e8066c3c010239c3b29840db11e5936cb9381bb57193de751bd274af5547a45d6d88b0b
-EBUILD gnuplot-5.0.1-r1.ebuild 5694 BLAKE2B 7c29df686f4633d23b0c16f36395604ce70a55012ce382c4212f3fb2b64b3e02eddc14125a3b97c24b9ac828c9f03fa865369e32016f70fcd3deeda8fda7f415 SHA512 6abb29f334c894c67c94c8ca996d09350a69afa12741af3006965973686a2528a9ff6ca22f395995db876e4e8ca85ec333f6a9af9e30a4827a99fa636c5fb19d
 EBUILD gnuplot-5.0.7.ebuild 5857 BLAKE2B 9aa0b6f0f9fdbb73bbde43d4546244843806bbe4135890dacc08f100f09ced0fc7c95827f45b503ec7a22a14a48b168da5175ad64356510a7e34cded1ca1d7ee SHA512 5d1694c12e4e23866bb306c289dbcdbb64e9c592ad0a12e5a0f71b602c8a90b0d31ea4a36a6bc3b13a5d7a6260ccaba6f4972e1838b22e7c8b24b8329a56649f
-EBUILD gnuplot-5.2.2.ebuild 5867 BLAKE2B 3a0cf7f3381838223ed3dd3d7233f3afd8295831ef07e4f7b2e31712d2cc5200276f04212fb2c227415ea82e05c9b6331f14f6d21d52da34565942be6405248c SHA512 d1215876fac1e6dbfeb21dedd602eabf2145b3ebb379797a4e350aaddbcd7145abd6732088cf7b74f0ad01ffa3b9984de859d42d04aff1d4a2082e6e74524872
+EBUILD gnuplot-5.2.2.ebuild 5871 BLAKE2B 6973281e5c75fd041500cbc233f341a2be780f2bccb200d274a014d0f3d57ec88fb34a8eb48503fea1a9e42d5792f94e807de38e375589a0c628bd44e4622f14 SHA512 f2a7a3dc21b106d8f02f45a34b22182d6c77a6269b6ecd61144cac93348a05385fb84254c7b6b0cda9dfc09cf6ef01632663972625348942fcd1f1cf8539fc83
 EBUILD gnuplot-5.2.9999.ebuild 5807 BLAKE2B 3a2afe5f7ac171bd54334c94ac51d7ecf289ef19d4ff0109598e997a1174bf1451885ba885c86e03ec488cbe7ce2df9a21a26e4f1dcfd30e7dd1e7cf4aee1e27 SHA512 c197bda66704c895b49a0935bdfa20fd8e85c9460966ad621a46f0bc195e1648c3329e53d3be43dab137fb4eb9ebdb84727e82ff748e02f9aadd0e5be21909d1
 EBUILD gnuplot-5.3.9999.ebuild 5794 BLAKE2B ca534f75fe5a9c39d93b9e750ec020aecacf426bec9c1852ce21879b44cbcb3e77c2599ea52dc02b69fb20b8a94a34b97225f5c793ea820985b40017ba5ecba5 SHA512 501777c51d6fd6fb63106857a25bdfc1038bcbaed039d5e9e351f2e80043ed88d90055f611c72964f60b4fe948d562db6ebe2c1c9adf1fb10940666c1d147d42
 MISC metadata.xml 1267 BLAKE2B f3b0192ce2cd8d0fb10c2f4fb4bad9780f01746cb283c19e7ecc622c85470ed8a3b7193ca2f7abdee6fdb771719e0c0a9a8a5c7fd9320ef0dae1f1210e7e36cd SHA512 dc9f36a7f2ffb85eeafb41a2b5d0b61746ef3e1de049db18ba351108b887b4cf506ea871754918faae8b4989e5ee7dbfc9f7f48c5b9df55a3bbe782425dc0421
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
deleted file mode 100644
index 44bb30c0cf3a..000000000000
--- a/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
-	inherit autotools cvs
-	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="branch-5-0-stable"
-	ECVS_USER="anonymous"
-	ECVS_CVS_OPTIONS="-dP"
-	MY_P="${PN}"
-	SRC_URI=""
-	KEYWORDS="alpha arm ~hppa ia64 ppc ppc64 sparc x86"
-else
-	MY_P="${P/_/.}"
-	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-	inherit autotools
-fi
-
-LICENSE="gnuplot bitmap? ( free-noncomm )"
-SLOT="0"
-IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
-
-RDEPEND="
-	cairo? (
-		x11-libs/cairo
-		x11-libs/pango )
-	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
-	ggi? ( media-libs/libggi )
-	latex? (
-		virtual/latex-base
-		lua? (
-			dev-tex/pgf
-			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
-	libcaca? ( media-libs/libcaca )
-	lua? ( dev-lang/lua:0 )
-	qt4? ( >=dev-qt/qtcore-4.5:4
-		>=dev-qt/qtgui-4.5:4
-		>=dev-qt/qtsvg-4.5:4 )
-	readline? ( sys-libs/readline:0= )
-	libcerf? ( sci-libs/libcerf )
-	svga? ( media-libs/svgalib )
-	wxwidgets? (
-		x11-libs/wxGTK:3.0[X]
-		x11-libs/cairo
-		x11-libs/pango
-		x11-libs/gtk+:2 )
-	X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )"
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="lisp/50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-src_prepare() {
-	# Fix underlinking
-	epatch "${FILESDIR}"/${P}-fix-underlinking.patch
-
-	if [[ -z ${PV%%*9999} ]]; then
-		local dir
-		for dir in config demo m4 term tutorial; do
-			emake -C "$dir" -f Makefile.am.in Makefile.am
-		done
-		#eautoreconf
-	fi
-
-	# Add special version identification as required by provision 2
-	# of the gnuplot license
-	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
-	# hacky workaround
-	# Please hack the buildsystem if you like
-	if use prefix && use qt4; then
-		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
-	fi
-
-	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
-		for details. You can use the "pdfcairo" terminal for PDF output.'
-	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
-	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
-		SVGA console graphics, gnuplot needs to be set up as setuid root.
-		Please note that this is usually considered to be a security hazard.
-		As root, manually "chmod u+s /usr/bin/gnuplot".'
-	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
-		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
-		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information.'
-
-	mv configure.in configure.ac || die
-	eautoreconf
-
-	# Make sure we don't mix build & host flags.
-	sed -i \
-		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
-		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
-		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
-		-e 's:@CC@:$(CC_FOR_BUILD):' \
-		docs/Makefile.in || die
-}
-
-src_configure() {
-	if ! use latex; then
-		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
-	fi
-
-	if use wxwidgets; then
-		WX_GTK_VER="3.0"
-		need-wxwidgets unicode
-	fi
-
-	tc-export CC CXX			#453174
-	tc-export_build_env BUILD_CC
-	export CC_FOR_BUILD=${BUILD_CC}
-
-	econf \
-		--without-pdf \
-		--with-texdir="${TEXMF}/tex/latex/${PN}" \
-		--with-readline=$(usex readline gnu builtin) \
-		$(use_with bitmap bitmap-terminals) \
-		$(use_with cairo) \
-		$(use_enable compat backwards-compatibility) \
-		$(use_with doc tutorial) \
-		$(use_with gd) \
-		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
-		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
-		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
-		$(use_with libcerf) \
-		$(use_with lua) \
-		$(use_with svga linux-vga) \
-		$(use_with X x) \
-		--enable-stats \
-		$(use_with qt4 qt qt4) \
-		$(use_enable wxwidgets) \
-		DIST_CONTACT="https://bugs.gentoo.org/" \
-		EMACS=no
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	export VARTEXFONTS="${T}/fonts"
-
-	# We believe that the following line is no longer needed.
-	# In case of problems file a bug report at bugs.gentoo.org.
-	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
-	emake all
-
-	if use doc; then
-		# Avoid sandbox violation in epstopdf/ghostscript
-		addpredict /var/cache/fontconfig
-		emake -C docs gnuplot.pdf
-		emake -C tutorial pdf
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
-	newdoc term/PostScript/README README-ps
-	newdoc term/js/README README-js
-	use lua && newdoc term/lua/README README-lua
-	readme.gentoo_create_doc
-
-	if use examples; then
-		# Demo files
-		insinto /usr/share/${PN}/${GP_VERSION}
-		doins -r demo
-		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
-		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
-	fi
-
-	if use doc; then
-		# Manual, tutorial, FAQ
-		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
-		# Documentation for making PostScript files
-		docinto psdoc
-		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-}
-
-src_test() {
-	GNUTERM="unknown" default_src_test
-}
-
-pkg_postinst() {
-	use latex && texmf-update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use latex && texmf-update
-}
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
index e52d125c9f46..be98c1023e45 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
@@ -17,11 +17,11 @@ if [[ -z ${PV%%*9999} ]]; then
 	ECVS_CVS_OPTIONS="-dP"
 	MY_P="${PN}"
 	SRC_URI=""
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ia64 x86"
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~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 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index e150e5889329..7fd6b4e857a4 100644
--- a/sec-policy/Manifest.gz
+++ b/sec-policy/Manifest.gz
diff --git a/sec-policy/selinux-redis/Manifest b/sec-policy/selinux-redis/Manifest
new file mode 100644
index 000000000000..15508eb76649
--- /dev/null
+++ b/sec-policy/selinux-redis/Manifest
@@ -0,0 +1,5 @@
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
+DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+EBUILD selinux-redis-2.20180114-r2.ebuild 282 BLAKE2B a247a5b631780eff10b29591025cccc6d1d2677064abe04e5d355d485bc31ac8120fc07ed563526693ab40012d95618025c9fb8276f2142d123e079e1c00451f SHA512 4e97d304fece0880c6dcf7777cf8ab6c943ff18e87b3725636ffce066aee182ba56732e710994a5d5eb6d69c067f8f351bf2794a2da22c9b5ddc89908f02a09d
+EBUILD selinux-redis-9999.ebuild 282 BLAKE2B a247a5b631780eff10b29591025cccc6d1d2677064abe04e5d355d485bc31ac8120fc07ed563526693ab40012d95618025c9fb8276f2142d123e079e1c00451f SHA512 4e97d304fece0880c6dcf7777cf8ab6c943ff18e87b3725636ffce066aee182ba56732e710994a5d5eb6d69c067f8f351bf2794a2da22c9b5ddc89908f02a09d
+MISC metadata.xml 315 BLAKE2B f694245feccb9ef96f0afc7f912bfb60ee4ce97085b0626f57006b8532c3f9a5c6fe43aa1029f28f057fad5801a420c2d2b0da5aa25f9028e16f62b7c985fecf SHA512 3f104b8866ca3c24c8c9f37727b63245f6bf536bbe70f564abc07ba7f68f22f45170269a18db552e4681d042545dfd09eb694010c9f629e85dda4e5def3db919
diff --git a/sec-policy/selinux-redis/metadata.xml b/sec-policy/selinux-redis/metadata.xml
new file mode 100644
index 000000000000..13f715cbde9f
--- /dev/null
+++ b/sec-policy/selinux-redis/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
+	<longdescription>Gentoo SELinux policy for redis</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20180114-r2.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..cf01a8f45bcb
--- /dev/null
+++ b/sec-policy/selinux-redis/selinux-redis-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="redis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for redis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-redis/selinux-redis-9999.ebuild b/sec-policy/selinux-redis/selinux-redis-9999.ebuild
new file mode 100644
index 000000000000..cf01a8f45bcb
--- /dev/null
+++ b/sec-policy/selinux-redis/selinux-redis-9999.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="redis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for redis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a874f6d8a8ee..15fd748adc5b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 83697178fce0..66cab1a4f04d 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,5 +1,3 @@
-DIST dmidecode-3.0.tar.xz 58704 BLAKE2B d3e22cfeb8f537f461523d0927cc5eb5fa6214638b8a9360b2159abff1b9f60c8a8753f24a233a77f7c413b074f9a910f000a0c49ca166ebf3297ad673e9fb93 SHA512 fa31190e43ae7a0b61f6313b45f5eba3ab66390accd587129419e48fca931b631cbb331d6893cf0c1bfca94c86ff8c557215166e0881dee93b3af10a86878eb1
 DIST dmidecode-3.1.tar.xz 61204 BLAKE2B 439e265dd3f7b225d61b5d4228c0a77b25dd44b5d3672fdd9bbe432f5ae59ac23d2abd80e40621cda934643c9819b05f34d4f5befc8a75b93ae1840caf717cea SHA512 226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9
-EBUILD dmidecode-3.0.ebuild 1145 BLAKE2B 874b9c55f5e927b9418f7f4a41bdc97cb8c461c279007052a3bb7f182154ad7602508eb406a20c5d4e786662e1aec90d01536f5727cf0bc4e172e9f441729433 SHA512 9a361a7c80194bb062b6d27d9f06bb8446298da1a09801223ab9c52e275904486945229a769b8441c51eb0c508982ee6eae116027ef3b22bded76b9f132edada
-EBUILD dmidecode-3.1.ebuild 1144 BLAKE2B 453c85be0a196dc2514e0589346d9b8015e5671f496483574ab71c6858b45a1d1599a84a59d727e59d006b61bc5476d0c31b30b9a4107e806affd107ccea33ec SHA512 23a0210cb4291f580f12291afb4c56fbbddd8da9cfa1028804e2826a9374aabe4fd3fdf9c5884ad5071aa44346d7681d9bd3dc60dc81c1b60b2ab3a69f28c94c
+EBUILD dmidecode-3.1.ebuild 1144 BLAKE2B 2aae4c52c90d409639e8317795a8a5cb6c82f29b391fe1ce5fde0a11ffafb426119d0be8fb9208d77311396f032286b8c763cb1e90e89ce137cf5fdb5b80c84b SHA512 f039310d57092eaba3fd1a3ec7ebfe8e195c96e64808789fa8bbf7c7425365d6e6fcec535f5dfdb7b5bd7a0b530f4f0a7b95e12b37237c0f85219a3968476f25
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmidecode/dmidecode-3.0.ebuild b/sys-apps/dmidecode/dmidecode-3.0.ebuild
deleted file mode 100644
index a21456f2e204..000000000000
--- a/sys-apps/dmidecode/dmidecode-3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
-HOMEPAGE="http://www.nongnu.org/dmidecode/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
-DEPEND=""
-
-src_prepare() {
-	sed -i \
-		-e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^docdir/s:dmidecode:${PF}:" \
-		-e '/^PROGRAMS !=/d' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		einfo "dmidecode needs root privileges to read /dev/xsvc"
-		einfo "To make dmidecode useful, either run as root, or chown and setuid the binary."
-		einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar"
-		einfo "information without requiring root privileges."
-	fi
-}
diff --git a/sys-apps/dmidecode/dmidecode-3.1.ebuild b/sys-apps/dmidecode/dmidecode-3.1.ebuild
index a128dccc3dfe..7db50407baf5 100644
--- a/sys-apps/dmidecode/dmidecode-3.1.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.1.ebuild
@@ -6,12 +6,12 @@ EAPI=5
 inherit flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
-HOMEPAGE="http://www.nongnu.org/dmidecode/"
+HOMEPAGE="https://www.nongnu.org/dmidecode/"
 SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
+KEYWORDS="-* amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index a9e89da34a11..1e45fb425789 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,16 +1,14 @@
 AUX filefuncs/Makefile 1112 BLAKE2B 2aac64b80953a3253730209b9496164cfa2d3e9d18c90547cc7290329e2639ba4499a7d9c9a87b79c05f31a8cea3ace1663de8adaaef5d75d6b25ab8017951a0 SHA512 9bf5acfca439e6589247db3b4b16985765e748bcb66577e7038247830f92137929f139f6ab72ecb9e2b3b03f9406c8ecf7ca349329979ee8d70fbf44b4feb2b8
 AUX filefuncs/filefuncs.c 10875 BLAKE2B 7da403cea52ba69b3822aa892ad8faa12fd59d64d434f35048e34a38273f57fac73a42d74d88e68c33feae015ac241395c2f71c3e7e7e99b526814d9347d8c73 SHA512 48da0dce39759a8d57097b286dcee2ebf1e1799b694a4a7926716df727eb294a7912117c405e1b63a1722fa3a2427cb2139d92fac723ffd8d2e697632719f974
 AUX gawk-4.1.3-bsd_configure_readline.patch 1899 BLAKE2B a7c8ce8aa8fb25ce3adc74fb195bf8c9dbd7b83084f4f901c61758f5a51969510aa3ae8c9f2668266d798d43563f6fcb7e8659ae9f7cf7514f86de2f5443fed6 SHA512 ed3b6c4efe5bcb53bca6eeb50df0e3871eca266dd3d6ea4369f42dce31b771ed0a4f0aac03b09124706539d18c8d1dfe549e43d2ef4cf80a45353e14238ddaec
-DIST gawk-3.1.8.tar.bz2 1984129 BLAKE2B 9e3c130aa246f3dcfc03ce88da644d0fdceff01fc98fb25c1638d3a03e9ad4c435960c41746eced0f7d955c6aeefde68b75c4449bc95be26be59720b267b4f84 SHA512 a8046c1a5a6ffc8bd90cc6062d97ba6301b7a707f4a34a06355a83aaaea2ccdf4c4476563fc6f444b529a2d8d3a2de2126b53434ba50aad8bd898fb3299904dd
 DIST gawk-4.0.2.tar.xz 1626808 BLAKE2B f66ebc3650c7288d46ed4548f07c83cbd591873a5d364965d6768e6455f64334cb03cb91e83a110d5edaa917c7fed714cf66154cea5c0ec22ef982429ad03265 SHA512 069f68b6792521d94d4003764006ad8fbe9a17c60a88212629204d9a5eb3f662903fff6d91dd3c1834597b76c18f9d3231c93a033f456c59c0571ac13eb77b27
 DIST gawk-4.1.3.tar.xz 2311268 BLAKE2B 956872ef3c8bdf27ccf9c3f7f158f161f42bb8607af7f966e843e24cb4e4e89380cd05a3169157cc822ea5ce8d849993b952795ecd0ecf14213f0bdd689d1b16 SHA512 8b9470a1bba397353f10e4e652e8589a637a49e8235fb39ca7681ae662fd27cd140c193d0634179c800f99e19b0e49aef55dfa6612f9695ba80760a36936a1c3
 DIST gawk-4.1.4.tar.xz 2367832 BLAKE2B 67004e2867e4c4f43aac7142a52c83642d8bb3b0a5451293418bc15e575a8ed1d97c0a975e084bf46ffd1c27dc70e48de492cd2e007773622ef14886b9269ee1 SHA512 6a0e9cf086544212f54b54261dcd517b611aaf495ef99c4b7740d07e363bb00c5632f3d7fd5e12a954d5aa9793764162a57453e0e18884b29c6c54b5f444c097
 DIST gawk-4.2.0.tar.xz 2948108 BLAKE2B 6e46b70480184edd3a70bcea2b4e4448b4dfbac317be6e1a6d9225bc6c0b42abe49fe9380231cb3fc87efd449d2c5232ac7099b4c4472c3815a52200ef0013a3 SHA512 3076b2f42e43fff0ce63dcaa3fb749ce421473d0abc3e1e2d9dd375207d3e35c98d5bf91c3179f49156e8a4977424c16bb2d3d662846ad487153729dd4cfeb4c
 DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
-EBUILD gawk-3.1.8.ebuild 1782 BLAKE2B a960ff46bb378cadf1b7125fff29ac6045e403d1052025621fe565145f792a43a79cc4ac540faf217670f69ffc8a0b9b5af4b7a231de624c3c0d6832737c68ac SHA512 747c9f7f32af7469b7359bbaa7e329a84c78aaf0c8c122a0003bb3e32dad47d1470edd30f215504e0305027b40a3e72e8000ee3889e7cbc4c427ebd12bae884c
 EBUILD gawk-4.0.2.ebuild 2076 BLAKE2B 73d9ce392a42ee14556b70be84ed284108212c471d7e31faaaf07305c525ed73d16df7d3bdc12539ca50352c861a4ed7ca291a376e7516c0f4facf1bc1e813c7 SHA512 69f941d2eb134277c70b4e7ea4364a8902d7522903064192c7f306219128fb45f0a2d42ed79c852da918acb0c740e49052d36a5e27d331d239c6e6d811b7cc41
 EBUILD gawk-4.1.3.ebuild 2003 BLAKE2B 55c637567276e73fbb4032c3d297480a769ee0769a354ec491a857da2afb9708ad650d5f70db1224d315dd82675316cff38ef0ac3af83cbcf280dbfbbc24078c SHA512 87b224aa2cd9b231eb088b588242860ef323913ec64cb403f7622504f82e8d4431fc7f0b53d5bfe33df5c2852b5b6390b235870d4a9e3058fd4803dab2eeadd4
-EBUILD gawk-4.1.4.ebuild 2091 BLAKE2B be60bed6d3882d4c879928a513b335a9027a4bdd3679170c5b6e8ecedab5d2d1ecab44b8d48796eaea8de617dbe4f8ecad55ea53a0058a02cc7672a54f4593bc SHA512 6e5491b47841e72d192b7e968d480b9b12ed41d8cbd702dd9d1afe948bf80e98e48c90a9a89d7f6377c9e69c2b0f3e86bfc8fdab6e03d1e50c87307660568d27
+EBUILD gawk-4.1.4.ebuild 2090 BLAKE2B 157b0b2d6eed94587109451db8aeae9b809f16e2adff1735d9111ff486ccacdeb0f0add59cb23f58ef80e72fbd746bdf80ee029bffd1ccba5219f6609b124d00 SHA512 59ba5329f4334688408e6afd9fcc0556f87e46bc5f860ae140197c7b0a2a62dfc6236199a9588c1ee57f4ab946ee924bbba804abbfd0125f8acf4dbecaeb9589
 EBUILD gawk-4.2.0.ebuild 2217 BLAKE2B 7167b9d789eb38036c4ae2d46ee00c8ab29dcf959920e92a3529380fd132126c27ef5125cfa52165551fb6134217230512f98a31259316f4977ff5013df56038 SHA512 8711fd432cb13b920561bf5ced80694c3cfdca84932301bf5ffa505a3fdc0d1d07f108534ba18cb386cc05061afa00466d301d46b69abc5502f315d094a982aa
 EBUILD gawk-4.2.1-r1.ebuild 2574 BLAKE2B 887cc51f129b56ace31986b3718c3ffadb8f19a197aa59427ccc706032e4373d0bb80ac6484405da2f2fd8417e8d7759a07d7b895ad59d415d6d9889ccdb6920 SHA512 4abd41cb11ba0cbbf8ccb2ef9459678af6ac6507a400a8cbd7d96f41045847101ab22721ffc2637e2717bf88f591f04adb817ae91360e8573ded16ea16c4c31b
 EBUILD gawk-4.2.1.ebuild 2204 BLAKE2B 82c60e85badb8d968c796c6aa83ed366b0b399fb32342bfecabc6aeba7dbfce73361b5a7968d9a61269d0c25cfda7c5add6159f62aee7dd6fc35f4f1bf93445b SHA512 b814c89f185cf3086c7a06f2bfe2a1bae616a9b5bfd062ab9c230c043f9072ead65ab438295b5c7abb430bcbc9a5c601ce41eb8ce1a0b8e429fbbb9a3881bb6d
diff --git a/sys-apps/gawk/gawk-3.1.8.ebuild b/sys-apps/gawk/gawk-3.1.8.ebuild
deleted file mode 100644
index 8d9f004395f2..000000000000
--- a/sys-apps/gawk/gawk-3.1.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="mirror://gnu/gawk/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND="!>=virtual/awk-1"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-SFFS=${WORKDIR}/filefuncs
-
-src_unpack() {
-	unpack ${A}
-
-	# Copy filefuncs module's source over ...
-	cp -r "${FILESDIR}"/filefuncs "${SFFS}" || die "cp failed"
-}
-
-src_prepare() {
-	# use symlinks rather than hardlinks, and disable version links
-	sed -i \
-		-e '/^LN =/s:=.*:= $(LN_S):' \
-		-e '/install-exec-hook:/s|$|\nfoo:|' \
-		Makefile.in doc/Makefile.in
-}
-
-src_configure() {
-	export ac_cv_libsigsegv=no
-	econf \
-		--libexec='$(libdir)/misc' \
-		$(use_enable nls) \
-		--enable-switch
-}
-
-src_compile() {
-	emake || die
-	emake -C "${SFFS}" CC="$(tc-getCC)" || die "filefuncs emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	emake -C "${SFFS}" LIBDIR="$(get_libdir)" install || die
-
-	# Keep important gawk in /bin
-	if use userland_GNU ; then
-		dodir /bin
-		mv "${D}"/usr/bin/gawk "${D}"/bin/ || die
-		dosym /bin/gawk /usr/bin/gawk
-
-		# Provide canonical `awk`
-		dosym gawk /bin/awk
-		dosym gawk /usr/bin/awk
-		dosym gawk.1 /usr/share/man/man1/awk.1
-	fi
-
-	# Install headers
-	insinto /usr/include/awk
-	doins *.h || die
-	# We do not want 'acconfig.h' in there ...
-	rm -f "${D}"/usr/include/awk/acconfig.h
-
-	dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README README_d/*.*
-	for x in */ChangeLog ; do
-		newdoc ${x} ${x##*/}.${x%%/*}
-	done
-}
diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild
index 90886233ae56..6798442e0645 100644
--- a/sys-apps/gawk/gawk-4.1.4.ebuild
+++ b/sys-apps/gawk/gawk-4.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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="mpfr nls readline"
 
 RDEPEND="mpfr? ( dev-libs/mpfr:0= )
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 4ad4f2cb5a6b..6ffe7121f90d 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -4,7 +4,7 @@ DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e0
 DIST help2man-1.47.5.tar.xz 186044 BLAKE2B 288eeaab3781293209f4a6aeab570317e5ed9e2e76acf9a1669c767b627e3896936fba775e32f6016b7881b5747a51b5020c0ab4fc77030d1e27c15acab032f1 SHA512 c94f94bbdfb9e288edff2b3181e0f2e858d309aa4fe77cae141571a06b9b5bc2a5c5a4d25ffc1f9108222d56c9040989d63770f5d804323a52d3978059d1eca7
 DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
 EBUILD help2man-1.46.6.ebuild 949 BLAKE2B c1bc74c78bfb78764a17b747e1f16a0d2abb8f78a1e35737f829212f127b0739f97f14dbdfc1dbe465034dd0f603868e35cd02b2fceb15c699946cc93fcbe5b4 SHA512 578767b49b696227dabe944055ceb1afc410382230de113a6a6b898f23a33fab50dc433b670329bd550b61ffd12955e44ea1a8729077d521bac43156f3cc31c9
-EBUILD help2man-1.47.4.ebuild 1084 BLAKE2B abd1b902b76ae6ffa86ea10570bbd7a6bee205058aca557841afdf5ca2de512b88e764272c5d9f1821464882584c777a64af9eaa41f013dcce6260e88ee1bec9 SHA512 4ad10c0dfede919fe044af9970b05f42471eaba5e0b036bc27dce2225aa0385523919d3afe3bf33c5eca89d49ba8ebe4a093755584f43ba17bc50877b95b195f
+EBUILD help2man-1.47.4.ebuild 1083 BLAKE2B 7523e2059116c743bdee30f6fc6a5698f6d899e0c35215b0029195658084ffffc92db6afd02c4b5b3275c1d8d26a899c0afeac5bd8abc16bf1810ba3ed45130b SHA512 964a18c1fae41a4c6f45cca17f8109b0497c5334cb06dc88d5aabccf7337d66c8a53142473cac9b5efbc8d9bb5a9518b665b01f663e96fa7d6a3599ff16f7a65
 EBUILD help2man-1.47.5.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
 EBUILD help2man-1.47.6.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild
index c3def6fa2190..d56029b0fc2a 100644
--- a/sys-apps/help2man/help2man-1.47.4.ebuild
+++ b/sys-apps/help2man/help2man-1.47.4.ebuild
@@ -10,7 +10,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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 10dedf51da6d..9c218d969240 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -21,5 +21,5 @@ EBUILD portage-2.3.28.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066de
 EBUILD portage-2.3.31.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d
 EBUILD portage-2.3.36.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
-EBUILD portage-9999.ebuild 8795 BLAKE2B 82b5c300a67ef35dc2e57e2680efec39cfe4247e5ae8b6e469bfb022275076056b0ec05f280d4925a4537588d94b471397d8a065c2a80e6e64b5e9c51cff2ec7 SHA512 fadc6f2da2fc363438aee4a04b0c36bad372d724c14591fba943b6f9f7602d820300192dd1ca9d78f32bf2279a27aca0c74364a2563a58a135f684adfbaf1910
+EBUILD portage-9999.ebuild 8811 BLAKE2B 2b31ee7001e79f48f4d0e0d8ef131bec99cd2625fd95818e02606b849d4ccdc56a67377a6f4965983ce8933fdf6096a239fd1d86644c9b852e74bc934db130d1 SHA512 9b5fdc9ea17f6f7ccb3358b27a3c16736ed989601c74e69e9168ab44c215dc3ad69710e2e408b4f1d4676f1c5a19abdb93b80fd674051150882f2e5da42106ee
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index b82170153d2a..88afa1be609a 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 			python{2_7,3_4,3_5} pypy)
 		rsync-verify? (
 			>=app-portage/gemato-10
-			app-crypt/gentoo-keys
+			app-crypt/openpgp-keys-gentoo-release
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
 	)
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 1d27d75e99e7..aed8e3b5a8ad 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -2,5 +2,5 @@ AUX usbutils-006-stdint.patch 701 BLAKE2B 511a0466d35f452c48bf6490415f1fdc3925fc
 DIST usbutils-008.tar.xz 287052 BLAKE2B eb9b998adb69938d004828585f782840e34f453327de54a32c563268db22a870fd7298cf839692e58ae42148e63037260e09bc2f1d5700ff96bcc451aff626ba SHA512 ab1ad36467ff79ff5ab0b924620001612cae44def58c05ade01a4e58d8a4d48df61c09faba49a20497b7d6314045bbaf137b51a9f4e6b65ed0ea3bb339bf1c45
 DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc778698afaebf7054cdb153149e4f3808a7b172019434756cae8b33410643cd6a03a36277f80ead9b0f4446385fd9 SHA512 e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a
 EBUILD usbutils-008-r1.ebuild 1244 BLAKE2B 65d0f771202bf1e39d243c6f46d3f45d818033b7bd40ba198e834038416498a68e329c7182ec0ba756479ee6bd54aac11556e4513b44baa98c0dcee320b1801a SHA512 5384707b65c9801744ec1838e94396ee421ea007ec25c5afc1503134c2d7bf0231fdd1d9dce8b6af9892177b1dbe16b30303c810bb4e1d82b2082c2f32fe5964
-EBUILD usbutils-009.ebuild 1156 BLAKE2B bd9b0d29261bab295cf7535a944d1b236b5e0947e5f06b25d7ee21be7a0b40078bc9ee9dc8c60023f53bfb31d20abda2f56e6ccff378c00a350aa08199610006 SHA512 adfb7a089bf509283257c37279aab40a6b14faec314448df87b2fbd8988ac579acd55e08639a6c3ec998de6c4a88a79a9abbc53b0a523a75e20d5c22a9db491d
+EBUILD usbutils-009.ebuild 1153 BLAKE2B fd5250014bdb4100c967d87046800ebc16085e17bb1fc905418fea5af55c6acbdecfb87ca22d27ce2ddb45009d7785fa58c5a2bcb8a86142290810120ab589c2 SHA512 7eb4c4b29b35da05ab5533eb202fd0c7d9e44ca8c8ce2c86e553dae97f8153306eb3101cde7873f46eb803224307463b734197da409741c426e12a0e85c1e7b0
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-009.ebuild b/sys-apps/usbutils/usbutils-009.ebuild
index ee9aba52d6dc..80d6bd97b9f0 100644
--- a/sys-apps/usbutils/usbutils-009.ebuild
+++ b/sys-apps/usbutils/usbutils-009.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 67fab4cb7566..7f47948d85ab 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 07a94882a3ad..bf557ad4974f 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,4 +1,6 @@
 AUX polkit-0.113-elogind.patch 6149 BLAKE2B 5e99eab21887f4504e07bd1fe803f8534aad227ec0ec8fcacf207ee5179a3ca6a670c1c3cf1f52e932096f27d39a911ca95c11adf1461833b4d3d4dda410973d SHA512 9a3e928d77c023c3f895f7fec7893f0355729808c4ee3bcd5419a7e408b613faefcff6d43f87cdab94b3fa15b7eaddc9ce40cf9b7b0954624360489c4d2c3b52
 DIST polkit-0.113.tar.gz 1448865 BLAKE2B 93cb6abf03d0de193e9f64b953bee40faf3bd07cf6f86beb4f84edd740dedc0bcf7a1ffd6b3a1a816e5adad0ee59536dacae3d991add4c4965cc6a98566b7470 SHA512 ab177c89a20eeb2978ddbe28afb205d3619f9c5defe833eb68a85e71a0f2c905367f1295cbbfb85da5eafdd661bce474d5d84aca9195cd425a18c9b4170eb5f9
+DIST polkit-0.114.tar.gz 1557340 BLAKE2B 4ba50f5c44342b9420e7a7e9fc07b94338613816530000f42d6e45b941c7b6bd39260ea23c86b24b22684be3fd0be968976415dd3d11fe5ba9269d8c70d33870 SHA512 49cdf9dd3663714b1c6569ad8740cb413d9c5bd5c11e4bdbba3ce82b744f36638b652547edff9203caab9287834bc68a1d6a4895ec7a188fa1524dc1e9c9b4ea
 EBUILD polkit-0.113-r4.ebuild 3454 BLAKE2B dee64aa247ae5198874d24ad94cbe829649eba2c3ddfe294c9daa3db6349c71f1d32ec236d47691be9fec2f88f56cc75d0a5a62c1c6c5a94c2c1db407608dfa2 SHA512 74b0e2b963211c2255f6e1006a828b492782067e54a6ef2111179fc33d18f4abf862c214e4ac451dd1b6932382c7aadf2c757715de5f180486f1c229b2419349
+EBUILD polkit-0.114.ebuild 3396 BLAKE2B 2493cfa26fd4b9fd4c5d24367bb71086be9b0495e5875e948cc66a1928ccee5e4a1676780ca69682eb9d47c6c5cb480c310a6c80b964d0044f54908fe1918f4f SHA512 9330cf67327427a293e3a424238f819aa428a213701b424b68d4616c3f535b6733747574f783b5f5eb134be6ff6107da02394f905cc77b2668dd81852e8f6bbf
 MISC metadata.xml 493 BLAKE2B bbf2a4e83d0882480d0f2ba8b18ef439b234bd82538546d04753d63fa828f6b111afb78846c1a03f4aa93f89e6fd0a6a828c7908574a740c9c6880252a84e98d SHA512 9c7b199d1a3b1193beb4d01e52d5e90d81821aa6df6785482da7ee37c0ca777c12095f160bc997c77d0089429c2e338cf75d0a46836416736178cd661ffa80f5
diff --git a/sys-auth/polkit/polkit-0.114.ebuild b/sys-auth/polkit/polkit-0.114.ebuild
new file mode 100644
index 000000000000..3e161e209a86
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.114.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools pam pax-utils systemd user xdg-utils
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="elogind examples gtk +introspection jit kde nls pam selinux systemd test"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+CDEPEND="
+	dev-lang/spidermonkey:52[-debug]
+	dev-libs/glib:2
+	dev-libs/expat
+	elogind? ( sys-auth/elogind )
+	introspection? ( dev-libs/gobject-introspection )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	systemd? ( sys-apps/systemd:0= )
+"
+DEPEND="${CDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-policykit )
+"
+PDEPEND="
+	gtk? ( || (
+		>=gnome-extra/polkit-gnome-0.105
+		>=lxde-base/lxsession-0.5.2
+	) )
+	kde? ( kde-plasma/polkit-kde-agent )
+	!systemd? ( !elogind? ( sys-auth/consolekit[policykit] ) )
+"
+
+DOCS=( docs/TODO HACKING NEWS README )
+
+QA_MULTILIB_PATHS="
+	usr/lib/polkit-1/polkit-agent-helper-1
+	usr/lib/polkit-1/polkitd"
+
+pkg_setup() {
+	local u=polkitd
+	local g=polkitd
+	local h=/var/lib/polkit-1
+
+	enewgroup ${g}
+	enewuser ${u} -1 -1 ${h} ${g}
+	esethome ${u} ${h}
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
+
+	# Workaround upstream hack around standard gtk-doc behavior, bug #552170
+	sed -i -e 's/@ENABLE_GTK_DOC_TRUE@\(TARGET_DIR\)/\1/' \
+		-e '/install-data-local:/,/uninstall-local:/ s/@ENABLE_GTK_DOC_TRUE@//' \
+		-e 's/@ENABLE_GTK_DOC_FALSE@install-data-local://' \
+		docs/polkit/Makefile.in || die
+
+	# disable broken test - bug #624022
+	sed -i -e "/^SUBDIRS/s/polkitbackend//" test/Makefile.am || die
+
+	# Fix cross-building, bug #590764, elogind patch, bug #598615
+	eautoreconf
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--disable-static
+		--enable-man-pages
+		--disable-gtk-doc
+		--disable-examples
+		$(use_enable elogind libelogind)
+		$(use_enable introspection)
+		$(use_enable nls)
+		$(usex pam "--with-pam-module-dir=$(getpam_mod_dir)" '')
+		--with-authfw=$(usex pam pam shadow)
+		$(use_enable systemd libsystemd-login)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable test)
+		--with-os-type=gentoo
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
+	pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest
+}
+
+src_install() {
+	default
+
+	fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
+
+	diropts -m0700 -o polkitd -g polkitd
+	keepdir /var/lib/polkit-1
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/examples/{*.c,*.policy*}
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 0f3d201f23f4..744381c09f35 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 9a8e655c6305..dbbd0c3d85ea 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,13 +1,16 @@
 AUX heat.initd 463 BLAKE2B c855fe1b4fe73fe93874add659c49133d1f83653acbb37e7ab9927641883196abb620f53e6b31f5cc39e7c59875d4af29b3d5b14eb2a1d67556e7fbf129c7705 SHA512 d6685d7751dfd6ece714c2b96c2d07419f13556f6f3d065a108943cb3bc90c4a51b66313b3e53db4f47f0577c411e859c89984d4764462857eb1ca1990ca847c
 DIST heat-10.0.0.tar.gz 2349675 BLAKE2B 24968c117d19e69638dbddd6d25d34f05e1454f788187049f1f35a067e029afe141693f41b497031e2ebb039cea2475bcf13ad814a21844540d41f1a2e4260ef SHA512 43a5ab5330a830657cc5265875240d85d442404db1bb3ff7372acc28fc4b8f410414704a928765cf97eb550fa47d0bd228ad62efb098093552baba0f1e1305e9
+DIST heat-10.0.1.tar.gz 2353949 BLAKE2B 401cc24ebc2c5105666719a9d89a55116f4f8139dd7fb4a5b5e37f3da39240dfedb3b61b810f72750390e4f9dc0f8e6b69499c1b921f222064a610fd85cd8b84 SHA512 019df95a16f7d5f89a726248d33780ef4fa7fc2ff91b9a0a756548fa91993eb625097b9ab0dd232019669161ccf6fbf43132237d4666bf200f141173bbb07782
 DIST heat-9.0.3.tar.gz 2364843 BLAKE2B 4edbd6716a84e6003cd02511e8c8036c84510bd4d842d9a32caae7c837bee591fb46d3edc8786d8015b8ffd09d4dde7bde4f49a6994766af40284715b2b99713 SHA512 5db5f0189da095951963d2cf30c7c3279e40537041a66b3d13cfebd13ba4256b74db49ba6269e14b2c4e21d10b7b00e77d5b94050e30c436dc271b406e4e9432
 DIST heat-9.0.4.tar.gz 2365172 BLAKE2B 069ee142fc8f8dba7eb6cdd9386a4fa32db85cb9a2bc454da1e4290acfd17d364de34706a3199fb7b68b4a4ce1c24d1b8d7781b4d1b984e6171e78ff32335008 SHA512 fd75a7cd9e656c58e81d47292687024ba6b61cccdbeab3ce2472f05f238a944ef4dfa120b39b6f2285aa434b3386ea13d3ca07a48b70d1f53798384a344c53a2
 DIST heat.conf.sample-10.0.0 92161 BLAKE2B 745cdb4eb6006079201cfe31b6486a5d759a93d1deceb42c3e9c5224b9512437013a5f44eb0f81694949efad648559a1b4e436992a91986206e50b65c69a09b8 SHA512 44b9f0e5779a21afc73a2720181ffaf778d5e54f61db7b177b59a777985c6155dac1d6b535eed311be372236f4d39d0601a8814c5ad7aa0c48acf3771bf65120
+DIST heat.conf.sample-10.0.1 92161 BLAKE2B 745cdb4eb6006079201cfe31b6486a5d759a93d1deceb42c3e9c5224b9512437013a5f44eb0f81694949efad648559a1b4e436992a91986206e50b65c69a09b8 SHA512 44b9f0e5779a21afc73a2720181ffaf778d5e54f61db7b177b59a777985c6155dac1d6b535eed311be372236f4d39d0601a8814c5ad7aa0c48acf3771bf65120
 DIST heat.conf.sample-2017.2.9999 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
 DIST heat.conf.sample-2018.1.9999 92161 BLAKE2B 745cdb4eb6006079201cfe31b6486a5d759a93d1deceb42c3e9c5224b9512437013a5f44eb0f81694949efad648559a1b4e436992a91986206e50b65c69a09b8 SHA512 44b9f0e5779a21afc73a2720181ffaf778d5e54f61db7b177b59a777985c6155dac1d6b535eed311be372236f4d39d0601a8814c5ad7aa0c48acf3771bf65120
 DIST heat.conf.sample-9.0.3 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
 DIST heat.conf.sample-9.0.4 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
 EBUILD heat-10.0.0.ebuild 6319 BLAKE2B 2ed5436f452faca5832dbe947627fdda6598874fb1da3ae06fdc7ad3af59a22ed7957db4f00fc58ab82b74491fdb64ba34506c874a3eb9ade7db3ee300712eef SHA512 f148a10406a7e56be07fdd7b08208b67cabaca6a0b1e7532f7a91d7ed9845c0de41ab670ff58d7e6c0117b20f3728b9081a3c8fb0b4adc2d5b27c187d2b8426a
+EBUILD heat-10.0.1.ebuild 6380 BLAKE2B 5dabdd353759b10f3f3e6bb741e255ae21aeef34a401e0adb2c16a8f63a53c733ffc253d1f3c6c519c7dc86e58e855256cef6599973c4f6e39fc4f648a1395a7 SHA512 9524a1f880c7c8aceb2e1125cd8ccec85c1b1d693029e499ea90f34e2140191f085ae6f47a1fe4085c32684be28d5315a259eb11d8494bf49c689954e9f50c34
 EBUILD heat-2017.2.9999.ebuild 6631 BLAKE2B 697e6e82a1ca39a9585dc66f3ed2d3882d268deaf977842ceddec44135d2e0d354cc575c3fa2d3ccb42b0f68b452c967cf8b2ef500d5c08249acbd4414b20c35 SHA512 b063d4c92bf245da67a09416db1ba7825d8f852247b00a9f6a0d0b5dc77aa6ceea3e60afb7709e35574018281370e2b5aec82fdd57bc8d9792df61c701f6735e
 EBUILD heat-2018.1.9999.ebuild 6321 BLAKE2B 0ac9baacc5a0131edfc317993e5c9cfd1546461cf86d5b15c0b77c170922013bb106bfc65603faf7dee2bcc442da6044329282ca2883938906d401b1a4cd2721 SHA512 6d9ed8fd03f8fe8da40d5f1da190de22aa08ca64e3921b6cd33afa0444d1cdb835dea6f203e0947b8a9ce21f481725c331a5c5e68ad0c675ff1bd461cc29bf7e
 EBUILD heat-9.0.3.ebuild 6629 BLAKE2B 6e3d59ece3798ee799c83ebcc58615f75b8a3cba3f29e2f56d75aff65e2e6ff420885599a0df3e836659eda3523f2b061294fff7fc690e24c6b9e36be0ce132b SHA512 1c02447c0125c764c300402a589415bbd7a493e2522309433dda5edf39df3be28b04fb25d9970aed808be53e0331c9a04252de7887d5f9c619d7f60cf3f25671
diff --git a/sys-cluster/heat/heat-10.0.1.ebuild b/sys-cluster/heat/heat-10.0.1.ebuild
new file mode 100644
index 000000000000..c3a89383e2c5
--- /dev/null
+++ b/sys-cluster/heat/heat-10.0.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
+HOMEPAGE="https://launchpad.net/heat"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.queens -> heat.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/heat.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.queens -> heat.conf.sample-${PV}
+		https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+mysql +memcached postgres sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.9.19[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/aodhclient-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-heatclient-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-magnumclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-manilaclient-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
+	!~dev-python/python-mistralclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-octaviaclient-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-saharaclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zunclient-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/yaql-1.1.3[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup heat
+	enewuser heat -1 -1 /var/lib/heat heat
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	diropts -m0750 -o heat -g heat
+	keepdir /etc/heat
+	dodir /etc/heat/environment.d
+	dodir /etc/heat/templates
+
+	for svc in api api-cfn engine; do
+		newinitd "${FILESDIR}/heat.initd" heat-${svc}
+	done
+
+	insinto /etc/heat
+	insopts -m0640 -o heat -g heat
+	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
+	doins "etc/heat/api-paste.ini"
+	insinto /etc/heat/templates
+	doins "etc/heat/templates/"*
+	insinto /etc/heat/environment.d
+	doins "etc/heat/environment.d/default.yaml"
+
+	dodir /var/log/heat
+	fowners heat:heat /var/log/heat
+}
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 0029b868cdd6..0ce9dcdecf1f 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -3,7 +3,9 @@ AUX keepalived.init 792 BLAKE2B a3e98861fbb9a193b4d63aabde8a44a041603b7983a02af7
 DIST keepalived-1.2.24.tar.gz 601873 BLAKE2B d2bbf6189f789dd2b61207e80d4262ca6ff8a653268e9d5f4dada7def7cc6ab7d8f8fd49d9b97b228922ff56495213a22c459a44943a92a14abd91b787c491a8 SHA512 a5e555dd955173887896155a04b1f6bb0c2f2a758008472abd5433b057be3fd85e4f270a7b7eb2f36a1c16e46b235ef930b1844938276528ff61bbdd783bb1f5
 DIST keepalived-1.3.5.tar.gz 683183 BLAKE2B 6242cbe61e8cbe80d094dbad3882b0116fc3cd129c5f0f082ec821d794dff53ab22a661feb1c11d2c5386bcea3c2727ed899ea2968dfa8a7ed4272b8596f0839 SHA512 ebd710167becd4b99b665877953d19477c11f1d1c736eb580a05dedd4946363b756553e20607f34aa6c35f57b7252d8a22287beedc316b62a745fccc4243a720
 DIST keepalived-1.4.2.tar.gz 738096 BLAKE2B edfd2c20b4de80a2e15d9598558b0ccfb4d6a7a7eace278ab97358691ed38485017ecca2f2934405930818b54e60f644c575dc4a320a9900bf81b97916268c91 SHA512 325282daea9c6dc9ec38ca405fcba3e55c07f6358c59fae5dc3422c0f987197658d39cda3ed6523ea29a356d74d09fe57e62411bd7498f5ef086cf191eb42fe3
+DIST keepalived-1.4.3.tar.gz 744680 BLAKE2B d9ea5ef277bb0d11c489bbc8770f46528f1ddde14b2e8fb72fdccd543ff4583426aa2bb214e00e3964518e726377b049560ed35daf38f4cafcd4e7c43a13b78d SHA512 bbf734123edeee4c807788e8db626975d7b626003ce2a6b901fbac3b7985b11c222db78e2806a7e7211980a748a6a302847736b14f3f8ed32b7337dbde6f4eac
 EBUILD keepalived-1.2.24.ebuild 1412 BLAKE2B 4319c70c9cf0acae2ed7e6cf283fee6aa86b2149367b94ba7500b5ac885a723cd6fc266f57c1e25618394f1f0ff114019b73c3ef1ea7fbf622870ee2a67973fb SHA512 3c4a6951cf0cb39bdd604af88f41f3895d5cf72c283d022b506c0fae841cb86adda7b11aa1d23247be17e26cd6cdf826fd45bae39b018f3477820a4dd2c26588
 EBUILD keepalived-1.3.5.ebuild 1532 BLAKE2B 273a9f41e4a1d190a6ffd882b230f95fdc536cfc7d92a1b1b8f0e465165d80de282a6f4bc1d2450b6cecf6ea6086384602e6f8d8a639ff0fba9ba1f4b6cb1b57 SHA512 79052c15fd3329bb2493fb5833d951f70620d04cbe4077964416a029fe9ec953732061f751913b35c7c64a1f73c230a6d0691454d18ba9610270578397fc52f8
 EBUILD keepalived-1.4.2.ebuild 1595 BLAKE2B d58bf0c8d4ca830f54a427886abc61fe3190460c9d70df3f4d5801aaedb6792bef21dc7bb96986490366558693014475a4b4fc021fbd9234e0770796be74c1d3 SHA512 19d32a2f32bb3b554ee727b6561e3514ba4e4d3e1a386d629e09b1d943260a50de8a866a50f20a2bfe3e70cecdccefc01c3160ac19377d2aac40e4169856e764
+EBUILD keepalived-1.4.3.ebuild 1595 BLAKE2B d58bf0c8d4ca830f54a427886abc61fe3190460c9d70df3f4d5801aaedb6792bef21dc7bb96986490366558693014475a4b4fc021fbd9234e0770796be74c1d3 SHA512 19d32a2f32bb3b554ee727b6561e3514ba4e4d3e1a386d629e09b1d943260a50de8a866a50f20a2bfe3e70cecdccefc01c3160ac19377d2aac40e4169856e764
 MISC metadata.xml 471 BLAKE2B 2dfba9fe3d7d39f8484baa1f1be9a59b5da8f6cc0da4a3af1ec07e5daf4f2522f802af51048463dfad54bfbffe0286ce8a3b9ff8889139ca32693bad378937e3 SHA512 203c93aaf60f7d0dcc6150fff2a4a3dd61fa4d6cfab26452d8efeed1d79096b17db7e47700582475b7e6607ae70521c32cc91015e7852dde22a7d828740946af
diff --git a/sys-cluster/keepalived/keepalived-1.4.3.ebuild b/sys-cluster/keepalived/keepalived-1.4.3.ebuild
new file mode 100644
index 000000000000..9ec3a8f5d741
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-1.4.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="http://www.keepalived.org/"
+SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="dbus debug ipv6 -json snmp"
+
+RDEPEND="dev-libs/libnl:=
+	dev-libs/openssl:=
+	dev-libs/popt
+	net-libs/libnfnetlink
+	sys-apps/iproute2
+	dbus? ( sys-apps/dbus )
+	json? ( dev-libs/json-c:= )
+	snmp? ( net-analyzer/net-snmp )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4.4"
+
+DOCS=(
+	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
+	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	STRIP=/bin/true \
+	econf \
+		--with-kernel-dir=/usr \
+		--enable-sha1 \
+		--enable-vrrp \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-create-instance) \
+		$(use_enable debug) \
+		$(use_enable json) \
+		$(use_enable snmp)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/keepalived.init keepalived
+	newconfd "${FILESDIR}"/keepalived.confd keepalived
+
+	use snmp && dodoc doc/KEEPALIVED-MIB.txt
+
+	docinto genhash
+	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
+	# This was badly named by upstream, it's more HOWTO than anything else.
+	newdoc INSTALL INSTALL+HOWTO
+
+	# Security risk to bundle SSL certs
+	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
+	# Clean up sysvinit files
+	rm -rv "${ED}"/etc/sysconfig || die
+}
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index d619df21c123..72b42eacc238 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -7,17 +7,25 @@ AUX neutron-server.confd 70 BLAKE2B 88309872ce864e4dfa9072c1472bd6f1e8116f71106f
 AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d75eab5f547be35fa5adb792db8960f71a98bbeb71d56b29e5f5166a47735ebe85804019aa4e1f11 SHA512 c9c7386ae8d97205859f02edb0c7d601059af78def3f232f87e676131c5e6fcdb6e880ccee5b1b15397b1dffe83446421145c90ed448f5e9d55994efd1629f92
 AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366
 DIST neutron-11.0.3.tar.gz 10504129 BLAKE2B 2c72bf33d8f8d11423c868f88c63ca65af399e9f2bbda86fcabef831252bcc000658dc5e4a12da8e3defdf8fe2ce1c54799c748ee2b60625b1d7f98e32098824 SHA512 ba55f119c29b1367e5c72fcd1357dda8cc40c63207aa2408890bd6986301b4859389b489a60a0f1bd6ff7f22cf2ec68824eb503bbf33e786b5a463c8db353eed
+DIST neutron-11.0.4.tar.gz 10501915 BLAKE2B 656b2e5c852462bdf3a37ce3a5b50e2e9c5fafca192af368483ca2b12c07f4cebe69e643948f85315a54c3ae01870b5439aa0b928b07d1b049bc5e38d56c2606 SHA512 9cf433c32fb7f2a63db393ee84f7e955d0abc8aa44bfc4e0be54d1874b1136068f24850bfb3f5d17197d8e3e6fa17bdea6e090537f340c30479876dd665ee8d4
 DIST neutron-12.0.1.tar.gz 10432512 BLAKE2B a83fc312be64d729027477faa44496a501c2658f4dcfdb0fde19a202682c02b96a00e3a5141e0d3473c287a896264b7df566dddb8165c7a415a4c5604e8f9821 SHA512 81fec08a1182722d24648cd0eb9b91365d7257432ecaa108cf73947c3073b0903bf95b5d92505ed66581a41b8be09a561d0899bac7f9ff711b15d16f632e1394
+DIST neutron-12.0.2.tar.gz 10436003 BLAKE2B 5e4eae5a25fd80114700b4a8145c582c834a8f123be0943c08dc8b05bd2fd9c7c1df46c5e06c17fe122396c06caddc98970ebd1fd29521efae2afb1361b3beda SHA512 d32af882eefc00fe13cfad41e116c4e300c5c0266952e8f2dcb1a0228311521d78ab6a280bfa5be1794728d3d6f15f4bf6836ed07c878e56bd0e2e13fbcb31ec
 DIST neutron-configs-11.0.3.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a
+DIST neutron-configs-11.0.4.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a
 DIST neutron-configs-12.0.1.tar.gz 26252 BLAKE2B c1493e313dc590445e60dcf8df9fc2b89a8e96e57ce072577b3a73fe247218a9ef9805ca9c61b79d2bd4c7aa088933762389258c1184e4572975db03c1674869 SHA512 05c8774d142a59da3e294f2351f1cc89f8cd275aedf3771c11d8176305ceec472980673f0ed07b3f4219a8ff4b4bb6e79f836a1f11ddd8e003d1ccd49051e5ac
+DIST neutron-configs-12.0.2.tar.gz 26252 BLAKE2B c1493e313dc590445e60dcf8df9fc2b89a8e96e57ce072577b3a73fe247218a9ef9805ca9c61b79d2bd4c7aa088933762389258c1184e4572975db03c1674869 SHA512 05c8774d142a59da3e294f2351f1cc89f8cd275aedf3771c11d8176305ceec472980673f0ed07b3f4219a8ff4b4bb6e79f836a1f11ddd8e003d1ccd49051e5ac
 DIST neutron-configs-2017.2.9999.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a
 DIST neutron-configs-2018.1.9999.tar.gz 26252 BLAKE2B c1493e313dc590445e60dcf8df9fc2b89a8e96e57ce072577b3a73fe247218a9ef9805ca9c61b79d2bd4c7aa088933762389258c1184e4572975db03c1674869 SHA512 05c8774d142a59da3e294f2351f1cc89f8cd275aedf3771c11d8176305ceec472980673f0ed07b3f4219a8ff4b4bb6e79f836a1f11ddd8e003d1ccd49051e5ac
 DIST neutron-ml2-plugins-11.0.3.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd
+DIST neutron-ml2-plugins-11.0.4.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd
 DIST neutron-ml2-plugins-12.0.1.tar.gz 7060 BLAKE2B 7690218233971ab50623900e01fe4311e2b599661838a232616cdc4b56bff1a7fd6e6c3b7fe77f79c78c024eb571525b0e21a306c18fd884bd0dfdd6b814f2b4 SHA512 259db5513c014c6dda97432834f90744dec3732292a2de71d488e537f0f660959ea09890cf3dd3d22206295b259dad83440a60ee28e84a5b125547f869e0016b
+DIST neutron-ml2-plugins-12.0.2.tar.gz 7060 BLAKE2B 7690218233971ab50623900e01fe4311e2b599661838a232616cdc4b56bff1a7fd6e6c3b7fe77f79c78c024eb571525b0e21a306c18fd884bd0dfdd6b814f2b4 SHA512 259db5513c014c6dda97432834f90744dec3732292a2de71d488e537f0f660959ea09890cf3dd3d22206295b259dad83440a60ee28e84a5b125547f869e0016b
 DIST neutron-ml2-plugins-2017.2.9999.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd
 DIST neutron-ml2-plugins-2018.1.9999.tar.gz 7060 BLAKE2B 7690218233971ab50623900e01fe4311e2b599661838a232616cdc4b56bff1a7fd6e6c3b7fe77f79c78c024eb571525b0e21a306c18fd884bd0dfdd6b814f2b4 SHA512 259db5513c014c6dda97432834f90744dec3732292a2de71d488e537f0f660959ea09890cf3dd3d22206295b259dad83440a60ee28e84a5b125547f869e0016b
 EBUILD neutron-11.0.3.ebuild 9554 BLAKE2B 03b6296076c3c1dccf94fab538d89c6613ff02eee300a06f02a402c88382087e4fedce5a56427fd8bbf18f92f65b9e1ba00b9bd56c25987c9e436e6cb1f489a6 SHA512 36cabcb0a50151ee6da36a09c75037c8b78be8c187572d0b88d6d61fccc9d53f3b29f1cfa7b05a0ba82aea3cf9094a13183e0676fd47bc8dc5ff986fb2623129
+EBUILD neutron-11.0.4.ebuild 9556 BLAKE2B e628161e306c32232fd59c54cc0cce5ab49c9ce641613d2c5539c413bdbc1c6168e5a79a699d1e0add66442c6a88f99d899ddbe15cbe9da6a1e79f78796e5d7f SHA512 3655b851f6e55baf96cc5a217bc38e3d2ec0adc0d355d7efdd13b225d5857e15907def35d0fcac358333f0f017688d54ce6bef0103ca596d998d1eb083b5e55a
 EBUILD neutron-12.0.1.ebuild 9618 BLAKE2B 61661d4e5cca92369117228484121034a509a3501f324ba157a15b51c2294df92a86b84da51f50947440a6e38aadf305624c0666452e93da9aa8094b5cecbe0e SHA512 970c675489590a1ede8c23321ec6d7b59382698c969ebb67b54b18b266af2806644d273e0ca7ec8d6ec3f1df0dccb0684431c69dd7bbefb8c5f9b722fa30c484
+EBUILD neutron-12.0.2.ebuild 9620 BLAKE2B 18c6def5f47aecd1f997e8fcd8993f66c0728ac46794487b0cf49e04ba876be8155f35be01325653c2c7aca13ba6bfa23265664c8f0116e2d63b1b72ce0528e0 SHA512 4e0a0eceec3e894295cd38f99d172b968032f49df9d633492e95909fb2d5cb0ffad190b77014ba84f8bc0f6a3102230969910d20ac45db43c7180de68c1b973d
 EBUILD neutron-2017.2.9999.ebuild 9578 BLAKE2B 8b9c4f2485d28faae0750908036507c9e562352332fdd13be3bfe8328ae6da2f65c40e440e08d551565b4195037d6b408af7a5fd7d64af27264c989432267001 SHA512 6799d979e5bf66e30ab5b057a1c68b159d0a4aca802a6aeafc137aa53a5bf5367cc51aac3cd0295f0b5c8b15ecc2f65ac7165306d12b0c18669c735df17cbe0d
 EBUILD neutron-2018.1.9999.ebuild 9620 BLAKE2B 18c6def5f47aecd1f997e8fcd8993f66c0728ac46794487b0cf49e04ba876be8155f35be01325653c2c7aca13ba6bfa23265664c8f0116e2d63b1b72ce0528e0 SHA512 4e0a0eceec3e894295cd38f99d172b968032f49df9d633492e95909fb2d5cb0ffad190b77014ba84f8bc0f6a3102230969910d20ac45db43c7180de68c1b973d
 MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/neutron-11.0.4.ebuild b/sys-cluster/neutron/neutron-11.0.4.ebuild
new file mode 100644
index 000000000000..31873ce376e8
--- /dev/null
+++ b/sys-cluster/neutron/neutron-11.0.4.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
+
+inherit distutils-r1 linux-info user
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+						|| ( openvswitch linuxbridge ) )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/ryu-4.14[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/ovsdbapp-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}]
+	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
+	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.2.0[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/iputils[arping]
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	net-firewall/conntrack-tools
+	haproxy? ( net-proxy/haproxy )
+	openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
+	ipv6? (
+		net-misc/radvd
+		>=net-misc/dibbler-1.0.1
+	)
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
+	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g neutron
+
+	doins etc/*
+	# stupid renames
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
+	doins "etc/rootwrap.conf"
+	doins -r "etc/neutron/rootwrap.d"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	# add generated configs
+	cd "${D}/etc/neutron" || die
+	unpack "neutron-configs-${PV}.tar.gz"
+	cd "${D}/etc/neutron/plugins/ml2" || die
+	unpack "neutron-ml2-plugins-${PV}.tar.gz"
+
+	# correcting perms
+	fowners neutron:neutron -R "/etc/neutron"
+	fperms o-rwx -R "/etc/neutron/"
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	insopts -m 0644
+	insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
+	doins -r "neutron/db/migration/alembic_migrations/versions"
+}
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-cluster/neutron/neutron-12.0.2.ebuild b/sys-cluster/neutron/neutron-12.0.2.ebuild
new file mode 100644
index 000000000000..efbe01b7fe33
--- /dev/null
+++ b/sys-cluster/neutron/neutron-12.0.2.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_5 )
+# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
+
+inherit distutils-r1 linux-info user
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
+	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+						|| ( openvswitch linuxbridge ) )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/ryu-4.14[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/ovsdbapp-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}]
+	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/iputils[arping]
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	net-firewall/conntrack-tools
+	haproxy? ( net-proxy/haproxy )
+	openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
+	ipv6? (
+		net-misc/radvd
+		>=net-misc/dibbler-1.0.1
+	)
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
+	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g neutron
+
+	doins etc/*
+	# stupid renames
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
+	doins "etc/rootwrap.conf"
+	doins -r "etc/neutron/rootwrap.d"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	# add generated configs
+	cd "${D}/etc/neutron" || die
+	unpack "neutron-configs-${PV}.tar.gz"
+	cd "${D}/etc/neutron/plugins/ml2" || die
+	unpack "neutron-ml2-plugins-${PV}.tar.gz"
+
+	# correcting perms
+	fowners neutron:neutron -R "/etc/neutron"
+	fperms o-rwx -R "/etc/neutron/"
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	insopts -m 0644
+	insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
+	doins -r "neutron/db/migration/alembic_migrations/versions"
+}
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 379442572eed..c082882c88f7 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 7bda179bec3b..09712b010047 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,12 +1,8 @@
 DIST crossdev-20171230.tar.xz 23016 BLAKE2B 4661b3f9fac314b7346f0de7227d12ae2d6851e448f6d065471499df8ada5d699ef91c6b6bca285b2aefcbf67ab351fefbe9344c0884a7c0d33ff27215c8ed9c SHA512 bf8761a3018790501adb4bb173e3281d1d7628de8f65a1aa5df0b328a4af8088be466dbe8c185e7ed44aca31b078320a4f62c56351f4b7cbf832349184d9709f
-DIST crossdev-20180105.tar.xz 23056 BLAKE2B 66618f312b6f9492b1ccbdc7142e6b38035bb52f864a53d5b6afed702f31dcad11d647af68239dd6cb1af06b7eee5046507cffb03aabb27f758d0513ae9aa888 SHA512 f10ac454a996268e0bf798e2e322961873f3666c032f0ea3a0bc88eabd0428d894726726b089ca180ff9b718b5041be136c28a572ffb31fde76b8ac58a8fc1f2
-DIST crossdev-20180120.tar.xz 23328 BLAKE2B a95b834f2b5c0cfad178a2795ec650c2461c6462f4aad239e55666f4503e2607410d5fb318a2fa59d01271475e6d4438ca399ad6565632610ad51ae0142ea5c0 SHA512 7b57f4eebec3ddf6460fb3305a124c670c79d6d4708e45314fd4e68b47bfdc9617f2dbd8c1c30af141fe43d4afc001615b1574e155fb5685c703f5e17149c3ba
-DIST crossdev-20180302.tar.xz 23368 BLAKE2B 1bd93ca8dc1c65d1c5cbc095a84540e0a09f666674d87e56ff051900e1f3ab60a087a61734c86406d3f8160469c20e161b940ca19b1f4da318461d02d7915ac3 SHA512 f1b5d066851c54e84c1bb58f261655be2e5ac4c7a247831f4c45186574a306e839497b5a72cf9d603545c01b52ef3ee47b6c7c90086217268572697835fc7f1e
 DIST crossdev-20180410.tar.xz 26716 BLAKE2B 67f47052af4299028470613900e7f1b91fd2b861cce71d2a4b40bb1bf16a7b9b8967eed18dabcca819d89cfb30cbf1253498b2ef9eab8d941a6d611d333b6d65 SHA512 2e70f8c01e7b1484e76dee82fb3342cbcbd60ee3458e2c6acf5b642e01be95546fe03fc00c82d59fa871aae9f5a6728f45f9f7cb4bc27c4cdf56c4fd8a93b754
+DIST crossdev-20180508.tar.xz 26728 BLAKE2B ab92cac544ee787ca91c794191c51faeab99e88bc2fc695c5e913e4137cc941457f5b27bf22f3b6a7991fa46ebdc2e5b4238a01425c5021fa9fc05ca23c51f49 SHA512 a96afeeb03747ce67a39b53b925361d07117b49316b5c657413125413d006de25249b0d3d1804c8a946c288c80beb42aa7c32362b57ac81399d26a67ceccfe04
 EBUILD crossdev-20171230.ebuild 854 BLAKE2B d10029ed5c6d5c9333a949d3d0a9df31a3b5b180328036c90188ce326bc83a3801638379a6b856010fedf04ae12ebf14e9a8953084acec7ec87dc889d21057d2 SHA512 955cee7f5bb76c933c2c206d65cb6c25ba78725e6f414a0860fb9c09d244221837a2ac25767828c97acbff46b6d3241582ba0a54f2ebcc31d34ed616d1ce8a33
-EBUILD crossdev-20180105.ebuild 867 BLAKE2B 5f004170eb7dd1b3ab4d1e95227d2ce85df8dd4370252e57b40581843372bc82126b69cf6eb81be6597d7b535b0fd6ffe28333b4a50131506047cc47024ed677 SHA512 27a6f7bcc07db27cff19b0b894c976a0dc2d1acffda8a76708233f9acbe8c6b8024f5665087b470593890bbab47ed154a5866cf698591ee471b5d73733b4aaae
-EBUILD crossdev-20180120.ebuild 867 BLAKE2B 5f004170eb7dd1b3ab4d1e95227d2ce85df8dd4370252e57b40581843372bc82126b69cf6eb81be6597d7b535b0fd6ffe28333b4a50131506047cc47024ed677 SHA512 27a6f7bcc07db27cff19b0b894c976a0dc2d1acffda8a76708233f9acbe8c6b8024f5665087b470593890bbab47ed154a5866cf698591ee471b5d73733b4aaae
-EBUILD crossdev-20180302-r1.ebuild 905 BLAKE2B 725bb647f16d86cf8ee74d6c90f35d23321899e331059b14ff7e151e92a7a82b9e1f7ddb30be162d79f38d8b2d7e249c35a1537640abc40b13775b8fe7102f42 SHA512 c962c298ceb6f6a7ab1307b916ec66274da802fd1ee1bb35ae02c18bd069dd86ad8c2ddd55b23421cfc77bde8ce6136054e7888f4a2223f1d7936b8648247b5d
 EBUILD crossdev-20180410.ebuild 905 BLAKE2B 725bb647f16d86cf8ee74d6c90f35d23321899e331059b14ff7e151e92a7a82b9e1f7ddb30be162d79f38d8b2d7e249c35a1537640abc40b13775b8fe7102f42 SHA512 c962c298ceb6f6a7ab1307b916ec66274da802fd1ee1bb35ae02c18bd069dd86ad8c2ddd55b23421cfc77bde8ce6136054e7888f4a2223f1d7936b8648247b5d
+EBUILD crossdev-20180508.ebuild 905 BLAKE2B 725bb647f16d86cf8ee74d6c90f35d23321899e331059b14ff7e151e92a7a82b9e1f7ddb30be162d79f38d8b2d7e249c35a1537640abc40b13775b8fe7102f42 SHA512 c962c298ceb6f6a7ab1307b916ec66274da802fd1ee1bb35ae02c18bd069dd86ad8c2ddd55b23421cfc77bde8ce6136054e7888f4a2223f1d7936b8648247b5d
 EBUILD crossdev-99999999.ebuild 911 BLAKE2B 4ae5b9af089c6ff5911dd16b91144b403ab40676dbbfeb93739835084bd2f8dc8b01c157d7042bef68c6620c2ff387dd76073dc26ebf3267a6b618bdbc806485 SHA512 0c495670181efe2b105768c7715e55d65a487ccaa3c2fd4ebbe5272e04425c40aec365ce3a248743b97dec49446ba07cda0d7d7f17dec94297c36182a9c456a6
 MISC metadata.xml 356 BLAKE2B 2220babfa5cc38c63a0e8361b84d1f3b288e5d050fd587562cac160621a60efb109df5af98b6108c1cd442947911d76db38cc9b82ef83c7a52553d5dab231116 SHA512 9b90e3370e18885739fad8a1ff7fd420eae5cf188fde84e8aec8002bbbc390291bd37481e308ad584d33e643e9d17a47000c8ce0852780ff18c0bfddb7327cae
diff --git a/sys-devel/crossdev/crossdev-20180105.ebuild b/sys-devel/crossdev/crossdev-20180105.ebuild
deleted file mode 100644
index edf23ce34c9b..000000000000
--- a/sys-devel/crossdev/crossdev-20180105.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20180120.ebuild b/sys-devel/crossdev/crossdev-20180120.ebuild
deleted file mode 100644
index edf23ce34c9b..000000000000
--- a/sys-devel/crossdev/crossdev-20180120.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20180302-r1.ebuild b/sys-devel/crossdev/crossdev-20180508.ebuild
index d1adb4564b57..d1adb4564b57 100644
--- a/sys-devel/crossdev/crossdev-20180302-r1.ebuild
+++ b/sys-devel/crossdev/crossdev-20180508.ebuild
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index f495c6430830..edb0253c8864 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index ab6900f3b4d6..1c0176617d4f 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -4,7 +4,7 @@ AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a
 DIST eudev-3.1.5.tar.gz 1745524 BLAKE2B d030e78f8ef751ac1d677f50200898fb2089940a7d8a828080059fb6330012e615638e47ba21dd6b35fcf89248783d20e47387b8f009f7f4cc1f3fac203e6f58 SHA512 c5192e085ca4230aaac918e701989b712e5bda1558db31eb6ba635c17c4bdff398458d51cefbc5fb77a7c775ec1e04b1dbe019b8314cac3f43a5c1ae61521b5e
 DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c
 EBUILD eudev-3.1.5.ebuild 7208 BLAKE2B 845b3c538f77c1bbee8c74ae84fa58d5883bbe3e97e96e90c00dda74c8b24a2a28b676f8893269aba214c60e212104b3f28dfab4070bf3e1c9b022d46e7577ef SHA512 c3b94258f03fb86cdf2d1f0ca89a8496a23d43df1da865edeca4122dd259c0be8d0203be45ed37b00daeab91d4abf9805a82a2d1483ff94a2c197768884bbe5d
-EBUILD eudev-3.2.5.ebuild 7191 BLAKE2B 58532c776a4e25cbc9994f69686a746e600d948df58fa7f90074ab42e49373fe5bd4dae0686347e24ede2dc416cf85c1340499b4586c0315a130bd8334b3b556 SHA512 07990a1553f3b395dabdc638fe1c2ca5beaf2dad3ff5cb6800ea138229bc3dee5f2f9ea2a111cfd452172121cb27e9b34a647014b9b4e1792f1856843730f03c
+EBUILD eudev-3.2.5.ebuild 7188 BLAKE2B d2361c8fe050393e2e5a72a6cc1a3a8b511b3fb544a8b3546bab49923806bb77e15d7fb98774a15c4eb66766e3fe77076da063695f4bd94ae7abb954b9cdcff1 SHA512 df1a850655f16c12736fd023205ca6d78522afb55f15ffb7732bb4d4e2621c4a777f8bcc263b004775670566cd758ce9f395b245d0618303afae235a43e6c4a2
 EBUILD eudev-4.9999.ebuild 6488 BLAKE2B 2ceafba483af00e76edd7d07a92ecd6036a3e99723823384928731ec6080e3e86a0dddf548a4abc1da097d247e0c54842a0ac6c9d2a639d9715c6e1568ff28cc SHA512 95f43eda615a37307c25ad6dd1997070ff5efcc936752611546542b07a242ce1a4299f775758d7f480fcbf55d25da764bcc43e2c3f9f0c10fd9083c987aba9e8
 EBUILD eudev-9999.ebuild 7198 BLAKE2B 839f4305b8dde6aba52a463d0053928f63ac5d2ab4ecc773ffac442de82d1f52c7aa6839c95b57a04b8fd021be7d49566f05e039113f5c4b2e76851147756b0d SHA512 5f4652feb5a4aa3166471513405ee08e1b5bff7de05f29dffdb88b76a5eb841f52f557d18f2104e6e8e0834d1a2bb5f5b26bf3eab6ca1cecf782c409341929e9
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index 53390437fcef..26b5186f7216 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 0221e0334c10..3e4ef446ba6d 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -20,6 +20,7 @@ AUX lvm2-2.02.129-static-pkgconfig-libs.patch 3299 BLAKE2B a4495bfca4892036a03bc
 AUX lvm2-2.02.130-pthread-pkgconfig.patch 915 BLAKE2B a82e3283e633fbe0e47f4ea94f3c1e975dcf1c2e6cd1f93d16e4d08516d1f0f49f63227e42cac5bcf5ccec473c679098cdb114be22fb9432c38325fa96db4c43 SHA512 1e45ccb3bf824fd2f8276b4ca103e95960e401e793944af68a16929040015b42d601b09adbb8f01e833071d501440a20381fe263fd1884d8fb2e7d7f5463da6d
 AUX lvm2-2.02.139-dynamic-static-ldflags.patch 2874 BLAKE2B 2a0000761b65f79cef0bd1537b6cf99fecd86baa2cd7443eccedbd8e546c84185e99367f1e391e33cab081d7be9153abcfd53492a48d2988aad7fddf5f9705b6 SHA512 3486c6d0500f233cbedfe28a2c20f03e4a80301e011fa0fd41b3765eed71dc5e00c8f6f09d40c3702ea87e372db3e4dae64c32e4ffe45700bbbf137804b748fa
 AUX lvm2-2.02.145-mkdev.patch 4111 BLAKE2B 478c987c900c4ccfe3bb7d099b8af580f057ba6f4746644560c55e4e1a3894c617c31357e88525f728db005e8a882b2edf18576370d73eca026ee0563c02444a SHA512 f3953eb8bf73adc8d048edd2c560fad3c5afbfcee19ca354f06de2b10ea2e947c972cd180fa26cf0d3dc30b5aae8946e79faac3f3a1cfb6f31222244d308a588
+AUX lvm2-2.02.171-static-libm.patch 525 BLAKE2B 5cef02547acdfe24fb26cd96a0bd6eccb0c5cbc5ae79ed4aa0d52ad94391f5ddfede194484f2a9c00add07df7fe69e43f1d122c41c8fe05a91e86f797f4e9759 SHA512 498132b93e482739bd7bf11ee457b837843dee951b66fe268411e7aabcaad373c6c9a0d43083940c85348c506eda2d0d49a3aee205110388e18f9b58a6d6ef1a
 AUX lvm2-2.02.172-static-pkgconfig-libs.patch 3851 BLAKE2B 87789e011380ecb5336373e47266f3e4cd6d617ab68763418c488a8a7d0d5cb14bba5bbf2710d5f9c30a6f9dd947cfb929f98f7f0e54f38a6d338f8f22466e14 SHA512 15e031c22f96d3a12e985129ccfa24e91edbbf30741a8075f089ae22f482f9b0c41f39d3c92ba41dde34a7afb505e0816347d385a9eb5d7692ad63053aabe79d
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 BLAKE2B 5533ceb7a601d58995e7a90b1355508907edb30d14704b397a8c8ba0d66dbcd3d6b02ace1cadef1dfbb1d927449403f76f0f38e5d034344b3232deb512507cb6 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 BLAKE2B baf7010b5965f5c2b9a32ec812cb259cb3ceccea0d56e48d75e9f8e872634913f160fcfff0c2c77854ddfeaafb3b48bbca16d569041ab6f45aecb950f8e5bf4a SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c
@@ -54,7 +55,7 @@ EBUILD lvm2-2.02.145-r2.ebuild 9619 BLAKE2B 4461e5fee86d087e94fa8d64bbfe73f746eb
 EBUILD lvm2-2.02.145.ebuild 9633 BLAKE2B 73d08c486afd126faded9b1b0a080843dd941b73d5bdc3e3e95025d4626fc1932abd7e8a639c7173a140981c5f7aac6819ee841c893b86c1d1f2c74ab46429ce SHA512 950229bcccf673055c61b7c84b40db9ac8220a0f5de5cb8e623596944fe521ffefa50240435a03fcaf52cb8b9dde326b68e84e1b74d31396c91655d554be914a
 EBUILD lvm2-2.02.166-r2.ebuild 9768 BLAKE2B edb77874168616ba8dd58e3ed009d327c69501f433bb54186f584b2f8ea2ee54a3f0cde958ba7a522a4a6642aaa48ad374ecfaee32a69bb2d997c1afc3b32d29 SHA512 a146b1562961b4e5d5f2763da049c38d213370ef77316c6d533c4060e5a9f3c3711a45e16d849b9e72d6c91d5bc90d45f12c0ef71d7340540f5d4f41951b64ee
 EBUILD lvm2-2.02.166.ebuild 9604 BLAKE2B 33653c1fce1b23faa9ee71bdd8d6b31eaeae834b357f41340545eb8d34aad79723c24e88da49052ee928dc911c6c610450b082721f02a30d65056110934d6e92 SHA512 5a1340aeda463ed0abf23b7b9d87e2c2c8ee42306f78e0a3b739a2523fedabcdd5b635e4ba29ff5e81ff39ca60f698ff2d17522bc0f95bf0fcce6efb4e4c7d32
-EBUILD lvm2-2.02.171.ebuild 9799 BLAKE2B 7acf943d96adb8989d259ff89bbaf8741ed5b9d8ba1ca9be2a08ec7071591d3c31902cc71fecd1feab0c35a6b270f2ec084818468fe44fca13191696de41941f SHA512 a2f6d9bb2c43acb986f9dc852d9243ed0762df1dea9159d1ec3dfa17652c8f9b97afa06871ed3bb36d57bfdb2a5821abcbf74256d6fd05b69cc157cbb9034488
-EBUILD lvm2-2.02.172.ebuild 9796 BLAKE2B 0bfce02edd0e2ebac9caba4140511d87b4d7d1383a2531c0e790709e22cffbe02d3a0e825fef7eba4044cf3054eaec92ac1b626002e97a1ea13a13912dc6a179 SHA512 0c652a30ea2547cec662942f642e9c54dd2be02f80f58f46dcaee3f4745044b78df424c809fd436648ddcaf9a97222d32c0c1bd8efd799e557e9b98d05d4f0af
-EBUILD lvm2-2.02.173.ebuild 9796 BLAKE2B 0bfce02edd0e2ebac9caba4140511d87b4d7d1383a2531c0e790709e22cffbe02d3a0e825fef7eba4044cf3054eaec92ac1b626002e97a1ea13a13912dc6a179 SHA512 0c652a30ea2547cec662942f642e9c54dd2be02f80f58f46dcaee3f4745044b78df424c809fd436648ddcaf9a97222d32c0c1bd8efd799e557e9b98d05d4f0af
+EBUILD lvm2-2.02.171.ebuild 9855 BLAKE2B c9ed62da556d3f0165daf864008de813622502cf35ed3d403d6c9535684684b3512975b7fba3cd47a3048ca1ed13eecd489820864b03629c8cab09407fe6bc6f SHA512 6c02e75cfda0bcfca75f000684cef95a5a75d660ced99b05627ec5ac2a3e1fb465b8aba4e1a10da9b7ab1099a93657b5713604096c345f6023eead92425f409e
+EBUILD lvm2-2.02.172.ebuild 9852 BLAKE2B 8a251dd367462db174bf68e71cc04fc0a78a73ceb2b71628a760354f7481a24fbe26bcf2305644304251aaa680da5834f4da80616c867e2ba6c67d6e26e081de SHA512 1eed4c5085e56a7fd766d399fb9ff4d22af52ce691f7af31905b333ddebce39aee8d6d635528d65b3a19d3d17fc13017a111aeef024d08fff928ae013171cd52
+EBUILD lvm2-2.02.173.ebuild 9852 BLAKE2B 8a251dd367462db174bf68e71cc04fc0a78a73ceb2b71628a760354f7481a24fbe26bcf2305644304251aaa680da5834f4da80616c867e2ba6c67d6e26e081de SHA512 1eed4c5085e56a7fd766d399fb9ff4d22af52ce691f7af31905b333ddebce39aee8d6d635528d65b3a19d3d17fc13017a111aeef024d08fff928ae013171cd52
 MISC metadata.xml 1397 BLAKE2B fb780193c777b248648d09cc4c0f287f07b64df79912a4c1c37b5c456f8fc8ea98470c03501619432bddb5df1e3f877178a0c7e630b295a01a3bfc27fa63520e SHA512 1ed97dbef323b6703097c20de99e9003c88663a887bcf87c9489baddfa180aa3d8645e4e60cd3eb3b9505603997ac3ab98a7ee96a813b77b9dc25862dd332d35
diff --git a/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch b/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch
new file mode 100644
index 000000000000..1cbf956db258
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch
@@ -0,0 +1,13 @@
+diff --git a/make.tmpl.in b/make.tmpl.in
+index a40eaaa15..7eea943aa 100644
+--- a/make.tmpl.in
++++ b/make.tmpl.in
+@@ -53,7 +53,7 @@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile
+ 
+ LIBS = @LIBS@
+ # Extra libraries always linked with static binaries
+-STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS)
++STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) $(M_LIBS)
+ DEFS += @DEFS@
+ # FIXME set this only where it's needed, not globally?
+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
diff --git a/sys-fs/lvm2/lvm2-2.02.171.ebuild b/sys-fs/lvm2/lvm2-2.02.171.ebuild
index 63f12d1d8cde..fccd403cbc94 100644
--- a/sys-fs/lvm2/lvm2-2.02.171.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.171.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
@@ -66,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
 	"${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
 	"${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
+	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
 	"${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
 	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
diff --git a/sys-fs/lvm2/lvm2-2.02.172.ebuild b/sys-fs/lvm2/lvm2-2.02.172.ebuild
index 4c21fcf3446e..0d9e8e6dc479 100644
--- a/sys-fs/lvm2/lvm2-2.02.172.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.172.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
@@ -66,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
 	"${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
 	"${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
+	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
 	"${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
 	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
diff --git a/sys-fs/lvm2/lvm2-2.02.173.ebuild b/sys-fs/lvm2/lvm2-2.02.173.ebuild
index 4c21fcf3446e..0d9e8e6dc479 100644
--- a/sys-fs/lvm2/lvm2-2.02.173.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.173.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
@@ -66,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
 	"${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
 	"${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
+	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
 	"${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
 	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index a0405cd90828..50dfd9b25f91 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,11 +1,6 @@
 AUX mtools-4.0.18-attr.patch 1804 BLAKE2B dee4d21870fd9f633ef8966513960b74a1fdaf61b23e38e10b77a6ccb5240ca31cf985f56becd05f1880b5389b77476a432937e00dc04b0d9478b6d85df73f60 SHA512 45bc3d5baa37c634b8f97d55251a7dec2f7062515529c0dec65572826ff2d7673f189c544fa73d164156823cd3ae78bcb664b3fb22e5eac34198fdfe45c9e244
 AUX mtools-4.0.18-locking.patch 5744 BLAKE2B 509462f40e2a832d1a04358972d606d29d6a0b5d7d095438d1c17bb8b7636aac382f9bb0055e669aed661a89bd6e018f1d88a588f0bddf701e5c0eb88449f94e SHA512 0698b5c5f5d4c22f3439a835c3bb6f73a90c3030073f3497fa04a8e29241af867f664f253b37299d69ca043858b55e7290aaab1fa6f751084a52e7812cae4170
 AUX mtools-4.0.18-memset.patch 877 BLAKE2B 5a331eb50cca56c64c135974b56bcc651e6f7498740cad8dc4c5121efe23802a228bb73e5f18ee20b0e3ef81ea6ebd78cc19e037556f0294519b54a84697f993 SHA512 1e8d697c1cd98a7fedaed96e6019b6af96bf5ed6633f50f7c45649555a27727d93ba828e2852f23fb633832902bdb93c23afacd7022c72adf5c4a146f5b8a1a8
-DIST mtools-4.0.15.tar.bz2 386339 BLAKE2B 9b93a5a4cd402b7a2c2fc7c9c4aa25d1548d0bef6f3801f8727a6312ca795142398de1c33f78fc992eb89637c4dbfb4a03d639e30bf56c88eadc2310451ab3ca SHA512 0ee4d060ffb95c0e5b0e859634bee50e056aaa7d3917fdbcc4fd8ca86710b1d93ef252bec588d5c010f2fb6081853e76338b966e4584e510728be4ec3113e0da
-DIST mtools-4.0.17.tar.bz2 412310 BLAKE2B 08edc8f18e5b6f8f35008f4b1de51726eeb4b92b8d39d40bc28299509069350cbe6f26ec9c575c062533154844258548149f3796e00d2a20a28912ab21a3fbe3 SHA512 0ad44bc9d7088d8a0edc648ac81fb4c9ea522c8d7561717f02475514186081050c283c0393bf32358b95ea60554713c26ea7e06074041d3fbdcaf642aec2e1ce
 DIST mtools-4.0.18.tar.bz2 420190 BLAKE2B 92fdf8b054287e3cb4eddb40c98f5ac4229a38473b633c25ab74a07a8a72d38c2767ae648a35cf0dac9dedfa2f7789afc4904a50e1328e2baa0a289d93b094fb SHA512 3981a4727aa4e2ec5c931201b236f52fcd1c9d55f888cb2fbdc5c4172402e2b229ede9a5005b972ffdad59bcb861e2fcc01404845e521116419079ae78239090
-EBUILD mtools-4.0.15.ebuild 832 BLAKE2B ecf428ecd0841e31755b8990e130ad026d6502d6aec680ba921f8d4b3e6da578305ec3f3f7769e2ad3911d89e34219e5e49a3a37141dfc006efe329dbae32178 SHA512 9a108e56611864710598fb7d624305aa2f3efd4cf85dad7ee9a7a71f57645caf9604fc42295ae4c1f66fbe30bfb2494ba199b84b0336ac2e976e2b9be33c1ecf
-EBUILD mtools-4.0.17.ebuild 901 BLAKE2B 06c1ec452ac4fee02f17c9167c2f2d8814f3cb18452246cf9fbf6d6a8a1f1d9c985c1bc9f8b7fe80f4be841472da932107f23da4755fef4e0ed897ab772a34b1 SHA512 047da0fb150a4e9196bafc7731f4d6ea5456284923b64f9735c56f554c5692b677e4a16c7af91d2feec76fd2dd04b3d97617a03289bb5c38533782991c354246
-EBUILD mtools-4.0.18-r2.ebuild 1443 BLAKE2B e052a7c28cfd923440fe8a3d20ff904e14c4fd58dd0c1c416ac558129b3dc649bae16d218c0611972cf25631a5e5300a69110e9f4b81990084647580f334decd SHA512 dd92c3ba61242d36f5dcc2561e6bcf9cbf18b4ccba2967e848882c70af0de51dbadaae392f7c90de080ece123b555a44b3a9ee3e6b059b9685c230708e049046
-EBUILD mtools-4.0.18.ebuild 1080 BLAKE2B 5617ceabdfe6f8536cd94bb86aec543ed6f8ae81396291c661ec72a235aba12b27452b57fb87e8912d7d5394379ffa097e0223949f8c208d5a7bb10c7e8c2a52 SHA512 f777db7ae901411b303fe9259ad151b16145f1576fbf71429cf6242b1e10b9347943fdd38de3c995f95c34d1150d33e6377f276fde6b3a6c364a82eacf1e96d4
+EBUILD mtools-4.0.18-r2.ebuild 1442 BLAKE2B 7aaa093e1f1bbc4df2201b1c66044141914cbf49479cbac748026604ead012f986dc5228340448d60aa169023f6f5b7a2d5d826e19bf5e2618059ab8bacdc4af SHA512 32a807769bebeffad14f2a366e5536cb9b055f24cfa3a15508267eb88e4015f33713e8fa338078834942fcfc0d44ac22e15bb3265f45ab96420466ed4c1b77d5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/mtools/mtools-4.0.15.ebuild b/sys-fs/mtools/mtools-4.0.15.ebuild
deleted file mode 100644
index ac63b4f3c75a..000000000000
--- a/sys-fs/mtools/mtools-4.0.15.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools
-
-DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="http://mtools.linux.lu/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="X"
-
-DEPEND="
-	X? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoconf #341443
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/mtools \
-		$(use_with X x)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-	insinto /etc/mtools
-	doins mtools.conf || die
-	dosed '/^SAMPLE FILE$/s:^:#:' /etc/mtools/mtools.conf # default is fine
-	dodoc README* Release.notes
-}
diff --git a/sys-fs/mtools/mtools-4.0.17.ebuild b/sys-fs/mtools/mtools-4.0.17.ebuild
deleted file mode 100644
index 126e15a993df..000000000000
--- a/sys-fs/mtools/mtools-4.0.17.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="http://mtools.linux.lu/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X"
-
-DEPEND="
-	X? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Don't throw errors on existing directories
-	sed -i -e "s:mkdir:mkdir -p:" mkinstalldirs || die
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/mtools \
-		$(use_with X x)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README* Release.notes
-
-	insinto /etc/mtools
-	doins mtools.conf
-	# default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${D}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/mtools/mtools-4.0.18-r2.ebuild b/sys-fs/mtools/mtools-4.0.18-r2.ebuild
index 30aee0d41f12..2f563ba20434 100644
--- a/sys-fs/mtools/mtools-4.0.18-r2.ebuild
+++ b/sys-fs/mtools/mtools-4.0.18-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 RDEPEND="
diff --git a/sys-fs/mtools/mtools-4.0.18.ebuild b/sys-fs/mtools/mtools-4.0.18.ebuild
deleted file mode 100644
index 20531ff7b2d8..000000000000
--- a/sys-fs/mtools/mtools-4.0.18.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit flag-o-matic
-
-DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="http://mtools.linux.lu/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
-IUSE="X elibc_glibc"
-
-DEPEND="
-	!elibc_glibc? ( virtual/libiconv )
-	X? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Don't throw errors on existing directories
-	sed -i -e "s:mkdir:mkdir -p:" mkinstalldirs || die
-}
-
-src_configure() {
-	# 447688
-	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/mtools \
-		$(use_with X x)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README* Release.notes
-
-	insinto /etc/mtools
-	doins mtools.conf
-	# default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 74e123e4c8e2..045c25feabc7 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,7 +1,9 @@
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
 DIST zfs-0.7.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7ef215f735180406a7fc0d4d3c9700a41e855186d8044b304c9f0c142c2bdca387299c499974e424965970a4 SHA512 cdeabe10acd2feeeff8a6362987c757b716bfea6ebad42ce022a081106661f774150c113bdaa9e1ac441efdd6da4cf11e6119323ad60ae15ab445a872d952e35
+DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa
 EBUILD zfs-kmod-0.6.5.11.ebuild 4074 BLAKE2B df23fa2f450b5d34c64999eab10444fe61fc1dd0b40a51eab9ebd3b0f5f5e4872ff527f1faca9cb7e5d35e98a1d298c492bd61010569c96aabf4e89592172415 SHA512 eced2fa76df06d6ee4755d56149c632a34c0ece67851991ce75c44a97b37668c3d3eebcbbfdddbec477476d41fe50bc2cb6cd6166269a2e4cc4cc92405c92c7b
 EBUILD zfs-kmod-0.7.8.ebuild 4053 BLAKE2B f678c78a5e4c13c2e6339c8b859ae396d62a1403a895b3a53677f5999f63ff08c608e382c51b7bde0e7a4e092eddbca90d84ab808a105a7923a81cd6d18815d0 SHA512 863030a139ca6f7cb0e4a8dbe870fe6123782b74b8ec0e4353ee3020512922663b11fc3b374206a52fcbcf114ccfb9002ba5a895398981e562ef09f4f5b87db6
+EBUILD zfs-kmod-0.7.9.ebuild 4054 BLAKE2B 31c851b48ef27afe5e61bfa7ad58886db39a2ab617a79b5fd47a6032e603e60592a70956a8b3054ea9e5b96dcd3de8dc3a1d8a9675b66d063012779c2e80d831 SHA512 7d3ecd5f918c45242d569f094ccee38d319d0acee8eca375374ed2128662e264f44e772487d813517ce519ac8077fbffb974ccb7d8e929bb7b35b696cd8e3eff
 EBUILD zfs-kmod-0.7.9999.ebuild 4133 BLAKE2B e4863fb198b74a1ba2417caca7d1d817d23423b8d8c1da2d65d422bb9c25e59ed6aff0fc15f7037529e491dee71f06b05252cc7305a9ae4b7383969692977f80 SHA512 2ae7acae2a3f4f8836dcbbe2e30773f966204e568bf4754fd0d7225052508ab9b0f90c8eab0974b1436472642cacf652da6e1db2216771f58c962a0f9a6a06a7
 EBUILD zfs-kmod-9999.ebuild 4092 BLAKE2B 9aff1a1edb78f8c445ae022c153cf8c8afd524c97e47542f74b11f6248642a638f81c03a6403376b6d92c51512abd9238806c81eec33acc52dc682706fd5191e SHA512 f8d8674dd7ff3692735f242c3634671a617ae0e2de6530dc380ea58292f9a6c9d5829f4b0548e677471224b2fe9796ba11ee069d2bf66bb5f9611a3acbcd4b2e
 MISC metadata.xml 554 BLAKE2B 3f2673ca745f69a68210ee7e14ef93037285807fb174aad38913c9478ce4f38459cb000ad46f9b6b37a62f3f13287fba9f646bdf55a3c6126704082ecb6294e6 SHA512 c5dbcf5b795510abbe6c6dbea53ea6b9a438f0b2b8f7af28ae3ec9d8816d51c6ee22938bfe7d222d5b451065b57447064fba59e93a9621f1132e3d27ef8d385b
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
new file mode 100644
index 000000000000..d71cf40662e3
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+if [ ${PV} == "9999" ]; then
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
+	S="${WORKDIR}/zfs-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="CDDL debug? ( GPL-2+ )"
+SLOT="0"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="debug? ( strip ) test"
+
+DEPEND="
+	=sys-kernel/spl-${PV}*
+	dev-lang/perl
+	virtual/awk
+"
+
+RDEPEND="${DEPEND}
+	!sys-fs/zfs-fuse
+"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		EFI_PARTITION
+		IOSCHED_NOOP
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
+
+	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+	[ ${PV} != "9999" ] && \
+		{ kernel_is le 4 16 || die "Linux 4.16 is the latest supported version."; }
+
+	check_extra_config
+}
+
+src_prepare() {
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
+	# Set module revision number
+	[ ${PV} != "9999" ] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	set_arch_to_kernel
+	local myeconfargs=(${myeconfargs}
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-spl="${EROOT}usr/src/${SPL_PATH}"
+		--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
+		$(use_enable debug)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
+	then
+		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
+		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+	fi
+
+	if use x86 || use arm
+	then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	ewarn "This version of ZFSOnLinux includes support for new feature flags"
+	ewarn "that are incompatible with previous versions. GRUB2 support for"
+	ewarn "/boot with the new feature flags is not yet available."
+	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+	ewarn "Any new pools will be created with the new feature flags by default"
+	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+	ewarn "create a newpool that is backward compatible wih GRUB2, use "
+	ewarn
+	ewarn "zpool create -d -o feature@async_destroy=enabled "
+	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
+	ewarn "	-o feature@spacemap_histogram=enabled"
+	ewarn "	-o feature@enabled_txg=enabled "
+	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
+	ewarn "	..."
+	ewarn
+	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
+	ewarn "developers do a tag or the Gentoo developers find time to backport"
+	ewarn "support from GRUB2 HEAD."
+}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index e1fe0f342080..f4655696bbda 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -3,8 +3,10 @@ AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c9
 AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b9243f111c6c882c3480eb6396e347eac91670e3a67d7f122953d6fa82ec61a6467163b788b31858 SHA512 7a167b389723e5f55fea6956e5546e46c89ebf3e2d1c25f6b56c357e6d3ffc765226549d78cdeb79b4dc90c798ec6326a13996215b40eb49179376e32c3c3287
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
 DIST zfs-0.7.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7ef215f735180406a7fc0d4d3c9700a41e855186d8044b304c9f0c142c2bdca387299c499974e424965970a4 SHA512 cdeabe10acd2feeeff8a6362987c757b716bfea6ebad42ce022a081106661f774150c113bdaa9e1ac441efdd6da4cf11e6119323ad60ae15ab445a872d952e35
+DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa
 EBUILD zfs-0.6.5.11-r2.ebuild 6069 BLAKE2B ab5867191417827b34a1350c62d76ad51cb47fe4a7a5acb58d559a0556bc4e1b324439a0c5746afe1bd1260e152f451d63b941f29f8f3562df24eb0bf57dc454 SHA512 97f819fb3f48a31b70f4a0b85f7856eb9ad5edbd72f2aa59e6d6d77c625a5207c9d75c7c063257fe52861f83e92d7e0f5abc6ba3935172c0f5517f8c5daa20e3
 EBUILD zfs-0.7.8.ebuild 6073 BLAKE2B 5ba2b9221ebf4dd4f483e531dc74d098bcfc633405204bd577a38d24ae92f9e9ee5d47e779097f31f424e1e0da8eff9ebc62c303d0a115810a557e856df5ba78 SHA512 9740c0a4dd42b6f82d7f6a09ffb399127e1b2d04bf211267908d1b918e0914a0443a9115b788d9300703ca8da68561a1d8c09d4f3ffd61a7c9fdd83775a5d24d
+EBUILD zfs-0.7.9.ebuild 6072 BLAKE2B d6e0f7400ea8c2d2bdb8d4826a52e80f0f43276478cc71f2cec03183936d25ddfdaaf92f409f3b9eae620c7b0d3f778dc5260bc74f1b8f79679df6117a4b4d33 SHA512 ad13f8e8aedabd0c72ac987e4057757b136d51de17a8f82ba9e9cff1505307d61699d534bba644b984c438083026af42f1b6276da3d8216db319b77c18be2320
 EBUILD zfs-0.7.9999.ebuild 5975 BLAKE2B 109e38dde8903a09eb8c3458fc36686c048c1309a46e7c63c21922fba71371078a97f8978798be72c34056bbe5ec39cb0d4503fcbaedc5c14fa61db651924d12 SHA512 f4c0afcd5606a381bff06783b8523f5dffe4610fd6108b3f020580ab89c58a522d633967471c14e8f6ced4b27cfbc7382f78eca0c18302a8ea8dee929ff9245f
 EBUILD zfs-9999.ebuild 6216 BLAKE2B 08da2b7ebfcaca96b298b47f2d544785d7852ea08e601d8e2de58b2a7c9bed30a90c6ba416b451aaf6ee2f577c0e7f4a0468ed3daa15330bf5560430d46bf461 SHA512 ce8ad3c9532a5ee4d9d358acb371bb33a6d4595acf77a23b88f39eeb46a85cc02c88e64c037655a5b0da77511f3a1563a8a91665bc26b021150accd3e6948991
 MISC metadata.xml 754 BLAKE2B 7fc8a5badf77174cc9d31bb1e83da53d910a18884897287bc3666066edcfc03ec6331c09cb7ff02767e14b17df03eddba74549feea61dd044c21a4133f4aa763 SHA512 647ffa3857be38b2aed7462d26bbb1d3ea50fc53068b6d973514fdbadf7164421dd2025165a592855b86a03754d968d36e503dcfafc99e3ed75ee7db3f62df3a
diff --git a/sys-fs/zfs/zfs-0.7.9.ebuild b/sys-fs/zfs/zfs-0.7.9.ebuild
new file mode 100644
index 000000000000..0dc01562153a
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.7.9.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3 linux-mod
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
+else
+	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	net-libs/libtirpc
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!=sys-apps/grep-2.13*
+	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
+	!sys-fs/zfs-fuse
+	!prefix? ( virtual/udev )
+	test-suite? (
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+		)
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-boot/grub-2.00-r2:2
+		!<sys-kernel/genkernel-3.5.1.1
+		!<sys-kernel/genkernel-next-67
+		!<sys-kernel/bliss-initramfs-7.1.0
+		!<sys-kernel/dracut-044-r1
+		)
+	sys-fs/udev-init-scripts
+"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+pkg_setup() {
+	if use kernel_linux && use test-suite; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [ ] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	# Update paths
+	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+		-e "s|/sbin/parted|/usr/sbin/parted|" \
+		-i scripts/common.sh.in
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+
+	# prepare systemd unit and helper script
+	cat "${FILESDIR}/zfs.service.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs.service" || die
+	cat "${FILESDIR}/zfs-init.sh.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs-init.sh" || die
+}
+
+src_install() {
+	autotools-utils_src_install
+	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+	use test-suite || rm -rf "${ED}usr/share/zfs"
+
+	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
+	bashcomp_alias zfs zpool
+
+	exeinto /usr/libexec
+	doexe "${T}/zfs-init.sh"
+	systemd_dounit "${T}/zfs.service"
+}
+
+pkg_postinst() {
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
+	then
+		einfo 'The zfs boot script has been split into the zfs-import,'
+		einfo 'zfs-mount and zfs-share scripts.'
+		einfo
+		einfo 'You had the zfs script in your boot runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the three'
+		einfo 'scripts that replace it have been configured to start.'
+		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
+		einfo 'runlevel while the zfs-share script is in the default runlevel.'
+
+		rm "${EROOT}etc/runlevels/boot/zfs"
+		ln -snf "${EROOT}etc/init.d/zfs-import" \
+			"${EROOT}etc/runlevels/boot/zfs-import"
+		ln -snf "${EROOT}etc/init.d/zfs-mount" \
+			"${EROOT}etc/runlevels/boot/zfs-mount"
+		ln -snf "${EROOT}etc/init.d/zfs-share" \
+			"${EROOT}etc/runlevels/default/zfs-share"
+	else
+		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
+			einfo "You should add zfs-share to the default runlevel."
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/default/zed" ]
+	then
+		einfo 'The downstream OpenRC zed script has replaced by the upstream'
+		einfo 'OpenRC zfs-zed script.'
+		einfo
+		einfo 'You had the zed script in your default runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the zfs-zed'
+		einfo 'script that replaced it has been configured to start.'
+
+		rm "${EROOT}etc/runlevels/boot/zed"
+		ln -snf "${EROOT}etc/init.d/zfs-sed" \
+			"${EROOT}etc/runlevels/default/zfs-zed"
+	else
+		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
+	fi
+
+	systemd_reenable zfs-zed.service
+	systemd_reenable zfs-import-cache.service
+	systemd_reenable zfs-import-scan.service
+	systemd_reenable zfs-mount.service
+	systemd_reenable zfs-share.service
+	systemd_reenable zfs-import.target
+	systemd_reenable zfs.target
+	systemd_reenable zfs.service
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		remove_moduledb
+	fi
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index efb22de5f123..a54cd2b8e3dd 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 38e363aead9b..4dd07cab338e 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -2,76 +2,33 @@ DIST ck-sources-4.14-blkio-fix.patch 1882 BLAKE2B b85d7d0bcc868284d60c73f26b055c
 DIST ck-sources-4.9-freezer-fix.patch 684 BLAKE2B 63894db45e5653af1851c7cee2493b6717d37f50d55c3a2b41316075d0f3e0bcb8975ff1c647c764bdf088ceeb4c716657e189d1e5337a69346e6dcefac332b9 SHA512 4241ca604f928263c29a49aca076832c06469db734864ec8c648cbbc30ba63cfb0b21d076ea4a7f3c438868802feb4e369d976e9ef6e091ce7bacf1a69c2c588
 DIST deblob-4.14 143883 BLAKE2B aaad9858bf626f1495f83187fd2ab91f812504534c7294cfb6818c773229eb780096a2c78a6aa963f3826df3cfdf7a7db5238f71fa8955c21b4acd75660d2b17 SHA512 662a11c03f51d85158175a8bf35fce20f01d94659d36b97a9773304ff9c091b2a9ab72a0445065c20188457fbe174fb43334a79e17b3a9e8553bb6144a971f4c
 DIST deblob-4.15 143008 BLAKE2B abe36eea7cd0f173be88072c969bec1ba269de7a862232a2bcbb5dbf9e39e0c4020b456f6164e6364e15d61ade4ab239db61a4d36d90afa6373e96c7db56a234 SHA512 bd7a2a95331928527f5c6a96ae65300a13785023acb8be86f45ff93f0b0db2ccf0ef21aff07458e3c9f9292e1a667278bff999327e2ec5ea98ba0f47f30563a3
+DIST deblob-4.16 142787 BLAKE2B 8c43d5487ea8bf78861c582f71206e1d90ad23aad57a0100bea19fb7dd1a3627e4138c3284f31ef292f4c810f6f315718080316e00fb0388cfd997276d170458 SHA512 5f2e0d7cc3adad0ba8f46a2c23041078105778854e87f3a5fb139cdd58151e4cca8690ab99e20026c3a966dc7c414e154c3b395e4e5ab5d744eece3cb9019d02
 DIST deblob-4.9 146273 BLAKE2B 8bc593ca375e003183dc6260aab0b2f81675b0814ec50fae3afe5d4ce9ce41c1c1401ce80e1c285153f610f8f730f82d6ad03e2578c792fd4af8779f2d1e3079 SHA512 3654b28e72b343bafdb38de10ef0c3621db0539bc0e7434bc99bb8f8ed911d4c9e53ca4785fd193fcfec369328f014fa5c6f3bda51b6f1a8f98b8c37ece119a6
 DIST deblob-check-4.14 755969 BLAKE2B 5573bdf913554e23dba3d3c56227a2c8c3fcfad7f4a99e1ec9208171008b5d2d50bdc55000672af95e020ef8171325b9d1797a69c988b4df5b0f71bc2a186fad SHA512 09626864cea33804d3dc94ceb691b24b6c14d1b9531eee8e745276dbc403903d762b1f75d685bf831f42b942d6f7ea265efb0d4889fecc976d95b11faf843fd3
 DIST deblob-check-4.15 761750 BLAKE2B 5e748e57d7f45f0c1454ded4e48e0477b3f28ce0a518d637925afc5c8d0f05a0d9b8fc9c4e3a7bc020484b21f5ac38b4ab6e4d817e3e91ff4d436b6a86ead3f6 SHA512 fb8dca9c05aedddb980d9da31099513a94b74d8553dd89c4e1f39035ab7b698a16f686e4dcaefc43c338c1dc83fc8f229bbc4080491c6e39845f38e36c9576ab
+DIST deblob-check-4.16 767829 BLAKE2B 606d87e6dff29ef1d9704e0a4b767cc5586d300d5e55d3370feb721d2a5bb6c6e6d7a48783021776b7ac347a3580b66725012213c9548a69bf96de91bf01a8ca SHA512 b9b179117356809e55f99b966121bac67f634112bd3b54c3320c9a261967d18462c7f322416cd7d9b2c8d9d374fb37daeda8abe4fb3f013abb2f7da845b2f516
 DIST deblob-check-4.9 717834 BLAKE2B f2471b45f6953ce83c0819b9157ce638a1d93959ec4074a329766ecb0c3adf90fd3022307ea70c2cb3bd3c291f98d6153576cc6597c62ca97abae6524b98112e SHA512 46258698f1c574b44a8c5c78cc2b7fdbaca746976266974ee0f6787904531754b17ad15d542b68e07d4633ee91a8e2d9c32a991ea214292ac072c4f26deed9c9
-DIST genpatches-4.14-27.base.tar.xz 750844 BLAKE2B d19f2b74590728622f2cb9745bab2fae616cdedac4ac4507335ffe684ea438bf50f2b00ae1e326b818032fc72ebab6e6326d5fa0ed23baaa750ce6b404db8921 SHA512 7fda6679d976afd94e82c8a9cbd7389da976c21821d8ac6c1b98a24697df9e8a26d7f861ebc55a3b56ea996f8022adab9679fda9f81564c122538c34f5e50b4e
-DIST genpatches-4.14-27.experimental.tar.xz 5184 BLAKE2B f67c68b74d74ba81499e36cae871656b07fc6c40ca890d2b5edb9137b5672652bc3c5bfdd46f322b64b7863776e76485370b23c8a5b03b8de16730bb9b265a53 SHA512 83b60e68991ee73488f5919d26308615361b95a4dca153d9f1d58e360a7e4370b18c34aaaf572f853fad08aab7636fde67a45c371e37f56abcd5b44c32f62b6a
-DIST genpatches-4.14-27.extras.tar.xz 17492 BLAKE2B 4a1d976f56d48c8da2c43cd306506075f226a50caa1730bc77cbbb11f11e9c7446ac471355f236535bf4878ecb9b9f4dbc9f07cb54ba9fb4089faee9d6b87ee2 SHA512 8d209e3ac993fce94ebeca0ec30f81710da0a8a9b657ca936f5d0db05061aaeb95cde4f552fe414edf51be8e28e6bb9af3cb668210a7c335b3f58cee84110470
-DIST genpatches-4.14-28.base.tar.xz 763484 BLAKE2B f1ecc9bdd37f7e65287d5f3e2027bbcacf08f946a42cbdfb7f115c5641b450b22c29f8d43e0a8827d02195a8aa867640855dc8752e9cd3209db95428198e5736 SHA512 5ce9a2d51267dc06dd0da96e8dc7ce010a7ba1b19d6be8e4c352f674f86bdc3f32c18664bbf816293ab5f2030088f4fe4a8367f51f1b57adc945332799f07074
-DIST genpatches-4.14-28.experimental.tar.xz 5180 BLAKE2B d99fa03d0f4003a0c55361dae11a519311ecd367d06f0034166726334399757d4846a7edf885f67a37c72561f614d2190421f56a73818be23abb713f401d7342 SHA512 6f45a8e1cf2ebfd4d0295dec64b7c4b5345281e2b7abbe3a5f522fc7cb939d7f05f09713177cf9023fe29936fcc4013bd2cbb388f7b342ea7778e764349c8f48
-DIST genpatches-4.14-28.extras.tar.xz 17488 BLAKE2B 29d1c5a21219938645204649ebc62daa54f4a879412e4d0adc456b182f54d882be0882d025e641e7c49230a0c7ff2e11af549d20a8d0977842cbcbe7b05813d9 SHA512 c31199fbb9431e4f4b853a19332b21e7f357df79b4ef84db765b9a13d7f9f009a81db9473b0d60d76cf513439ed9eda9769efcc244d4ede7827cf2ab4045461a
-DIST genpatches-4.14-31.base.tar.xz 823544 BLAKE2B 903479b10319b73fa2bfde8c7b8ec1ff5c90fbfdc2e9e3f28581499fa57c7d370c05462e7aa1402f0a35ec60687897e39c25e703a33a9ca376879ebebf239633 SHA512 660b2d7328ae2f7555d2f4869e8068cf94a56f84cd019ace3d6c6149925f867e440c4fddb37aa362e8639b9d12d09164b7046486b347e2499afe0b9adfeb88f5
-DIST genpatches-4.14-31.experimental.tar.xz 5184 BLAKE2B f67c68b74d74ba81499e36cae871656b07fc6c40ca890d2b5edb9137b5672652bc3c5bfdd46f322b64b7863776e76485370b23c8a5b03b8de16730bb9b265a53 SHA512 83b60e68991ee73488f5919d26308615361b95a4dca153d9f1d58e360a7e4370b18c34aaaf572f853fad08aab7636fde67a45c371e37f56abcd5b44c32f62b6a
-DIST genpatches-4.14-31.extras.tar.xz 17492 BLAKE2B 4a1d976f56d48c8da2c43cd306506075f226a50caa1730bc77cbbb11f11e9c7446ac471355f236535bf4878ecb9b9f4dbc9f07cb54ba9fb4089faee9d6b87ee2 SHA512 8d209e3ac993fce94ebeca0ec30f81710da0a8a9b657ca936f5d0db05061aaeb95cde4f552fe414edf51be8e28e6bb9af3cb668210a7c335b3f58cee84110470
-DIST genpatches-4.14-34.base.tar.xz 893480 BLAKE2B 26a867d2f723bee9e2e3f90ae1208f447aa6c025ef520020bcff2656c6870cc25ac44c0533fc555c77a8a4f8fe22b545ac8f2e10820935e5dd88fada4a40e71f SHA512 6721ef0e5153d334c95f70c5180587ffc716882f4abaf71e830a79641499527aebf7e310ba81c9e0e69bf83656c53f19c4a22720686e20b476f032a56e30ba88
-DIST genpatches-4.14-34.experimental.tar.xz 5184 BLAKE2B 1543a0da91eb42dc3c61b3670c2d5aa94a49bf30c3745b2408d43d55f009f378737d05d9c8cc2b16a43717ef96fe52758c0487f7f9ab725ced9482c92494321c SHA512 e9014e32d8d4659d4d7ac5e4902b6a4bb1fca2f3263efae09873e966a86151045c054c42f3247074ca802fd7008a7ba8ff06cdc507367cf9298579ddcd73f6da
-DIST genpatches-4.14-34.extras.tar.xz 17492 BLAKE2B ebff9e91c92b4fb48ae355401faf2c7dfc4029899cb2bad7a31fd9c2d2675d6d941584d74db8f96971a64cbc2e2a1e8dd6e9b189443a8b7d4918f3ce33cdf481 SHA512 dc05fdfa9b0a799b8767109033434d8a2be00dedb19a420c395576fc142dd41e7ed1a74530d543958865d9d8557eac2b193fea3a16fb45fb1e725b0129ab75f2
-DIST genpatches-4.14-36.base.tar.xz 937452 BLAKE2B 6d1a76eb2d49f08980a1ed98e2ee51b4190525febda533f35c809b4c4fdc5006cd76dad93120caa1d677c6b3e65b24ae9f0639b249ae05762e0caa2855c81959 SHA512 8cf07fb978b91edde19edf8f09827a820681ecc9719e8f80803ee9d29a308e5c4f222acbcb401cb05a9e659a4e408e6e5b23f3a0f1c415f87f3374de4ad87ac7
-DIST genpatches-4.14-36.experimental.tar.xz 5184 BLAKE2B b4d97f8f7d4dc4fdeb22e316ee5474f86376571eeee384385e0130d56f6228896d5de5cb74f3abd4e437b0fb2ad5f8e092c431ca3efe076af06e1d1008b70fc3 SHA512 5666450cc357545df8260e7100cfbfdc6389f7c766a93214ed5f8fb0ff7524c90fcdb232e136d3cf451be581e021b8ecc086d37782780b44772eb95e3a0f0432
-DIST genpatches-4.14-36.extras.tar.xz 17492 BLAKE2B 585593b652ce04707ded634190d56ce3e548493b1d65e2cffe963d62abe3bab83134eb6a0feef45b94b324c577a7c5aa318bebeb2e97bf2943c8a1319e40ed3a SHA512 df8d909c8897116f42877fce9b7e62f5eb651a0ab51861ad4e3acd68adebb40657755cb7c7757b001beec7f959cf1ef8691609b11deba0aa214baacc7b4f66ae
-DIST genpatches-4.14-37.base.tar.xz 946124 BLAKE2B 92d0dbc05b70d4b1fdf0418b02626bb8ed756dff8945a173c9471e3390c06c0a1130306589ceb847895d801a146f38a6d45a6adac08f04c4e8d5f083829e93a6 SHA512 d8cc75aea82c4901fee990cb1d174b32b1b424b9a3dfafeb9ab06cd5f2acf0a74b4d5ac69751cf701874f0418f4b1a7de8a4f1595189746953e35aa2df9d2fb9
-DIST genpatches-4.14-37.experimental.tar.xz 5184 BLAKE2B ac2a110cce98d65bcfb074b3f89ef697d0bea06da5541d9c469f8d3ccb23c1923747da170fd1b4ca3658f0182bddef1e1a7c69b664522d043f38a0bbce348146 SHA512 802ca0594a46f0f5719a847eb89cd843e8ffccb076fef730d4c95afb7bb8795317f1a0da907ef82f575659b9742d920aa3e24a0953006e3a12770e53fcb34140
-DIST genpatches-4.14-37.extras.tar.xz 17508 BLAKE2B 8b594c88abd0c67b5904a121ecf047ce5682467b5d9ef1af52f896ca0d772243839193409670fbf2bbae4addf78bc2a7b6918306be23ad10a7396f91dceccd4b SHA512 bf246961a70b2209403a8b2e4ae931c970ac5725e173cf146de5a9f0fda5927d808cdaebdab0ded058719a517cbffb6f8d2963a2f88c5bb2abde410f0a01c71f
 DIST genpatches-4.14-39.base.tar.xz 998224 BLAKE2B 5f67053742e09ccf3b962d252054d0f1f0540630c4105203ef06b2f5c01320ae5c888196aa95156be09f89809b9e2767b9c281ada7891ff5427bc19a25c3020c SHA512 138a564d677b0562bb92bab1590fd0fc8de8a8dcee3ae5f3faf8c389d46084956b3831af85592ecc65d352f3055f8e7655882ea2f10b72d8ddc9b01d3e5d9ec7
 DIST genpatches-4.14-39.experimental.tar.xz 5184 BLAKE2B 96ab38624869b7ca2caddceea1be6701c6a9df489dda0be4736765a6546909d522f5b32a44506875270485606797357bf44e044ed61ee40f6171670a5956bdbb SHA512 673083672ca1758f0b3dcc4507bd18c3ea1c024c86f1f8e0bcafe6117f33e226ad981fa123f1b3317858b93f5a17b5f56924e5e5eefb6c0980fc8572626010da
 DIST genpatches-4.14-39.extras.tar.xz 17492 BLAKE2B a610729f55d64e3ef6dee6129879f5ae27f31bb2738b0d8d3270f3502eaa19024323a741f0ac3325ba72342ae9e3c7fc9b4dbd56f8763a4be29e825d98a17b18 SHA512 304fa9e1f83f5b8e2fe10905799badc8bd8e9ac981fd59b3568f9d9d208dc671ec4dc1b88163351322d047596db4d2c8f9a261dbefa3351cf25f321b84beca9e
 DIST genpatches-4.14-40.base.tar.xz 1011472 BLAKE2B 762faad2faa0d9db90b078ef807c71556fd367e6e72a05bcc5a9436aad79bdc9c10d552b09bf901e719e53cdf1f02d859c9b9d34e631ba01416a89530553ffcd SHA512 ac63483fca05411ceb97c9a4abd92882c8afccacdc527e30131a48295684ff41d6ef0e5e3f1f8a391e6a4f3fd049488f764a60adc5c8bd07339959e1b3ecfa49
 DIST genpatches-4.14-40.experimental.tar.xz 5184 BLAKE2B 4c1bdbd651ea3c20d44194e0bcc5ab3dce499182ce31a8436ec46875cde2d4b14a0cc5f0eb90cef0aaea167b49a25775be24b38a2b2bfa606a415627f87d96fc SHA512 05a8084dff8f08f9ba84b90230b4bf50a521ba1e0dfe792f30a3f775772f2097e43927c6c5878ba19bd97fed66036c5b29309a0b1a5e914ec895281440be8c8d
 DIST genpatches-4.14-40.extras.tar.xz 17496 BLAKE2B 2240a8879139d6ad765a9e38d0ef78c78ac9e92f54c5317912b512ab1a64fd42fd512696f1820718a1fbfa658c8775bbae358db483ded60e65d504f4a81aa4e0 SHA512 e6070bd5631bb41e1e0e73c9381993779cc6095525a6eab5d8387641e1fce534617d368bd6a02c5f5d8d2669db6f480d284a64c8f76fc218e29df5a34937e1dc
-DIST genpatches-4.15-12.base.tar.xz 251412 BLAKE2B c6534458a28c9df29b7cb9e3392000f49d529b2d223c8aee353b8e5e961886c97acb80993e30671ae2359a7f1ae6fb37ca1320571cad55b7cae562a03ae49f61 SHA512 f98e32b0b84b3499227a3ddca06398a1bad277e68b721b70a3cfdbbe9449c259a9e8ebc63e5463e65b5e5accbc6b3935bcc78840e26567a4c12e29a19dc8e422
-DIST genpatches-4.15-12.experimental.tar.xz 5184 BLAKE2B 4a44f3d3fef089140e6420c26d1c4102d518ce615abc30afb8127ede4328c276e3380502c2b28d5f452d8c7881130f0d2d7b04f0f81ce44f02db7b280493a12c SHA512 ddf304f14c9c714c32423b349c8740bd0785c5893ea7cfcf89895f0b76214693dff142c7fa5c40df09f55696b845210e3be8bda4fbf7deacff1718a83f83047a
-DIST genpatches-4.15-12.extras.tar.xz 17484 BLAKE2B 919091a255d5ec058e52c151caad2afe470b401a9ab5269946a2309ddee3a2b5068df8483807ee310832c690bb561700363a2b1c0294a4e15ca03dff36061890 SHA512 3a426bf63ffe786984cc8b9c296b0393fcaa9881c65d4220cadb331fe445fc05418a629cd5494f0a1419215d4512679d9619c8a92f4a10b2ad8087fa44292ffb
-DIST genpatches-4.15-15.base.tar.xz 336656 BLAKE2B 326410c6d2ede2393d0e4e9dc034d1adee8336fdd2ea6a9831dd9be7963d72cdfe031ac24db54a95ce1c94cd388121ee381cbac5c365d2eee79e49c4277480be SHA512 a286494dcaa8d1a063501b364354cd4fb9d342f03efa559292b9908928cce7a684bb706ec89bfd46b52c1253125894322fa4f1d0ec3a7577bf47a4cab0ceba7b
-DIST genpatches-4.15-15.experimental.tar.xz 5184 BLAKE2B 1543a0da91eb42dc3c61b3670c2d5aa94a49bf30c3745b2408d43d55f009f378737d05d9c8cc2b16a43717ef96fe52758c0487f7f9ab725ced9482c92494321c SHA512 e9014e32d8d4659d4d7ac5e4902b6a4bb1fca2f3263efae09873e966a86151045c054c42f3247074ca802fd7008a7ba8ff06cdc507367cf9298579ddcd73f6da
-DIST genpatches-4.15-15.extras.tar.xz 17492 BLAKE2B ebff9e91c92b4fb48ae355401faf2c7dfc4029899cb2bad7a31fd9c2d2675d6d941584d74db8f96971a64cbc2e2a1e8dd6e9b189443a8b7d4918f3ce33cdf481 SHA512 dc05fdfa9b0a799b8767109033434d8a2be00dedb19a420c395576fc142dd41e7ed1a74530d543958865d9d8557eac2b193fea3a16fb45fb1e725b0129ab75f2
-DIST genpatches-4.15-17.base.tar.xz 386736 BLAKE2B e8aefe3adb6e8c592f73dcf89adb99a0bfd019007f85097d4e92f08685c2d2b423b0940a794ecf15b5c167331b72e5ab6684532ce239874fd00e68d33d4a531e SHA512 1d1915f8eca7c74298d0d5d77a608f0c5ca69eb6d8ea09f9a6ad90155b3d9c4b76bf5a47a9c9b4b3b869adb812fb5d6f97191f0d1efd65455f8ef8f5ac9c11d7
-DIST genpatches-4.15-17.experimental.tar.xz 5184 BLAKE2B 6b20cf92325c64327d650e485ab28bad8c3503a014d90ebe76b91044db64f08bd40e92296e72ea7f6377a63a64844d660eed2e289042448689055cc5c34cbe48 SHA512 c6936623609b32b114af11c0cf8bc50280aff42377493783a0f97189b0257e6ed5c5dd71bbbaac298b8da8a97eb7de0fe06891341343471a245f0bf2cc8cdc3b
-DIST genpatches-4.15-17.extras.tar.xz 17496 BLAKE2B 2f13f77a9dcd5fa1a1816d71677064fe530a38fc4717f0227fe1cc990ff3e9ab21716d7343b9d61ed842e99921cc286b4649bab5955ac337d4c67acd582d9203 SHA512 0c88b8dd4c3c22a54ea3e3a18a1e9586309e7b3d070234ebc293d13a63ce97b557cfe89d35c04aea7b7e2ec74040064a27818e5cf8253d8dcf453f818934c044
-DIST genpatches-4.15-18.base.tar.xz 398516 BLAKE2B 749dec282d5c797d9b4ccd407f4a2a1c22443f5fc001b92d37aed4bea0cdf54675ecb3f10c6c4cd6d6d07aabcfabc1a39168bad171854466971226a4a52e2340 SHA512 72e06f953342c492b99674a87fe7c5af1dd12e2341b405abc02343e122273c082258b156e40b629aced22d29e9549da702fbb641cdbee708b3675b995b81ebca
-DIST genpatches-4.15-18.experimental.tar.xz 5188 BLAKE2B 6a0dd796f4d6c3d4c33c0a3ba8978cf868df757739955930e2370a666de29caba76e9a5915944a8fcc05f05b4a385ad76720aa9bf2bb3dbe871cf31d92b1fa52 SHA512 e728868a0aefddb91cb81ab41ef1f5e601acf8f7e9a7abb55cabec8b363b44cac4b3a09cae33b2a82de3263da57670be05f9b567b45ad33049f16832461ca69b
-DIST genpatches-4.15-18.extras.tar.xz 17480 BLAKE2B 67f3486eb2540c351421b24d7ea2d257f7c0b8e4c63d1377561c1491fbffc3bdd4cfa131362758fa1666642e0897315bd30bbc5cce86fd51e738062d3297483c SHA512 0d78634c48183a0eff09f1741e6197f06c73cd892fc01bacaef72bc4273a102225da2a33fb584068ddb0a9e8a62fff826a945e7a12f68f186ee17c9ee29cf36f
+DIST genpatches-4.14-45.base.tar.xz 1175760 BLAKE2B 6bc299d8072aa6e1f0ee3d338f20ecf9e17bc3f3c89b6458fa3c3b5616a58b69d32ff1c173202dc95a8a234a1cf3f6eee0f74028f6b386d39c1319f93dc3fcd4 SHA512 f1431f24c17bbe49e3f08d4041aba88bce22ef560c89cfe5c9abe4fead0305de7b27649e1dca8965867f115fc153839880eac5905aca74949289c8a061286932
+DIST genpatches-4.14-45.experimental.tar.xz 5184 BLAKE2B 501c9b838f5e44380043ceaa9f8a5d9097bcd97c9113874cd8c9959224d1556e64867605c803e02ba92f70e250cb8f96728dee728e52b97feaf43eeb75a95fdd SHA512 907a896f768ac555d04c7d5278c632bf9a89c556a1ba863d01ba73cfa98f20c5b12742cd057bcb6037b41d12420069ac7a2453774d1a79a4e68e1216c188192b
+DIST genpatches-4.14-45.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
 DIST genpatches-4.15-20.base.tar.xz 464468 BLAKE2B b3c30e02819663b31b4ed83794d57c4521fe13015a4419088664f017f4753117bbc88a5600e310092d8eaf8b132b0757d59fb7b503abef046db0249ed7ae96e6 SHA512 cf79c85b65f3a68d3d721d2425fb6e498df808097bd8b1c610023d0c36c0378ec0f92d33ee0dc39592730d87f4a1df52931ea9608be2d56d5543a201f9d1d658
 DIST genpatches-4.15-20.experimental.tar.xz 5184 BLAKE2B 96ab38624869b7ca2caddceea1be6701c6a9df489dda0be4736765a6546909d522f5b32a44506875270485606797357bf44e044ed61ee40f6171670a5956bdbb SHA512 673083672ca1758f0b3dcc4507bd18c3ea1c024c86f1f8e0bcafe6117f33e226ad981fa123f1b3317858b93f5a17b5f56924e5e5eefb6c0980fc8572626010da
 DIST genpatches-4.15-20.extras.tar.xz 17492 BLAKE2B a610729f55d64e3ef6dee6129879f5ae27f31bb2738b0d8d3270f3502eaa19024323a741f0ac3325ba72342ae9e3c7fc9b4dbd56f8763a4be29e825d98a17b18 SHA512 304fa9e1f83f5b8e2fe10905799badc8bd8e9ac981fd59b3568f9d9d208dc671ec4dc1b88163351322d047596db4d2c8f9a261dbefa3351cf25f321b84beca9e
 DIST genpatches-4.15-21.base.tar.xz 479732 BLAKE2B 3d2b40d4ed60e68712a498b184ff58cb72a7902b75ecd35efc98f2a6455dc902b1c02d459837e7ca17465ceeae380e20ed12cfe50f1bcc4a884eef0d80e05360 SHA512 e92ad5ee6cfc8d7a57eba044ae6bd86344a0e8eca11c89d0de9fbe3410b0d7582c38d48281ae8d0c17992b151cb35a9916835a6963402732449e150ff5e471d6
 DIST genpatches-4.15-21.experimental.tar.xz 5184 BLAKE2B 4c1bdbd651ea3c20d44194e0bcc5ab3dce499182ce31a8436ec46875cde2d4b14a0cc5f0eb90cef0aaea167b49a25775be24b38a2b2bfa606a415627f87d96fc SHA512 05a8084dff8f08f9ba84b90230b4bf50a521ba1e0dfe792f30a3f775772f2097e43927c6c5878ba19bd97fed66036c5b29309a0b1a5e914ec895281440be8c8d
 DIST genpatches-4.15-21.extras.tar.xz 17496 BLAKE2B 2240a8879139d6ad765a9e38d0ef78c78ac9e92f54c5317912b512ab1a64fd42fd512696f1820718a1fbfa658c8775bbae358db483ded60e65d504f4a81aa4e0 SHA512 e6070bd5631bb41e1e0e73c9381993779cc6095525a6eab5d8387641e1fce534617d368bd6a02c5f5d8d2669db6f480d284a64c8f76fc218e29df5a34937e1dc
-DIST genpatches-4.15-7.base.tar.xz 193592 BLAKE2B 7568231819af388699ba317d97659cd433815aec1b1b39aa53d7cf740560149934edf214bbedf5b9d48a2e56ff6f3c58a78c301ef01de1ba08deb46a569ace32 SHA512 63c85b3f434c7a201a1488211962ea7c3cad2b22abd5455ae52fab17ecf7485a3d346a762fd0078ea786694b6481818da0f271f1ca9068242bf7b23a9977fcc9
-DIST genpatches-4.15-7.experimental.tar.xz 5184 BLAKE2B f67c68b74d74ba81499e36cae871656b07fc6c40ca890d2b5edb9137b5672652bc3c5bfdd46f322b64b7863776e76485370b23c8a5b03b8de16730bb9b265a53 SHA512 83b60e68991ee73488f5919d26308615361b95a4dca153d9f1d58e360a7e4370b18c34aaaf572f853fad08aab7636fde67a45c371e37f56abcd5b44c32f62b6a
-DIST genpatches-4.15-7.extras.tar.xz 17492 BLAKE2B 4a1d976f56d48c8da2c43cd306506075f226a50caa1730bc77cbbb11f11e9c7446ac471355f236535bf4878ecb9b9f4dbc9f07cb54ba9fb4089faee9d6b87ee2 SHA512 8d209e3ac993fce94ebeca0ec30f81710da0a8a9b657ca936f5d0db05061aaeb95cde4f552fe414edf51be8e28e6bb9af3cb668210a7c335b3f58cee84110470
-DIST genpatches-4.15-9.base.tar.xz 213364 BLAKE2B cd9d322b760f455e9030f37b2af0fc16c18aa760352a1e48e7acf249783884ac7b6f8503fcc9f7d04d9f84d46dbdb83ce30d6fd9672158cedbda413733ea2543 SHA512 06f2da48a4e219ca7af343d3607adfc533cee2d43d0e8629b0fb58390e99ac3c0c226aa89db4e37c87c1ebb247b10d27fe4b68a87325fdf6491846a3648305ba
-DIST genpatches-4.15-9.experimental.tar.xz 5180 BLAKE2B f273483f44819e3110d45ed8cb042c16e729dc15e495a3042754d0fc727225a4db2d9b00e744dd3898ffc5d31b0cbf4dfdcda3a7019d768e7b714544d9c46b02 SHA512 342819d503051177983ae9e4fb20da1d67b416db4c46c5c3a3dbe8282c75c9a9f21fda31ee9a2d8080f139c24c107b650a53e7a0212e91a54f09c012a7545920
-DIST genpatches-4.15-9.extras.tar.xz 17488 BLAKE2B a31b176bff4dcba9e3ee6fc0685a6fd7ae695c590c4f95cb495e4c0d34d6a818c11aa30a1153aed4d662837847281917dbe91237c7edc51052908b0c30ede8d0 SHA512 97dbbe066093d0c495578196409496aa4102d3f10de28f2bb975a3db4ad3917a6ef34b26e947b745419f0e80711e5dff6a41cf141b02bfaea910bc1ce0b5d3b5
-DIST genpatches-4.9-87.base.tar.xz 1625392 BLAKE2B fde376e07c13041e750e8a735c1ef53c037e24754f6d9ee51dcd03c6d6933f2cc42fd884be374d457ba6b1a4ff23208ae7f7c47e63df6528f473c0096ecc5808 SHA512 81f3151b7c34b49a0ce706f67006a68fd1b072592b684adcf79c612c8f3733109bf551e048024c0ada5400b143f99b8f65ec46a0299cdad34337f29b2038e511
-DIST genpatches-4.9-87.experimental.tar.xz 106440 BLAKE2B 287fbe6a213f9685769ebf6468b932c0cf2532acb17cd71abd5a89e0692e717adb58852bd5fe1123db839702a3329647e995b4adfd453843cda8f5f2ee761442 SHA512 944ef5dc4b13340935a0ec7e0e10ed4bf5fb5b399e7ba23b15a5dd552376750020dfec16cad05f38c4af66ae27d67212773a4220deecd883133fd68a5e55d772
-DIST genpatches-4.9-87.extras.tar.xz 17352 BLAKE2B 671b4dd2905585f9a05120520db4aafb71bc5f05ce4baf9714f444236efd7206af0bebfa70e59d5f4fdf11846b315d7184e2c1ae4e8aec9d4fa569ab720ced52 SHA512 96547f3df68212058559b1c59ba17a2ff0f51a0c7792c23d0b18e85bc1724024e1cb5bda3f5d6933da825d1fe7cad5371c6bb356ad53a587aa6cc66572576b8e
-DIST genpatches-4.9-88.base.tar.xz 1635784 BLAKE2B 984b572eda6e5e529b572e184b4f0a37b6d9f919c4711f5f73a89a8214ab2671bd4ab495e16dfd77e802692e769901865075779cf404f359be14921b0f5e65af SHA512 9041d8fffb4e4242aba90472c2469ced6c71b2ab51c135ae2dfc8bb48e5f56cf7dae9405445282db40dd0ddeb4d8c5ac615d00972ce16550084443964c33260a
-DIST genpatches-4.9-88.experimental.tar.xz 106372 BLAKE2B bece20f11e36c6aa3d40e82a411515aaa71ad00910dc73bbc303b3875d18de664e1b9daca434359f1ad0efdb4500b362d208f5161df4e5846955c671f2dc2d7b SHA512 85210e31c24cb1380ca9c55c63838857808ed57f35982231d0d584e1dc8827008087a51b8ce23c3f947f94085d85a00e822a6cd42e3fee70ad4630e264d7b4b5
-DIST genpatches-4.9-88.extras.tar.xz 17360 BLAKE2B 00e0aeb808a94997964f266f4518b97163f5f25948940ac15a0f77c3a53e8b8ea60361071b332ae095c96957736c1640034ae51a07fdecddbd73d6678ad61897 SHA512 758ca092dc266278b68dedeafe98831961a0eb0beb89f8ffd9dd398b38808cd0d26d0f7c527dcaa4d6fd3bdd33838d37d057fc2a88a3a77723158bcfcbda57cb
-DIST genpatches-4.9-90.base.tar.xz 1660088 BLAKE2B f8149c631938301b133ec97ac2ce6342c4eec8214b362a775fc6adb4f5d7baf67ff07bb94a6de4089deecdd57dbedc47a7ba94be2d02d2ef943f6ce44fa46a6c SHA512 720b45fed5d5f8374947789495086115bca9d0459ea3af7455555da567000a3de02562b9566f571b0251baab3cadda36372dad1357d7d8a198cd5bd95a304f56
-DIST genpatches-4.9-90.experimental.tar.xz 106404 BLAKE2B cdb2003891ad215d84c770638ab21f1ab343ec594744f3b69a129318b7766e88452dd98bdfc9d9d716f4b1301c861354da6b4fcb9ce70f22a72cdd0769fc5281 SHA512 ab83178e9fac2ad3118ce7d08c37024f7452a113bcc98b783d038e4b31cc1773e93ff3e9d730a62ffd22db5a6c3ce9708d63acf55ea4fbc61ddccb5e70731248
-DIST genpatches-4.9-90.extras.tar.xz 17356 BLAKE2B f55389b1a34c0cc5e90d534130dfd502117edcc43e1d00e2a359f173fa7be613dd8bafe6d9922ea22652fe43e40803d86e9f103df6453a32a0e2862d3c546792 SHA512 04b6ef6224bf37e908efbc6ac2a6b12f20306b69ea87380da6a5858752c4409e49ae07cb334ebe18ecbc2ad46a9e1f7b480b2ca07f7ba5fdae5f4a99b7562996
-DIST genpatches-4.9-92.base.tar.xz 1730124 BLAKE2B 5780324beff88240c8b40594dfb9acd8e922d3985f4242eec60c7111e3e23b36016a47990867e98b2fabfa8f698bd29749e9ca8a9062875edce50638d99fec92 SHA512 97a4b956d0d6e561ebdfcd665fb61ecd73c9958d0128a0696cbe8e0a4f89def8cacfd6fe1a799bf24a6a0aa5181c7456813d82410904c649b876bba9ba1180b2
-DIST genpatches-4.9-92.experimental.tar.xz 106364 BLAKE2B 5339624160c3d7f7dc32c39dcce00a575f24a1ade8140462f8cf7b369f5c584e1845741b483d79a2fe25c405b4b5d486059fdeb39df2ec8c13e1d0e47d37732e SHA512 f872f13319637634cc25d4d68697dcf865ff10ae284413238545a9ceadcd5868750d34ae32d3bb850d3d0547430edd8d6f01efcea5756420d148db6daa1523f1
-DIST genpatches-4.9-92.extras.tar.xz 17356 BLAKE2B b423959ebbe6193dc78214df91ab821f74cc258421891c3bf7d5ddb1fc1e125e5c185ac12d70ea2b0199115d554ed851ffe59c1f799346803446aedb79801a3b SHA512 666b5f9a473bb197e9782ea20b1de79f810a0440f5fe6bda674fdd78601f33e3f97947d5201b7d3c6028728c30810fb849ff7cd2df9133796031fddc021f08cc
-DIST genpatches-4.9-94.base.tar.xz 1785504 BLAKE2B 8d6caddb3b3119f14c85d45f4270a666a36b1d36deb0e462765cef8941c2ea1aa2c7a9df2101d349e1831a3b16ff53aa8b13049dcb250d3d398884021420df86 SHA512 56e5a40025c9773bff4a051ca35b3f1a1c24dfd57f5164888adf01feb9ab6115aa89fda4c38c8fccebd74826264d5289711689848bbf358390d9080f6fc6feb7
-DIST genpatches-4.9-94.experimental.tar.xz 106392 BLAKE2B b00950bbabf69b13e4a79cc631827b8633b4f446940c5987c39bebf4d534ce3f28e9d3c225503eaa95ff4cce9d2ffcfbda549840c9c09886e5e03c23b76f7a29 SHA512 3f3e9e5a8c165f1e939f5a6312646a7603afc6598fd91bf3973048a474ed72e016a516ab10d3d7f684ce067cb89a262df735b9365d5110a3e0eb69ae360e0d69
-DIST genpatches-4.9-94.extras.tar.xz 17360 BLAKE2B 5b344383357997baa3a0fc315fdcd1376b523977d33cec40188ff5587d863980b7d52f7ca8e64a2cf72595992016f28df1bc00e3dfcb78d28777dbe1fc07e40f SHA512 a19fd32c86acd9e0c26628027454d9fb9c1b962ae2f748786129cfc0d6d7eaca16d081307b3cabfad2663e044940e689fadc2dac15d1aa51d381b57fbfb6b50f
-DIST genpatches-4.9-95.base.tar.xz 1790556 BLAKE2B 0924b9be32773d3bd43c83b6fd4d3d6ab6a0fd7508cb2c6c43ac92287c9f1c5df831c85ca282a2715fa810a94b76a5382a514a35e076d464779ac167556d8ed6 SHA512 13414f98a1b3ea42f96c28c4318f7bfbe86e7ea423931601c4c3358b6d8c765287dc26fc6167d08f6905694afe2928c3b694f33d405995b33a4d8b840f06224a
-DIST genpatches-4.9-95.experimental.tar.xz 106400 BLAKE2B 79dd25cfe14168803df4aeebee12fd9991cc23bd59cc828c2287e5ae2c2d3a4bea755eaa156bf2fc363e2cb2970788279791d424e3af27e45a9b199346f7754c SHA512 7a15a29030be288098f7ef06496d04e52e670084dce7867bc69f9719995c455337528d4dd46f09c1f11b857bb558871f810d17c5f083ce2bea3eef15cc082c39
-DIST genpatches-4.9-95.extras.tar.xz 17360 BLAKE2B 67ce70cd81e6a09636e94cdab628d26cb0df9f5243ef8cb8f52a131260e0a518a26df9d05acbe932ed969ea802285f0b578cadce8cff81ca2678f84e21ec7f3b SHA512 fc95505f3a2a299602a9a1e6c75d660fb03c88b859c5aa0aa38c3d48ce2da9bffbb3429a3eeb55501aefbcbc296e3e1cc66c6837f86d2dcdbaf1a612aa0baab3
+DIST genpatches-4.16-9.base.tar.xz 196768 BLAKE2B 25c4b6a22a9a07af643ddc73fea2cf6e997f5cca89f86cf8386286d1b63e0c0dd393f138f66f87773d9eba382bcaec3a2562d2a4c22140a61358cd2612e11d4f SHA512 aab3c760270e8d72c892d58a88fac3db792150a8f7157a2fb656d52ecfb29c9f6a049783ec9583b98b9cfd09ae6f77f672ef375d6a260cb2cb4df8157e5398a7
+DIST genpatches-4.16-9.experimental.tar.xz 5164 BLAKE2B 0e8c1ce1a65404faafe4c0c7163cf87ce4ba4195edec6caab0dcbffff5351c6b211b233b6b659a7521e48e11e0fcf726e23341728591e9dbf305a4cac4500175 SHA512 9b4003d7902152183e4a76c54e0d4d09da33c9956aadafef4b11cdde81f7539a0d7931f4ae7d4d7e02928bbd7c128eba5fda00319723c1f7c2a7abb34ecddc9c
+DIST genpatches-4.16-9.extras.tar.xz 17492 BLAKE2B 2e9bb4e33e33f0b5ba923bc0036a3697abefcf7c439dfba68beb0c4d0a558dffde1c9224f56da6bbea560bec3664cb1025c0ce1c961037598523d1af0d0513fb SHA512 e1ed8a1532488aa849969a90bf299eaf39233695eb9bda7b070a87906b8891e2332a06234d4b2c98338b04380020387b8fb212dc95072ae79cc58274e8118656
+DIST genpatches-4.9-102.base.tar.xz 1971300 BLAKE2B 1d0a9bdbabb19e482249668052f06578c791a90b15fd771969e58049f8fd7c029901d78ff4424915f1a7d245a02757f19b3796500b508d8cc7c7ff93fec6fc5c SHA512 002cb87ba93db70f6de6bc0fba42c49b2d3ab69ce9f28f783a161b0c0b60d7235f583b535ec7f9735974decb98206f73a36b8ffbf2521ec524cbf5ccb0793c89
+DIST genpatches-4.9-102.experimental.tar.xz 106380 BLAKE2B 59e2fda5661bcb77a1e60fc6fe9dc8a78476891ea203e2b4ec02389c01e702200bf5dbe8fe1d9bfecdd6ad59fa43d1e20c9738f929949c3442ec301b0a4a27d5 SHA512 0cfe440902f209e9e74bbb424780b19538d05d43388ca6d067633be479c0ba6b459d766617a42282ff53ed25374da469226825f31969ef7c128d2620b69af43e
+DIST genpatches-4.9-102.extras.tar.xz 17356 BLAKE2B d9a05e5b95c7a4c2477f01c7cef7b58697d6dc4d519bec5494fdc946a1a2b6e5a2fd9a0b6155dac84539a0aa6b2dd4583aa9180b19702062567189a460859387 SHA512 3b97bdb3f49676a43f378a95773b38c3650aba89f2d74e55f14762868983254250654ca56368cab41a150b04a32a190d8238a7bb0209196b80202cb2e9ca5040
 DIST genpatches-4.9-96.base.tar.xz 1813704 BLAKE2B 43236fbdf22137a2f98c617919e3a21208cf7269a5d5e51d705734610e348f443b57677e3c00aa1d75a73c68314de537252eb24bd23cf83e8d7de05c2f111526 SHA512 c8275aad26fce06c6f8286d4341964031aaa5308ee4e0396fde48f3abbc97fc47db6bcc67764ba424dbed6d93fcc935f07831c20c5dada21acdd9e2d9575a5d8
 DIST genpatches-4.9-96.experimental.tar.xz 106408 BLAKE2B a959d2df5d348d1dac693e9e99169f7f87a0234cd45e4a7b8f77e5d446cb844ed210ae64e7d5f50239e5d4e1d55da67ab740cf803d428a683d23ac481731ce80 SHA512 aa23d0364460a82382f6554416019ae1bec6fb61e3dc18ed2c9366b25f47fac447c30ba5316b5b627e041710cfd33d8411c998bba1e5e9ace722aca304ce9816
 DIST genpatches-4.9-96.extras.tar.xz 17352 BLAKE2B ab1643d3b767b33a4f0cf1d5de5fd373d7de89f2eec1d0c626cab8155b057d18667f614bc1cf29926e5c55538ed4570ef9c25aef171f13d8c86fb3aa130174d7 SHA512 7a56e5b5108ed398696e220c25859ac1a5a9e02afac6659977f1c38b8d0731ee9b8455654d3e5d03e50f188ea0eaf2e8714435eb241a4bb7fdc6f2b273859661
@@ -80,32 +37,19 @@ DIST genpatches-4.9-98.experimental.tar.xz 106408 BLAKE2B 27dea027500bf5c2230db2
 DIST genpatches-4.9-98.extras.tar.xz 17348 BLAKE2B 03b455ea225eb4c99f1c263ed694de45674e2242c00776462a412e8a49fc826cf26630564857207b7944d5b5ff3f8955a3bd0a7ae3a33bc59bc06bd3f0c064f6 SHA512 6bba9882f346577fd685de2172e12708fc757f86efdba63d33d805710e00bf4eacb537968a548528a20d50f5a726516050e0e4e0170d3db652bddbaac9d3f23a
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47857f0bb82ef43ad1140c639d0dc5553e64d062f67486eeff780d5df8d971051fd5a626b51bed170067fea11e0 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
+DIST linux-4.16.tar.xz 103020152 BLAKE2B c7f7b36280b74b2112a098733680e1e93c4f99571099d471b2dde5f7a746d9b9fab5112fffe3b7978c40f15ecaa33203eeeeea98c2158fab2d5857ece5d74f9f SHA512 ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST patch-4.14-ck1.xz 84904 BLAKE2B 6f9510643382d44ab79cbf8c4e8210ae7d30c37c78a9eaacde1296532751b5c881b8cc649266c29d73c1f663e60ca92856f6bf589fc449ff5cb781dc8b5ad8f1 SHA512 5e81d6a8319d030572ad5b6379bc43f2f5f98b6e4f050b1285bd6004516d1bf2e8eee8d3425a09317e15309cf030da2534417265b474aaab80e72e22c04741a2
 DIST patch-4.15-ck1.xz 87292 BLAKE2B 64ae34cb7aa20bcf6bafa09d61c820c361758db633f0366f303aed718e7ea29313cfbfd5f859c3ba4590cca96cb31b848986cf133ad68c6372a6532f05e90bc3 SHA512 ade9fb1e712acd6a0d0b993a22119707d95ac08a55ad9b7474c7d0ee4b8b2bcf07ad9dda92914abae5469e8c569f49a873eb3fffe7e821affb671e1a61d433fa
+DIST patch-4.16-ck1.xz 87056 BLAKE2B f400c4e6c9714f734373fdf8634bb355bb7fdf962d82a30fa4b2a019796616800cb4daa4d965d53f8171e4b0a0971adc9d2958e7b8f894050140059613c72bec SHA512 1304d1d3c799611c7dcc3df763b8764d673d0e59ae16df56a10ccf06cc05a5a283725e5a4b83d833aa9799a7689fa3442fd6246d9568093e16e679cc7fbcaa15
 DIST patch-4.9-ck1.xz 165624 BLAKE2B 7b3967e92446f2cc70efc24aa0bd94db056015ef20f8b11703935dc92b272657c94c9d2975520906a0cc026383d0734306078878389d514071e8f39f8d06f228 SHA512 335f83b8f77c4c2c304db74268eae895ec53611b2cb5ed45a9c6e7f9c7ac37c2eba7cc714d49504ae29cc44c448aa873b52eb332fe91d4e6dbbdd2a175aab252
-EBUILD ck-sources-4.14.22.ebuild 1890 BLAKE2B 66013c22ace0e765ae3bfcfc8ab989f9fa6bbee6d890f90059f040a37925471a11fe05f79368c37fa1058273564d95006f02153af2569a9fefaabbd253e9a1d0 SHA512 7f77c352e88df821485f075ce214cf6ef1c276c62ccad00d213b725659c06576b2af48aecfac235f3a45055594f80ea8135cd76492f34975837eff8f12535976
-EBUILD ck-sources-4.14.23.ebuild 1890 BLAKE2B cf1c59b9fc90dea89ab3aabd4812b6c3071b98e94adc3d1e562c65ed26769f3c9a7d29ec2cffce9f94fb01467259901398b38d303b9c372431c75951a6cc0213 SHA512 45a3053035f3a905ee0f4b523c7989dd453eb4a1733ec2663d3c862f627b0f12e51ab1f186628b2b542d0e8a0024d0261686bedfdc412783fd0493fe7ddcd1d1
-EBUILD ck-sources-4.14.26.ebuild 1890 BLAKE2B f8faae325cf8c65a1e120f107274ca3ec607c86564a4f066c8f549bedd0ec16a323a500c38cb15b059c4a36a045cd57adcb7edd964225ed7c137823301fd66b3 SHA512 77103f3497a7ec2dee9c93d54832da23064cf5a1939fd6f24c23cf32c69e8db4c9e734269c20192c826df7db39489491921f725ff657a5caf1ff782a2738ce2f
-EBUILD ck-sources-4.14.29.ebuild 1890 BLAKE2B 5817c6a0d87fdc722b51b245f5a66a6f6d1ca00ae2a0a94b2eb598da6e0b242cdf69687f98dfe40a5e7cbbf6c3c6663ceeed6f14ed1fbdb8140aa5f513eca708 SHA512 4d93887bd4a3cca7fbf5ea4d9690713dd69efa15f58bb8a30041e7562eb28fe91975d166a85f5dd57a5972b1eec5d91a390d616375c2616e929a53387e67f185
-EBUILD ck-sources-4.14.31.ebuild 1890 BLAKE2B 45720cc0ad329ab7aa2242773851c977c80be591623050e9794c45682de15929ccf4c5cf4aab89e8e86e2d8fe8ed9daa9b8dd5f54b6fab38e4930f19a9fead7b SHA512 70dd6fe4870aaeccd2173b15210ae2f23520eede9ad1f79307e2ec0f995f332473cdcf2fa66403db8e2f2d0d72b0892b1bef0aebd1af53077cebf48edbba38e7
-EBUILD ck-sources-4.14.32.ebuild 1890 BLAKE2B c976cf175cd88cca7e6344b42cd4fb5cb958d093bdf458dcfaf6380008c03f20abe9755b740a5e019d5c4bbd57a8779af7ba49e045ef11b38f1904162f1c7c5e SHA512 9a844d74b522e8dbf09b1b068aca900f9f9b7f2e91286e7576ea4db95f6b3a92d6bc165b47ff707680452f00274f834db98184417f68a65c7128c7f79025963a
 EBUILD ck-sources-4.14.34.ebuild 1890 BLAKE2B e396f6558628023e7e5330e522391c059e31ab39bc5addd537616403192271c8ae26bf7ecba0a2e0aeb2225b217020208353b5f6a4620ef42513c172937396ee SHA512 c7499dd57c0f03fa45f954fb2a6dd73d5821589be82e2d58a71fedc81c7587110a7af3808e5fd19400c0e77cd11d89dede429a817c8092cfec82e562b91295b2
 EBUILD ck-sources-4.14.35.ebuild 1890 BLAKE2B 31e796623109a95e9479c14c1fe4215d48703d0daf74e31ac9bed2241316610a57eceff0d1877549cbbe27eacb2445965cf58cdf5ff12ac5353245b0173043a1 SHA512 1ebbd911db82c82361b31f38126b6e8edbad30d2ee33857635237d0dcf7a83ca31eb7235bd67b07522b9a4aa9bcdb735bf2382c9a4547d834d09df9915076ab9
-EBUILD ck-sources-4.15.12.ebuild 1613 BLAKE2B 5f84b0524878bb19ec8f66c8fdce61f131e4370bf2ea6c23953ea151bc63b6051af1a54432c254ffb6a1243cf3dd99510a00e750eeb1a6529d594b8c8d46fab6 SHA512 5983195dd52b280fc58f08e01202f574b462e7aedd7192122f3ec55cb7f7a11e25d392f3cbda91519d8653a1edbec16648f6a6bd0b0cad026e999e6d6591c5da
-EBUILD ck-sources-4.15.14.ebuild 1613 BLAKE2B 384989f7a3889ed42cbc10c2f7f121bea04529354e5bf756ee791c4a87d5c0b8d3fce2af59c571cdb30cacac8accf48c17d2dbca1895260079db2787225a7861 SHA512 92e3e8f48b4f89c5c76ee5b2f79439d3267e99830c2558f1d94018bb679650713617feab4d70b7c9ba69254a4e598a30fa72800f0a4428660489655f5e074e55
-EBUILD ck-sources-4.15.15.ebuild 1613 BLAKE2B cefa100545689cfba0c5c8c1c90084dc18e243f4e81e2a84239ec5160660f9e690023decad8ab4856cb42cb256ada3df33d750a0167165a64c92a63dd4c1659c SHA512 05a736b59eded5eabda90408b864e3a8aa0d3374e1e925e30592cb30e892cc5b90902c798d2568f474d32131308ae5124ee76e9d103cd9133180571d7c6b3bf0
+EBUILD ck-sources-4.14.40.ebuild 1890 BLAKE2B 1189c57b729c29b7fe37d421e69a5bef9f1ee9d6ba9398a116bb40b839927a85925678a65666c24ec26cc445e332d7d56af77a91d19b31b574e3b3068279fe8e SHA512 6eb6b7001d973e354163c8ced89ae13999a0b8d9aeb4f469c0d46648960c05433b42186376ee815944460e0358761c3ece9fb97a89a15b104354fff690004e62
 EBUILD ck-sources-4.15.17.ebuild 1613 BLAKE2B c686bdc39cf2bcdfb39fc6bb1d022abe7c89c6bf56d6768dca114ef37a75028958760b0248cd998fca8e38b0eee1a91fe60f377855bbced0962ebdb2e6fc1d3b SHA512 c89b106684d799d5cc02f57b2c963ceacd67ec9319aa2ed4d56a377699972d817463fd5dc1449bbde5b000f67944430bc6de04275ed8aa8fc261ca63636caec3
 EBUILD ck-sources-4.15.18.ebuild 1613 BLAKE2B d44234f86f13cdddd3e9e4aef9ba9416fa99f43dfd9de249fc38e7c51f733bd1ca21ae07fc2f862e304139ec5bff459022054978931996d8c6c033f89331760f SHA512 ed30d4061718fd052ec346697a2d5f6d737d4bfbcb16ea9164d0d45f6cb9312845d1301ebb1f51e759a1748bf44f2a6080132cce3ed8e34bcc1e2c9caa8c9109
-EBUILD ck-sources-4.15.6.ebuild 1612 BLAKE2B 7cf7e30bde39b57d01d8f3eb5fe8c32cb62ffb78997d93c5c45c60ff706e017baa1d57bffed41a2c483e9151ec1fafefe83f21ebae41c6a7e714f3634bd338ca SHA512 45d7f70485cda738006c8003f0d4841296eefbed214912f95295630027372b22c774124efb502dd92bb1e38647cc3c88614ad77c51b316ceb5093ac955fe8a98
-EBUILD ck-sources-4.15.7.ebuild 1612 BLAKE2B b4065b5b7b954efe9f1dd0c947ba8254c5720e29be9b310bf5a4309016a4413233da74737d65e9c6f1a36fa923323eeb2920093e34f6df538c8e07fc3a4147a8 SHA512 c2739523c055f939b14ac149fd76788100d0fcd5d750056cbecd1935b80effabc11de5caf9ab96df946d45f4c354b780e456990a0a4037d49e49c4b5045a59dc
-EBUILD ck-sources-4.15.9.ebuild 1613 BLAKE2B 4b214a840fbc800fe35a2250ffd45620b592aa1697a5f939b09ccfa15e10b7a270bc0f4ac39a3457f7f63da1a628305c724d2c71c82bdffa4ffbbffc06faff32 SHA512 2d38fbe9f0768c0d640868a06fcc2bfbc330316a774b664ddab249433a207ecdf11f8a784157fcce7df7cda57065b821d43d3ce923398ec5a67dc88468c03987
-EBUILD ck-sources-4.9.84.ebuild 1891 BLAKE2B 98c1e3bdc6d7b07243fa6ff638e2dbffe9e7d88a249ca9591cbb821bcbc4457c8afef5fb37c8e19228ca2a036d6575e1af8d48c94a722905139e76153ae729f0 SHA512 97231212b9a3a367ff9df03f7439a56d40692933c3ec30b38e8069f41d38ccfba83b05d47be764dc7b2d4109ccfe84e7780bc67d8bfae34ea32e7eb8a7bacdf0
-EBUILD ck-sources-4.9.85.ebuild 1891 BLAKE2B 3d57df1d176051ecf8104b12cfd48b33fc97a4fce0a14cf1dec9c70e4c260d45eed13a1bc3a7adc65748defac19131e1c8dda39e04d6efbc46005e6125cbf2aa SHA512 b1a3cdc53d71303b3c5bf7de404c16b205ec5c027b9eccff3567a24842d236bcd0f8547fda4a405d19c774bd4fb10f66a974aa3ceb4a50251fd76c68c92dd217
-EBUILD ck-sources-4.9.87.ebuild 1891 BLAKE2B 53b8f72b439d2c2121b9f708ab43f96d8f4df60ce11cc023eb848a6c5ae7b0fba632ed8af4d89d48b609e0d862a663182f070b4704dee956556a1ecfd566e0ca SHA512 706296a5e123669d68318a79db366937230b15fcd87dcbc84bb9c25980a2bf83c64616f7534ea473a3d22f1298f8b8c53642a7e1253aaa4cb300648a3a4fe283
-EBUILD ck-sources-4.9.89.ebuild 1891 BLAKE2B 9d4b04aa091dddbf6ac86c5efbf1bf75613f9ef190a26139b9b1d4b7c9aa8858f421094f516b10e433566828888992f32f29b42fbe387e372bd63d2893d70aae SHA512 fc60196aa547dc2d4ed46f834dda8da6b6059a46f0a722d114f91ad155f145d5dc5e1d22c18e8a864edf98afbf55d0a4877b61350fa47e95a370200b639fbb5c
-EBUILD ck-sources-4.9.91.ebuild 1891 BLAKE2B 5f3e74dc3942506340e002269c124535bdaa450c0d57b6609ca9c3e843656f7742305bdb249e3b9e1f9f17b52d32683f170c3ebc5f17ece0b079a744c3be2f75 SHA512 e2fe946149c66088d2407741aab0c0104845445afccd616967f082cc36669ae9edcdd37ce21d6936c08e94ed56c2fbea0f6485c71db4610f4dff614630c79653
-EBUILD ck-sources-4.9.92.ebuild 1891 BLAKE2B 9389cd706b5706fcf4e2f23fffa77e75faf5cf11a85a883f2682ff9736179529360a926998e275c2fcaafb25b8ccc3a52503e705b031ecb91fd0224b2ec4fea4 SHA512 ed7969baeb8cfde310f65d1dee1646e18c08a64ee0c8e0da486a8a918bdff26c4866beba90ef5c3a7e6d550d016c513dd387b68848c129e10a3eff24ac035562
+EBUILD ck-sources-4.16.8.ebuild 1612 BLAKE2B b4065b5b7b954efe9f1dd0c947ba8254c5720e29be9b310bf5a4309016a4413233da74737d65e9c6f1a36fa923323eeb2920093e34f6df538c8e07fc3a4147a8 SHA512 c2739523c055f939b14ac149fd76788100d0fcd5d750056cbecd1935b80effabc11de5caf9ab96df946d45f4c354b780e456990a0a4037d49e49c4b5045a59dc
 EBUILD ck-sources-4.9.93.ebuild 1891 BLAKE2B 6b6fbd4a9ada3a7f348012e1d5dd541a8d8c930c9bb51737f2e12faadb57fe9c2fdd54cf88361557b3cd69c8891815b3f0ee38875d631745bb4f4ac3915ab6bd SHA512 bc67bb18bf2d98ee26f575feae16696e695c93f3591d2cfefef7c6439fdc8b7d5f69ec06953d20c56dad0c251acb1148ab8dedabd28d84c79c0a02c4b40f69b1
 EBUILD ck-sources-4.9.95.ebuild 1891 BLAKE2B 69e55844a6b354cc046acc196ce3c966c05e8c1fb27e06f7bf7cca68b8ef0fd98ad1057195a11de52810d0b6d64e97c76421d67f76107a87389daa9218be9d8d SHA512 e60b5414bd80181ba16a00841a2ab51923996bae6401121ddead1ed199bda77525651e3e754f980186ab64e20fee18dc45c46547ae3d35d4ced73caebf8a7237
+EBUILD ck-sources-4.9.99.ebuild 1892 BLAKE2B 0112b97794c6f18328ba0e2063bbd238cb515091c8c530fcf6170d62ead611ffb26fc9ca1b9ee314a8db009e2475f609ae81d7bc055c9be97f40f53c4616b03a SHA512 7c4feace1bfe13cf8d4e576fd72e3e066c0eac1d0a2fae5e238c334fd719f3fcf631f907f7a47dac495f97cec6eafd44d64f80c7b76b04ba49ce580313f8b55b
 MISC metadata.xml 921 BLAKE2B a4b785a7d542fd5b1899749a5b83eba87ab3ab3e6dd30cee33f7f762e6b433ce4fb47a119b2162ec088b483f0469ff526093c9775b1e92291c5330c64cf2d10e SHA512 611c76b0b27282067a51869db434ca837f604ef75fe54bba2f18f12c41dbd4a62d5c9e2a53bf5db7ee824bbf4d663db6b5292316bde93aec771356e34751496e
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.22.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.22.ebuild
deleted file mode 100644
index e1c3b9acf727..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.14.22.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://kernel.kolivas.org/"
-
-IUSE="experimental"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="27"
-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}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-
-# Fix for: https://github.com/gentoo/gentoo/pull/6942
-BLKIO_HASH="25849740d77dfc089fdbfb53623e50d38a972aff"
-BLKIO_FILE="${PN}-4.14-blkio-fix.patch"
-BLKIO_URI="https://github.com/ckolivas/linux/commit/${BLKIO_HASH}.patch -> ${BLKIO_FILE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${BLKIO_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-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
-}
-
-pkg_postinst() {
-	elog "ck-sources previously enabled CPU optimizations by default."
-	elog "USE=\"experimental\" is now required to enable this patch."
-	elog "this can be set in /etc/portage/package.use (or make.conf)"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.23.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.23.ebuild
deleted file mode 100644
index 479516074432..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.14.23.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://kernel.kolivas.org/"
-
-IUSE="experimental"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="28"
-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}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-
-# Fix for: https://github.com/gentoo/gentoo/pull/6942
-BLKIO_HASH="25849740d77dfc089fdbfb53623e50d38a972aff"
-BLKIO_FILE="${PN}-4.14-blkio-fix.patch"
-BLKIO_URI="https://github.com/ckolivas/linux/commit/${BLKIO_HASH}.patch -> ${BLKIO_FILE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${BLKIO_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-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
-}
-
-pkg_postinst() {
-	elog "ck-sources previously enabled CPU optimizations by default."
-	elog "USE=\"experimental\" is now required to enable this patch."
-	elog "this can be set in /etc/portage/package.use (or make.conf)"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.26.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.26.ebuild
deleted file mode 100644
index 62f9426536a9..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.14.26.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://kernel.kolivas.org/"
-
-IUSE="experimental"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="31"
-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}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-
-# Fix for: https://github.com/gentoo/gentoo/pull/6942
-BLKIO_HASH="25849740d77dfc089fdbfb53623e50d38a972aff"
-BLKIO_FILE="${PN}-4.14-blkio-fix.patch"
-BLKIO_URI="https://github.com/ckolivas/linux/commit/${BLKIO_HASH}.patch -> ${BLKIO_FILE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${BLKIO_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-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
-}
-
-pkg_postinst() {
-	elog "ck-sources previously enabled CPU optimizations by default."
-	elog "USE=\"experimental\" is now required to enable this patch."
-	elog "this can be set in /etc/portage/package.use (or make.conf)"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.29.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.29.ebuild
deleted file mode 100644
index abecb2ba12e1..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.14.29.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://kernel.kolivas.org/"
-
-IUSE="experimental"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="34"
-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}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-
-# Fix for: https://github.com/gentoo/gentoo/pull/6942
-BLKIO_HASH="25849740d77dfc089fdbfb53623e50d38a972aff"
-BLKIO_FILE="${PN}-4.14-blkio-fix.patch"
-BLKIO_URI="https://github.com/ckolivas/linux/commit/${BLKIO_HASH}.patch -> ${BLKIO_FILE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${BLKIO_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-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
-}
-
-pkg_postinst() {
-	elog "ck-sources previously enabled CPU optimizations by default."
-	elog "USE=\"experimental\" is now required to enable this patch."
-	elog "this can be set in /etc/portage/package.use (or make.conf)"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.31.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.31.ebuild
deleted file mode 100644
index addac9bcc7e5..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.14.31.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://kernel.kolivas.org/"
-
-IUSE="experimental"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="36"
-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}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-
-# Fix for: https://github.com/gentoo/gentoo/pull/6942
-BLKIO_HASH="25849740d77dfc089fdbfb53623e50d38a972aff"
-BLKIO_FILE="${PN}-4.14-blkio-fix.patch"
-BLKIO_URI="https://github.com/ckolivas/linux/commit/${BLKIO_HASH}.patch -> ${BLKIO_FILE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${BLKIO_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-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
-}
-
-pkg_postinst() {
-	elog "ck-sources previously enabled CPU optimizations by default."
-	elog "USE=\"experimental\" is now required to enable this patch."
-	elog "this can be set in /etc/portage/package.use (or make.conf)"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.32.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.32.ebuild
deleted file mode 100644
index 78e0c96ca2f9..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.14.32.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://kernel.kolivas.org/"
-
-IUSE="experimental"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="37"
-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}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-
-# Fix for: https://github.com/gentoo/gentoo/pull/6942
-BLKIO_HASH="25849740d77dfc089fdbfb53623e50d38a972aff"
-BLKIO_FILE="${PN}-4.14-blkio-fix.patch"
-BLKIO_URI="https://github.com/ckolivas/linux/commit/${BLKIO_HASH}.patch -> ${BLKIO_FILE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${BLKIO_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-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
-}
-
-pkg_postinst() {
-	elog "ck-sources previously enabled CPU optimizations by default."
-	elog "USE=\"experimental\" is now required to enable this patch."
-	elog "this can be set in /etc/portage/package.use (or make.conf)"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.40.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.40.ebuild
new file mode 100644
index 000000000000..60cb34cbd3fe
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.14.40.ebuild
@@ -0,0 +1,67 @@
+# 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/"
+
+IUSE="experimental"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="45"
+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}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# Fix for: https://github.com/gentoo/gentoo/pull/6942
+BLKIO_HASH="25849740d77dfc089fdbfb53623e50d38a972aff"
+BLKIO_FILE="${PN}-4.14-blkio-fix.patch"
+BLKIO_URI="https://github.com/ckolivas/linux/commit/${BLKIO_HASH}.patch -> ${BLKIO_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${BLKIO_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+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
+}
+
+pkg_postinst() {
+	elog "ck-sources previously enabled CPU optimizations by default."
+	elog "USE=\"experimental\" is now required to enable this patch."
+	elog "this can be set in /etc/portage/package.use (or make.conf)"
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.15.12.ebuild b/sys-kernel/ck-sources/ck-sources-4.15.12.ebuild
deleted file mode 100644
index 4abf3a4f1b03..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.15.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://kernel.kolivas.org/"
-
-IUSE="experimental"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="15"
-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}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-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
-}
-
-pkg_postinst() {
-	elog "ck-sources previously enabled CPU optimizations by default."
-	elog "USE=\"experimental\" is now required to enable this patch."
-	elog "this can be set in /etc/portage/package.use (or make.conf)"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.15.14.ebuild b/sys-kernel/ck-sources/ck-sources-4.15.14.ebuild
deleted file mode 100644
index fafc9ce71fc4..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.15.14.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://kernel.kolivas.org/"
-
-IUSE="experimental"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="17"
-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}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-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
-}
-
-pkg_postinst() {
-	elog "ck-sources previously enabled CPU optimizations by default."
-	elog "USE=\"experimental\" is now required to enable this patch."
-	elog "this can be set in /etc/portage/package.use (or make.conf)"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.15.15.ebuild b/sys-kernel/ck-sources/ck-sources-4.15.15.ebuild
deleted file mode 100644
index d16a67711be8..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.15.15.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://kernel.kolivas.org/"
-
-IUSE="experimental"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="18"
-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}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-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
-}
-
-pkg_postinst() {
-	elog "ck-sources previously enabled CPU optimizations by default."
-	elog "USE=\"experimental\" is now required to enable this patch."
-	elog "this can be set in /etc/portage/package.use (or make.conf)"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.15.6.ebuild b/sys-kernel/ck-sources/ck-sources-4.15.6.ebuild
deleted file mode 100644
index 80926325639d..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.15.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://kernel.kolivas.org/"
-
-IUSE="experimental"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="7"
-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}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-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
-}
-
-pkg_postinst() {
-	elog "ck-sources previously enabled CPU optimizations by default."
-	elog "USE=\"experimental\" is now required to enable this patch."
-	elog "this can be set in /etc/portage/package.use (or make.conf)"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.15.9.ebuild b/sys-kernel/ck-sources/ck-sources-4.15.9.ebuild
deleted file mode 100644
index 05d896dd38ed..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.15.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://kernel.kolivas.org/"
-
-IUSE="experimental"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="12"
-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}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-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
-}
-
-pkg_postinst() {
-	elog "ck-sources previously enabled CPU optimizations by default."
-	elog "USE=\"experimental\" is now required to enable this patch."
-	elog "this can be set in /etc/portage/package.use (or make.conf)"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.15.7.ebuild b/sys-kernel/ck-sources/ck-sources-4.16.8.ebuild
index b352d8bb4a93..b352d8bb4a93 100644
--- a/sys-kernel/ck-sources/ck-sources-4.15.7.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-4.16.8.ebuild
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.84.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.84.ebuild
deleted file mode 100644
index 387c01ad9f7e..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.9.84.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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="87"
-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/ck-sources/ck-sources-4.9.85.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.85.ebuild
deleted file mode 100644
index 1a8cee2749e8..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.9.85.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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="88"
-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/ck-sources/ck-sources-4.9.87.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.87.ebuild
deleted file mode 100644
index 641fad83e006..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.9.87.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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="90"
-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/ck-sources/ck-sources-4.9.89.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.89.ebuild
deleted file mode 100644
index 5339b1ef7233..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.9.89.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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="92"
-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/ck-sources/ck-sources-4.9.91.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.91.ebuild
deleted file mode 100644
index 387f26161a9e..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.9.91.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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="94"
-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/ck-sources/ck-sources-4.9.92.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.92.ebuild
deleted file mode 100644
index 983a8f7ef4f5..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.9.92.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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="95"
-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/ck-sources/ck-sources-4.9.99.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.99.ebuild
new file mode 100644
index 000000000000..f99f28c261f7
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.99.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="102"
+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 a6d9a3d06080..38900db3ad9f 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -22,6 +22,9 @@ DIST genpatches-4.14-43.extras.tar.xz 17504 BLAKE2B b506e40f952d0cee14ef1fe6aedf
 DIST genpatches-4.14-44.base.tar.xz 1161360 BLAKE2B e13b817a3261464583c49675546e7a748eb991ade835c4154574adf098a4e44a1758dc36f811bea8f1b9a510f5696189d60b68a22d9346ebd604fb90996168c1 SHA512 a8f973ff6079a83f51031cf9f65b66ef2645c366d1ab38d3675df8a6e5a5b0de7d6afa0a5cae1c1cea637c6db6a4405c28735226fb682dbed8b5df7c168a5312
 DIST genpatches-4.14-44.experimental.tar.xz 5180 BLAKE2B 2b0a02ac1babb43c6aa0e237b4c729f253112c0668084501bf93e793b8439621708564735ff9bc0b53ca264897c6ef7b8301856296131155aede01fb6a0f91d0 SHA512 e0c11a777d262818eca7cce2e1d060c8d21043129c2c45efb3bfad8c5a784d76c12798c6404fe5ab1e0eaa56a052681863cb635266dd90c3058e4e2fa114dc42
 DIST genpatches-4.14-44.extras.tar.xz 17488 BLAKE2B 5532729eee3487357fba7fda88e175cfdf50f58c093d4e147f56367cb08ac2ed4f3bd49c815f882816bf241d1a4dea7b490dea4d11226bafdf3d3664b1dd4ea1 SHA512 ca40fdab1333be01aab6f7a231b800f1aac55ed8a2a9c096d3a2d35e194a30db63703c094ce64b8f7006922931f170b2b079236719f310596b57c50afaf530ff
+DIST genpatches-4.14-45.base.tar.xz 1175760 BLAKE2B 6bc299d8072aa6e1f0ee3d338f20ecf9e17bc3f3c89b6458fa3c3b5616a58b69d32ff1c173202dc95a8a234a1cf3f6eee0f74028f6b386d39c1319f93dc3fcd4 SHA512 f1431f24c17bbe49e3f08d4041aba88bce22ef560c89cfe5c9abe4fead0305de7b27649e1dca8965867f115fc153839880eac5905aca74949289c8a061286932
+DIST genpatches-4.14-45.experimental.tar.xz 5184 BLAKE2B 501c9b838f5e44380043ceaa9f8a5d9097bcd97c9113874cd8c9959224d1556e64867605c803e02ba92f70e250cb8f96728dee728e52b97feaf43eeb75a95fdd SHA512 907a896f768ac555d04c7d5278c632bf9a89c556a1ba863d01ba73cfa98f20c5b12742cd057bcb6037b41d12420069ac7a2453774d1a79a4e68e1216c188192b
+DIST genpatches-4.14-45.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
 DIST genpatches-4.15-19.base.tar.xz 418976 BLAKE2B a3308a311f69861513ea5d0f92c65f180e640353e015e0e0869cb5aa1fa5f1d00bc9b3339f1115b1c0b193f6917237e029177d011a56660d43ae30299566d547 SHA512 16955bee641b1467f7ffed95100ff2e840093638ca5ded0937e2eac8854c6c213f0f466c51df2262d8f0feb41d265410bbc04f6ef0dd62ea0ab48777aeaef5c5
 DIST genpatches-4.15-19.experimental.tar.xz 5188 BLAKE2B 7057889db0d41a03e8a2ad1c3bb81f529088938ab8dfae6c6a0850de99af8cf73d9f4ebf9e7d10adcf4a34abdc516853570ad1f8d1d019bc256d2823efe47743 SHA512 74d6c91eaf4e6eea292aa1a268fec104f4d0b1baf6cf412fed32a6eebfb8c778d1f27d5d140f5addf4fc25fccb5b21b374760e3c648bb38517e316adcae2602b
 DIST genpatches-4.15-19.extras.tar.xz 17484 BLAKE2B 4f0dd93555cbdf9d64b94714e34430a0f55f1a36e509aaf0f6a367fb9a2875680f5a97205f08b8307f7e66d7e6479bb3e40823c763512387d0c6af3618a75158 SHA512 9779f34f4077b1dd662dccfec156682f1015163b75b084c2888b58372fc42e50f2de8f8f9011e5deea8850fe5e819ef3a6756255ef6171b6f42ee23d3eff4209
@@ -46,6 +49,9 @@ DIST genpatches-4.16-7.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daa
 DIST genpatches-4.16-8.base.tar.xz 177400 BLAKE2B 0488746b78299bf811cfa9b514a32ffcef304a71d866eeb3abd29da7049887bfe9006a60c96e0fc7b3852f96ae37000e1b9f6d0d43a363072096fba67d0c254d SHA512 6197e7f2698a912666028391e911166ebf92e7e8aa781a4a9e48ce82b927cc7a654817a4d24af99b64a6caecd650b22ed501e969cdf1a63a685d91410687fce8
 DIST genpatches-4.16-8.experimental.tar.xz 5164 BLAKE2B 12e6f30a467306ad5a155a5727b018b4aaace4817341b0d94b0cc5311987a1e341a4664069e834fa3c9633edc43b2c353070f732c7c06d040576df081b4b1dc0 SHA512 14527b27ce29df37c1648b787b933f30b58141a41dd37341d50454d8512190526c3dbdb4bd2a745c0b32cec0589953f9e72d42c98d5de3bee315b9c2a5fa8474
 DIST genpatches-4.16-8.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.16-9.base.tar.xz 196768 BLAKE2B 25c4b6a22a9a07af643ddc73fea2cf6e997f5cca89f86cf8386286d1b63e0c0dd393f138f66f87773d9eba382bcaec3a2562d2a4c22140a61358cd2612e11d4f SHA512 aab3c760270e8d72c892d58a88fac3db792150a8f7157a2fb656d52ecfb29c9f6a049783ec9583b98b9cfd09ae6f77f672ef375d6a260cb2cb4df8157e5398a7
+DIST genpatches-4.16-9.experimental.tar.xz 5164 BLAKE2B 0e8c1ce1a65404faafe4c0c7163cf87ce4ba4195edec6caab0dcbffff5351c6b211b233b6b659a7521e48e11e0fcf726e23341728591e9dbf305a4cac4500175 SHA512 9b4003d7902152183e4a76c54e0d4d09da33c9956aadafef4b11cdde81f7539a0d7931f4ae7d4d7e02928bbd7c128eba5fda00319723c1f7c2a7abb34ecddc9c
+DIST genpatches-4.16-9.extras.tar.xz 17492 BLAKE2B 2e9bb4e33e33f0b5ba923bc0036a3697abefcf7c439dfba68beb0c4d0a558dffde1c9224f56da6bbea560bec3664cb1025c0ce1c961037598523d1af0d0513fb SHA512 e1ed8a1532488aa849969a90bf299eaf39233695eb9bda7b070a87906b8891e2332a06234d4b2c98338b04380020387b8fb212dc95072ae79cc58274e8118656
 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
@@ -70,6 +76,9 @@ DIST genpatches-4.9-100.extras.tar.xz 17360 BLAKE2B 25046ec8f1813ec5d49c88b6a446
 DIST genpatches-4.9-101.base.tar.xz 1960904 BLAKE2B 7a3e3d70bc30ea044abf3a3d4dfa88f652b31cdfe1833e0f828a75812d97aba21458a0eb91f39ba62df82596549042822aa31f985f355a84662ba4ff34957d99 SHA512 6f425a4dc0647d0dc5baaa15dc373147f57a2963eefd7a82ea369637b7cf656a39cc52f4bf10e620061fdf9267ae97fdcd67dc3ddd9d6f9846ff998dc1532246
 DIST genpatches-4.9-101.experimental.tar.xz 106412 BLAKE2B ad251024b68eba7cad834a0d7fd269329efb304ea880f32260bb3c3b8b0777f6ef71d490f42006cd10359f810236eb59458f1d77ab2bf1398eacb724ef7b9318 SHA512 69aae2dacf373d598c3f20799368a32d2f47b34784ce1bf6dda88dca9d52e8b7ad93a89694f406ad99d516a16fda6dafe5aaaae518082998b1d8468065f206f0
 DIST genpatches-4.9-101.extras.tar.xz 17348 BLAKE2B c426dc0510474fd2f90ebc0a26b834968f38bba8c8d8a1adfde705106b08f541c24fd49f52713e60428f7ae056bda1382a650ef0792b81a0d4cebf2eed8e8f73 SHA512 2a370e32cd380d069cf4621387dacfb4214fb491237ff096e7ad2cc1f960a7268f0009c2bbd0c29b5b1101b51795a3f895eb39b4420c1b85d742269124f80f48
+DIST genpatches-4.9-102.base.tar.xz 1971300 BLAKE2B 1d0a9bdbabb19e482249668052f06578c791a90b15fd771969e58049f8fd7c029901d78ff4424915f1a7d245a02757f19b3796500b508d8cc7c7ff93fec6fc5c SHA512 002cb87ba93db70f6de6bc0fba42c49b2d3ab69ce9f28f783a161b0c0b60d7235f583b535ec7f9735974decb98206f73a36b8ffbf2521ec524cbf5ccb0793c89
+DIST genpatches-4.9-102.experimental.tar.xz 106380 BLAKE2B 59e2fda5661bcb77a1e60fc6fe9dc8a78476891ea203e2b4ec02389c01e702200bf5dbe8fe1d9bfecdd6ad59fa43d1e20c9738f929949c3442ec301b0a4a27d5 SHA512 0cfe440902f209e9e74bbb424780b19538d05d43388ca6d067633be479c0ba6b459d766617a42282ff53ed25374da469226825f31969ef7c128d2620b69af43e
+DIST genpatches-4.9-102.extras.tar.xz 17356 BLAKE2B d9a05e5b95c7a4c2477f01c7cef7b58697d6dc4d519bec5494fdc946a1a2b6e5a2fd9a0b6155dac84539a0aa6b2dd4583aa9180b19702062567189a460859387 SHA512 3b97bdb3f49676a43f378a95773b38c3650aba89f2d74e55f14762868983254250654ca56368cab41a150b04a32a190d8238a7bb0209196b80202cb2e9ca5040
 DIST genpatches-4.9-51.base.tar.xz 1001928 BLAKE2B be8a1a304f634b40dba1daa56922473c25fc57cedca73401bc1a142674832bb797f805f883aecc56a4b17fd63dae6aebe42f7c642739e8c5704f130b6675dfde SHA512 2ab0efa23c556547bd223f066acbebe250346064a3588ee866871e36e3b5b5533ca7a3add6a62b53339acf89dfc8539c42b3877b5a2055ca7e20bc25c5657ca5
 DIST genpatches-4.9-51.experimental.tar.xz 106416 BLAKE2B 483d57d8e19a135130e7084238c304e07ddf04e51dba8aa705566d4be3cf3a3b21a1f8a4ed49a7b2b06bc5b70f820788bc22e42ece8e6eb5d3ea3597eaf31289 SHA512 af7a00b9a3200a50341b9af607fbef362ead2e4f5ca35d58eec505de490c03d6366ab4645e35bbddd6903ac75396413d2902b6a9fc7e2c9d0d1d1254620cfdb3
 DIST genpatches-4.9-51.extras.tar.xz 17356 BLAKE2B 03160cc66db43d543f4bbd3171741cc36ecdd1d3088a143144e8725d1a8452fbb3743dbbd196ba387875cd0eb4fd966821fc9d3b3269a6848d2fda650da5ccbe SHA512 e05c44a5ad1b68afb04647a86efc6f67e03515861e670e39f960c0a02b87fbcb71194efa6773259ee2be5c8362794a5bb6512e876784d5a521d8890865b3ba0e
@@ -102,6 +111,7 @@ EBUILD gentoo-sources-4.14.36.ebuild 742 BLAKE2B fbce5df46bbcf238b283763ab7fc88b
 EBUILD gentoo-sources-4.14.37.ebuild 742 BLAKE2B 45ec67f9f2533d130527a71ca0582e722d60580ecb804bb7f26db5dcadbf911d9108fff4292e39c80e5af2d5016bbeae991b0974212dd1d743ef15009595e515 SHA512 ce1755ae06fa747367109f852ea21b5380f243d924781a6ae627db2385ee9557ad093bde43388823943bb70db18c0ef7d75dbc4be66759af37f2154d791ce5d0
 EBUILD gentoo-sources-4.14.38.ebuild 742 BLAKE2B 448fdb83ecb3208a8c47f809774ec334c7e55ed00f324f1771a115a56cf0681a7368eef370837dd3e98bc77ff3315aba78ad03e7043d2648ec13fee44017afeb SHA512 7f05c2dfd52cef1d1001af70e95ace0e4b8d093ae42142c0f62a6dfb7298301514f3b16e5dfc645cf3f6ac9be05a11a0d7072edfc75b0d6d8fc2c3b3f021b1e2
 EBUILD gentoo-sources-4.14.39.ebuild 742 BLAKE2B 269255718016d4c18fe36618ec32da0ba83befa46a0061e2703b70839cd783bc9926f3867541028ab383a12198170a9131f008959de8ee0f3e29c6be9b6ae435 SHA512 53ca3e5fc5ba4e0e65b00e63e82427ec99ddee9664f504f30699f61f90d998a1f952da922f75e12de969bce8faac53c005fe24e7c226d04d2c728ea839347dff
+EBUILD gentoo-sources-4.14.40.ebuild 742 BLAKE2B b33b45fdfce80d37224a1e9921bef528a2d53e32734d36065b415d31d524e4a90dc58beeb0ff56b494bdf22386589a913ed2dc8291f3a2cf27080a129373b541 SHA512 5cb52d93d3de1fc28d7e0db8738aecd28569f4332a743cd03670413cdd3ccc395412466cd62855fbdfa2b9ada2ecd049644d292711faa61846fe057b3e1665d5
 EBUILD gentoo-sources-4.15.16.ebuild 742 BLAKE2B 8cf138fd93fa76e2280baf29a973fd8d26a495d41cda3cbf0b9ac1b81718209a14ba87ac2623ce768bb9bf2f23813dc3a9e35ec942c3b031c1e9cb264cb93d7b SHA512 042e8df152e227429809a4e994d86668641b5632ae50f21780636aa22138b2e7fb48b25db6533875617c9e578c3c3f0f852188dad4137bf6c25c55ae75b86eed
 EBUILD gentoo-sources-4.15.17.ebuild 742 BLAKE2B d3121b065e2470df22b82884c4786e16b886b2d665555596f08f2193d8b37cfa624e84a241382651e38811e9bb24f41a608795620ae3df5166d2b5830bdf8014 SHA512 adc5a779711a415a5e614c26e60fac4b301e0b7f101fbb8c0e06308005f355b7e0f61ca613d5135c70b6b266b33b408a6962ab20b816b68826ac1e81451af5e9
 EBUILD gentoo-sources-4.15.18.ebuild 742 BLAKE2B 863f9406c40f4646d01f4b023b393cce2df9d8570840c9d3b59b8269deaf646f4f94cff234c7284df02599dba189edbb741edbd6d68c9514299aba6093964d46 SHA512 c8114271cbf01aaae62118c40c15e178ff87854d1a3d27df49fae729bbf472626e4e30458e687db36174a6735a9ac3fdc3b5d04421cb71493e5ab3b412a910d1
@@ -110,6 +120,7 @@ EBUILD gentoo-sources-4.16.4.ebuild 741 BLAKE2B f1e5fa6acf69df9a5e78740ee57f9403
 EBUILD gentoo-sources-4.16.5.ebuild 741 BLAKE2B e0a48fdf626979d01025952d1004c9c8b59cb5891d7bc966ad1f4dc38f636da59b4237f9d1ca078bb4e787d06e61a83886425a558495f0aa1b43285a7cbccb95 SHA512 19bb33b52273b61e22a9cbe31cf5cfc09a671fae876131fd37bd0c28d2bf75403aa80f81b6b52cfdbe37de383dc4d10d76029a17f37c10255006001305d7b767
 EBUILD gentoo-sources-4.16.6.ebuild 741 BLAKE2B df58106245c600e0bf9dd35a7eb2f4d25469e29769d81e314e552dd32b95e592acbb90af0413ae1559939a302d289005043ff729ca43c2fff520b133ac38a2d5 SHA512 4e94b88e040b686d34e8083e6cf9ae23a4d1b5bdddd456150b1b8f85203b645de42182c3043339600bb24c9ebe4b5e4893ce633f13fdbfaab9815809169a8f64
 EBUILD gentoo-sources-4.16.7.ebuild 741 BLAKE2B 3d0593031462ff30611e20d66f3b9b5b4da8b8763754f0af7fca209c8b9d7659e910ed401e44006c78469c2f5f19c01767c29a5497b8d32fe8894a5493707463 SHA512 f024a492df3732d1c5253bf32ede8119f0f3c89da099875c14c9511b676b40b934918134ed85f098236505080a781eb0d096158e799bc905e6659208b96649d7
+EBUILD gentoo-sources-4.16.8.ebuild 741 BLAKE2B c600b8af8fb7af879c95edeb1f4c1d7412991bd42450e8659c13f60fd8ccd19a41da0cef5ffaf97e62faac994928d03a778adf104a3a368b530b00bbf5e49d22 SHA512 913997637d2bef7ea097e0a060674c1932bde149d6f32baa32f355420dab9fbe4e91af7c1d8e41992bca36b0b53eefea3a08c1a1c2b10300e0893544f844098c
 EBUILD gentoo-sources-4.4.111-r1.ebuild 738 BLAKE2B 2052014422e63b1e20f01d48f63a8eff2ae594e15ff9c873cc9d062db10c238c61084ff3c4e61bd3576af1b2744776a137972f6766e2752283b05835e40f50a8 SHA512 589b508bafdfa91c3b1f9faf390dc56795cfd5d43e8e55cde64b75ff7595f13e614d06f59a83ae1a30c2be816cabca08cdd5578c19bb459e8beab6cbc2945a07
 EBUILD gentoo-sources-4.4.128.ebuild 740 BLAKE2B b9995c231f8d065b11cde0f73844a33382e3143f8951e5cf299a9185234b9db6faeb52373df75cc4ce442a42c4e5b6225bbdc4949b5f87370642519ee2187dbb SHA512 844c9a9b167a4f57b1607ce1f4ade7025d8facc3a089c45f1635303d0915b306734b4da5027e4307df9e62ead620cd5c36718a8bac2867025bd11dfeca9d935a
 EBUILD gentoo-sources-4.4.129.ebuild 743 BLAKE2B 5181c103237c688bd70f9399ed891e47765b418563b4706455328add0eb5084a65b8f1a026c2ecfce312216068f059fd92f2ef0ff9bb945e903f2cea1823db26 SHA512 111764772d1bf2a32d39770622eb559330354c60a35a2513685cad4256fac7df85aeee2ca67b27d86e300fa5c2a9831e0440359667b66aad0e26c596fbb0c975
@@ -124,4 +135,5 @@ EBUILD gentoo-sources-4.9.95.ebuild 739 BLAKE2B 4dc484afc1ed936e82ef3823934ece47
 EBUILD gentoo-sources-4.9.96.ebuild 742 BLAKE2B 3e765e1473e9ee8882092d901ae1aad01cb13315b967724be4c1a27cc80bf82f48dbb73248210da53d04ad5ed0a1acd18b0029ad335d2fa9dc7bf4e3146f7472 SHA512 9d370c34cb5807bc351563f2cdeefa325ca9b85032a5adac6a980f0c1a85e39057061301b825459dfb3f5b059308b205b15c4b56967024d0063af5a944404304
 EBUILD gentoo-sources-4.9.97.ebuild 743 BLAKE2B c6ae3edbc81971a4fde792cd05b5c8d1caad924f8ec78d074b2f6807c7733ed46bc4cdd77f022b21065dcf4a903c8c1cea02ee9a1041c64ab05a0bdc1f166991 SHA512 abf1b4220bbf14c304060ff13aaa2384ca08c0a84d7dd721a49372c3c3ef1c181f2bcf786ed650a7e24d7ee271f64740e03dd7b83c032d5826d6ee0e5b20592a
 EBUILD gentoo-sources-4.9.98.ebuild 743 BLAKE2B c05608773a2c20546b39c8e58cad8b02dfbf334f19e441def8987d64220f4b8a774911c9710c80062e923aff14fd1339d2816cf3512e1b89da0bb3e39939609e SHA512 97e9ea585df8ef52ec90ef21d92478a00857e5905d4989cdb2bb4d36ae55bef35a2b0c9ce1ba8884cdbb2d8b25ff580172ddbed0c94b174d24cce78c4d4b5ee2
+EBUILD gentoo-sources-4.9.99.ebuild 743 BLAKE2B 32515f1d6a293d1faf29ebe39148f1ce1841cde4155a5013b660082d343332b70c425faf6b79c085adbe9b885c3c389be71eda571abfe1868e37944f0af9c2d9 SHA512 52c9e8107fae2f041835ad66ccdbd8bd18ed1023b9cc6222ff6a6f8f8d6f20531a34f87bb853ef28d9993bd7fe85eb5e68654381f648a4f481186e1df134b0cc
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.40.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.40.ebuild
new file mode 100644
index 000000000000..c261948739b3
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.40.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="45"
+
+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.16.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.16.8.ebuild
new file mode 100644
index 000000000000..c73638f7769a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.16.8.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="9"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.99.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.99.ebuild
new file mode 100644
index 000000000000..1f977cd732e9
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.99.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="102"
+
+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/spl/Manifest b/sys-kernel/spl/Manifest
index ec3322cf19ea..39ad9fc8fa12 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -1,7 +1,9 @@
 DIST spl-0.6.5.11.tar.gz 531710 BLAKE2B e89cb5a023d3f4b3949a385100b56e01c5fd0ff4448bc175f8463a84b74d1d8f1fcf669c2e4b73f2ec3326653594106ebfa3e66987e49a9cd029355bbb317990 SHA512 eae1641a0d528cb9182deccd309625e13abf3db88ba1cbb54947055b23d1f94b62c045f939d5e952784f19719eea5fdf85d65c5abd22b9db167ea7780bc55722
 DIST spl-0.7.8.tar.gz 559558 BLAKE2B 5aa68a8150cb0c922c1ad0df9d1260136cedd95c13df45cc4490d937746a2a0e76e964978128a6f4e553f7bad4adc72a0408ef89969a15ba3f43af26e412b61c SHA512 dcd38dd0971042603baa474460486ed2e7cb59468de7613fa713eb4bdd081026794af7780b5d8970dd17645b04b6dde1e2f43e89a782437a50afc679a8850001
+DIST spl-0.7.9.tar.gz 551115 BLAKE2B 0ebb801ff60e5f8691c0b3386b5b1c326ea9d40decc20fb455ddb103d108923f28cd870e1c1dc465af5e24e8627973f2b60e7b9b88b3fdbd3ac45f3bd167def2 SHA512 89a42a65b3c09a654ffc3bcef84a0735eefe080c2d790400a3691cccf01e9f0a95cd40a4eed37542cfa7f4a94f20e06aae44886325473713407833d247751ec3
 EBUILD spl-0.6.5.11.ebuild 2707 BLAKE2B 056ca8888de322833390969112d45cccc4cd7d59e93891355ca81f95098eb4e381bf638c105b5150a4b5a55c94bf8a772fa9bd2968d3d2f7e3e32779bf52e5c5 SHA512 96a12346f728c144a78cfa701f5b451ad2bdacaaa544a753a9db5abd8047113acc2340fe1d49f915efe3f5e7c3d79f6459a22291b0e62d6e9b42c28417812a2c
 EBUILD spl-0.7.8.ebuild 2686 BLAKE2B 25ada9a1556c66cda953dfe47a09781e0c7d6cf12b41631f465f7c2fa9f1b0d13be8e5539bba41e5251b620fc75dbedd319dc9fd064870f2be1a6af62d771724 SHA512 b6ad416f3f5af65572371e326d94ef5dd7321b50f176fdd85579a384a7f4aea142ef0858d4c9bea0a98d0252339b5ff6c76419736a60cb1a3bd9f5083414f2e5
+EBUILD spl-0.7.9.ebuild 2687 BLAKE2B 0bcd325ede719f57c890567d0d5bf489eb18fc9f09475e938973360e9a5327b8991fa80b899666f1c5ea59be14c48798338ad80765abe809f09ee5026bdbece8 SHA512 8068af0fab33fef6a21ec8e17dac8e332e8fe9bb2923ae9f583241e486aa98dcb55794e54319d97f76816e01b017719119ee6b8340e3cd0cf1a440ef49867db5
 EBUILD spl-0.7.9999.ebuild 2778 BLAKE2B 07296e3768b48b6c4047180f74e3374d402ec87638c448ac39023785db3ce819fe45d7c134fc79fad507f724b24d381b216f89ddbc9d44528a07fe6392e06a71 SHA512 29cd683cd14f8a61b8a9772d05e5d56702529e1f57602a37922680561cbe09e00d3167961d757133ce5e24b0145e930cbabb82c94070f629e2f8ebf0a6fa72a1
 EBUILD spl-9999.ebuild 2744 BLAKE2B bf65299df864ef7a983532e23c8f5764fd30701ad2c24face5c4cd1cf41fd24abe2dc7e57001d1b1a7d8353a21a85737f305d00910bac285723294faa4b8728e SHA512 ccfae24c381d939ce22dd3a745f8ee1933803cb49761f73eb58c54b0a8e915a40155efc088c95549461538af7cec4d2460bff904a4a5c14276d0c373cd1d8729
 MISC metadata.xml 436 BLAKE2B df6b2b25107b10b62618306f09e48f4337315792390c58392f73b270466f4927209dba0d8d1f1d8b8f65f345bce077a7b738f240f077a0eb26c23353673d412f SHA512 1b867378bde3ac034a7fbdc84e47b77b570ecf7a7688b0dc47950de7ea6601284c8101600928ddb7725f7a09ecc73eb01bdf646b0ecca250029e3063a4427ca8
diff --git a/sys-kernel/spl/spl-0.7.9.ebuild b/sys-kernel/spl/spl-0.7.9.ebuild
new file mode 100644
index 000000000000..d8a0446f5736
--- /dev/null
+++ b/sys-kernel/spl/spl-0.7.9.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+if [[ ${PV} == "9999" ]] ; then
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+inherit flag-o-matic linux-info linux-mod autotools-utils
+
+DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug"
+RESTRICT="debug? ( strip ) test"
+
+COMMON_DEPEND="
+	dev-lang/perl
+	virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS DISCLAIMER )
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		MODULES
+		KALLSYMS
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!PAX_SIZE_OVERFLOW
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+	[ ${PV} != "9999" ] && \
+		{ kernel_is le 4 16 || die "Linux 4.16 is the latest supported version."; }
+
+	check_extra_config
+}
+
+src_prepare() {
+	# Workaround for hard coded path
+	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
+		die "Cannot patch check.sh"
+
+	# splat is unnecessary unless we are debugging
+	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
+
+	# Set module revision number
+	[ ${PV} != "9999" ] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	set_arch_to_kernel
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=all
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
+	then
+		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
+		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+	fi
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index b4d9317526b2..f6ebfba7ccb2 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -9,17 +9,17 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 DIST patch-3.16.56.xz 1956224 BLAKE2B 27db858a51be5d57ff1f3d5409d511df5002f542584d80b64d2303f1569c0502d0d15783a3e36facc2ee9481ada4b8f08359a79972b4a3ca07ac180c2e607c01 SHA512 e1c1c004c2ac52fb6944718c82b6c70a9ee4175943fc8477b298dbbde42d16f1e1c9387f9d5ca05958b3efa0e851eb0105daf4a0d59ad836b31ec3919ee857b6
 DIST patch-3.2.101.xz 1942280 BLAKE2B 9000a0e0d23a6e9e8651c6f2f936e0aa14e6660ad27fa8d29c35fc71e4cb0590337460a80aecd5725804546a20a610f367ee9da5864d53ffd1fea45c0e43b2a1 SHA512 00a8d179a60bf628ea12595d866c25ce5848e9c68ae44d7a10388e5ab2e99fb7f3ae77d57689a9ae161c9084d5de84c595f0f96e4d8eaf60230bd28f3435acf2
 DIST patch-4.1.51.xz 1456804 BLAKE2B 8c95a6a85258c1ac13cd475b73ecf70bdd82018b74be68f34345ccdea88a2acc464117dbdeb764d11251a8a023eac2558753431025c9849ad62c60cecafff562 SHA512 37a5d84e15d1ca9096aff7e762007e6abec370d865a91e6f254412a322b3f371d95cb3dc5143118583a2a553ebad93f425439fdd0985a6ec2a4ecf65dcb3e1ac
-DIST patch-4.14.39.xz 1091116 BLAKE2B 5b3b9d1f2a02eb0eb4713f571acd0ae78a4b66dea671ef06519f980c373a5c9632047bd74078ce7366c7a0d49d3f98363b0f5cd7aae3e179c74b205380015ff9 SHA512 28568e50fc70016426b65706f3de12cd723d7e5d5d88a23bbb02915b221db904744108328c3a63bb3f620e059f116930bb0b2d16271b53ed70dc320f6f3daf69
+DIST patch-4.14.40.xz 1103932 BLAKE2B a06e9f1208a0396e3bf28ddad9fefb7bcd669271731fc3a3745e61eb62f4186138c00b03a5f7afb7a0c236a278d164043f07f01ee6faf0aca29ca1cd11e02d52 SHA512 4961a454836b8583cf3b0a743f08951c7084745039593f2cfb2630f836f33c471b7456d162556359255e6952e3652e9bb30e2b363985467787d4d0d73ad24738
 DIST patch-4.15.18.xz 456456 BLAKE2B 94b41c7ada6547c6e2823602e11504f8ba57c9b1ac9bfcfb156a35ec42415df55fb1faeb6f548f6d52cf435bd5109ec03d35c599ca742160672ae814281f91db SHA512 c40dfeedce4876fa4df51ae93978b2a8d9844ca04cf890a6d708fd85786dcda99a6611066977d5a4d841a03af8838d6aa6e1bc69084720fbf7147058b8394fb8
-DIST patch-4.16.7.xz 170468 BLAKE2B 899c2268face620ee9ccf7f713b8db9a321e0cdec09abd42a8bad891acaa9d1807e35d15880641a9afbe1cda60cd4d5dab3c76f6ee98694f52d2e449c8c1b7b8 SHA512 576c2b520d444e11a9ca45ed3ed03822007ab6ff778a1759aa0f65c96946fe3e169e71d48d11e6d3b8627a99cdc20abfb0c84d7b6c9b0d2afa4d5fee9ed3aa41
+DIST patch-4.16.8.xz 189408 BLAKE2B ba3586ae91ef7a43a81da76c812dca3bd6bcd0e00c508d04d1f81b28d6304eb4aa3177efe0acdcd231a0d829a0dc231f4c5463a97c9999d0cf1ab16f007d2a58 SHA512 8bd521f5a14280c6893f6d85f46d12f97ba71abf3e149f1900aa5e1efa3a03a97df674c4b2b46553b8e9df55164894b6fcb510dbba8cab8ce47ee4b0186e27d0
 DIST patch-4.4.131.xz 1871404 BLAKE2B 3d7729d4e3ce75888670d57368b651f2750f46e4c94826525095b791f6717badefede520a144b098fffb9ac08b3a08d0c567f0e391b94cff8869cdb6afe9592d SHA512 856ef10be19b07a2e1fbc777dd0052a145f5ca49c59b29ec4e5205babd478d623bfef40ed06c2fa113292e512701b4dbc67723cf1a946f27ce38b601d003bff2
-DIST patch-4.9.98.xz 1811528 BLAKE2B f6244076779eeef08399128daf07d4a9ceb42065bff4f89b5f40ef3dd9dbdcf36daa5cb064ad13635c91e73b3d9bbdb57dd64dc4d5adf07042b1f96c7e8733f4 SHA512 e1aa814fac33ae6dbfbf2e0cda40a1bebbf420d33c6448de718726f94d2ba0c9538b18c3251fb46202d90da6aa56add466d4328696faa1a05c50478aa3f99a5e
+DIST patch-4.9.99.xz 1820076 BLAKE2B a2c036e4b35a9f2ac840e2874254ca6bd47e752b41983b75516342465fe5ed387a3aa77ad3f8120b1c127874fda13a8c3c370a18d65d9a3fc05c5d0577445d9d SHA512 dc4a199366915d3ce90def36a49ab1ed10491c557af40d4c8b73946939a4e046184edd958e39a8b9189823dd146c0ddd6f882de843e31eb43e294d216d4feef3
 EBUILD vanilla-sources-3.16.56.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 EBUILD vanilla-sources-3.2.101.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 EBUILD vanilla-sources-4.1.51.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-4.14.39.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.14.40.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.15.18.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.16.7.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.16.8.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.4.131.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.9.98.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.9.99.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.39.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.40.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.39.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.40.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.16.7.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.16.8.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.16.7.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.16.8.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.98.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.99.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.98.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.99.ebuild
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 805ade0b952e..7c16b11bfdb5 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 5da9ccd1bb3a..91bc2335feba 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -8,6 +8,8 @@ AUX systemd/acpid.service 155 BLAKE2B 763b5f0ad5d03e91098ec9e71a17c5d0a52c90f193
 AUX systemd/acpid.socket 119 BLAKE2B a0f22e8579c48d7258c81f7fb97a9566f1dd4722da9d2f68c1b960ee88ca432ab17890b556df913a44aaba9b91c309de073afa1710eea71528a3c85988533ad9 SHA512 9a8293166b3818255d39d972dd354e675d23e4d59fb4ce3a8b5dedbf33e809f808ae3020f308426ba8d9d1317396727edc5be5bf51a7a30bc40c809442c96c0a
 DIST acpid-2.0.28.tar.xz 156036 BLAKE2B a6a78f82f7f4ecbd0d883d175c921195970e157a919fefc9cf48a94db534b496a8570c031fda5b08df3fb1775e26a50b5942bac7717aa582d590605930e3af78 SHA512 effe9c3b30b4a6ea20eca4b36a06d4b3da9b262d100685958faec4b38f89377a87dcaecee7a69b87aaddfa47688bcc46fc47a38391ac4bd2019cb3b48ab18fcb
 DIST acpid-2.0.29.tar.xz 155568 BLAKE2B 9a2c9f2f8ba035bf7452b633c20a73796ca05d4849d567f076a08a8216f2e07ca7a0b25e995054697e70bacacad07872e153c6c47f8204294964b276bca49f62 SHA512 5f480cb4456b6b843adb239519a8d05f83c3c668525457e55d7fae2ba7725356ec7a1faa16bbd54086f0eab2e8ca20952180c00b2b65a27eda534c3f28e8ed17
+DIST sys-power_acpid_2.0.29-r1_extras.tar.xz 2548 BLAKE2B 4568f0e44d33382fd294248d48c8852f689f0a6082d9b74b33b77918d3ce21d7f1bf8a3aafeaa252e8fe170b3829155344a256f01fe80414369f02d50a17ff55 SHA512 f2c366c50c75790df32a1f6573b7de640fd09a97c4598155ebd0aad2eba118961ddc82fe0fbb4dc935aa5b6d7fcfe3ade73fff555b4588b0e4579a1028bef12f
 EBUILD acpid-2.0.28.ebuild 1855 BLAKE2B 62f1e4e4ec4166157ed4d6ff1bbfe7b5780d563f04cc13677994e49c050bab02bf29d5d314e7a193a2b5b9678956d5bc62fe87895c40be6dc80e13326ec11a07 SHA512 20d97d0e1bf2000efd03975a564f8c9c2f5d37312188311efcacc66d6918a85159f223054ccbd79f633666d423b603a8387dd40e23c36178561d534517d14de4
+EBUILD acpid-2.0.29-r1.ebuild 2108 BLAKE2B 6f667ed12cfcaeaebe2569812fc2b8d560ff9c08b107f45b3845d921142ba0f7534f048d58e2463ea83b8ecce52f3f860c57025ce7764b88948465c86717b9d9 SHA512 6403c3b3b73c8e054e0bcdb55ac342366a71d79c8f92c856e4bb036e752a956e51a1562839dfb184e5cc2726073598561a070438c8400f11b44a610a19b1c98e
 EBUILD acpid-2.0.29.ebuild 1858 BLAKE2B 4bf788cb1010e66eebc1aaa34b4b3851307588bcb1b78f6dfcc0fd236db897f512d4ca3f98d0c0864c6bd10fb1fc27fcbaa94c8439d2d647caf1f684de9f1847 SHA512 a76fbf6aa2260cecf8a08a0fa013dc14a7a4d7fd90ad65f6a8a70c64d1dea445c97cff7413cb08c13e1251e9634ae3f2c33f8866f4e0c561635c79eb4e6e08be
 MISC metadata.xml 327 BLAKE2B f6c546808131faaccf65580107772b21a3fe59b681b1ae6c66846ce230c9bb4ce9209287ff88f150f4bd691d71cdbf7e2c4fd4ac8a049a2e8b9d9ab57967c1b3 SHA512 8e93170bc36e09c1cf6c1db7eb751cc1ddf737d3ed240ef69a5ba00279ea3d9e92c5ba5185faa5f2f3c86fca9922adfb8e8e0ffe673817984948aa941a2a7a3a
diff --git a/sys-power/acpid/acpid-2.0.29-r1.ebuild b/sys-power/acpid/acpid-2.0.29-r1.ebuild
new file mode 100644
index 000000000000..ab3c57135865
--- /dev/null
+++ b/sys-power/acpid/acpid-2.0.29-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit linux-info systemd
+
+DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
+HOMEPAGE="https://sourceforge.net/projects/acpid2"
+EXTRAS_VER="2.0.29-r1"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
+	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-apm )"
+DEPEND=">=sys-kernel/linux-headers-3"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~INPUT_EVDEV"
+	local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
+	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
+}
+
+pkg_setup() { :; }
+
+PATCHES=(
+	"${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.25-kde4.patch" #515088
+	"${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.29-r1-extend-pms-list.patch" #538590, 628698
+)
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newdoc kacpimon/README README.kacpimon
+	dodoc -r samples
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
+
+	exeinto /etc/acpi
+	newexe "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.6-default.sh" default.sh
+	exeinto /etc/acpi/actions
+	newexe samples/powerbtn/powerbtn.sh powerbtn.sh
+	insinto /etc/acpi/events
+	newins "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.4-default" default
+
+	newinitd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.26-init.d" ${PN}
+	newconfd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.16-conf.d" ${PN}
+
+	systemd_dounit "${WORKDIR}"/${EXTRAS_NAME}/systemd/${PN}.{service,socket}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "You may wish to read the Gentoo Linux Power Management Guide,"
+		elog "which can be found online at:"
+		elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
+		elog
+	fi
+
+	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
+	mkdir -p "${ROOT%/}"/run
+
+	if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 0960d0bb0096..2403c504f8a0 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index c407ffbd9159..184f29878adf 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -2,7 +2,7 @@ AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e87
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 651 BLAKE2B dcf0ddfcd2cbbc457f0dc7142a64c403c7657c30a7f85ab103828758c16fce8c6fc2e80a4f2f943393f3c226f873a2bce4b6df999fa4b178b3e95bf213688d86 SHA512 7bda41f0c6ee9ec0947ef6b8d4591453f797ac0256f9b67800249a6edf699e55855a9bd6f46501a86ffec5b5d2e1d8ac735657a0c63600683f61044e0bbc35d4
 DIST grafana-bin-5.0.4.tar.gz 51600575 BLAKE2B 13fc3943fc55424674ae173c9c16ae3f1de0d1c331dbee807e69cef9d9743c83d348185edc33af541ae77766849e74a5cb0c742a316677ac9582db40ae051d08 SHA512 c0a05e6661af615676f3bee99c7865bda599a47de464d4bb322232224305191879cdb6ac4149a8963b2a7102d6a34349059cdb3b0e069cf830d341889df1c745
-DIST grafana-bin-5.1.1.tar.gz 52436085 BLAKE2B c1bdbd6adcfecefe0aa0ead2d11b80045dcda62010744972e0824e2dc14c10c3c17440f68e4986b1b824254b918543d9650e83503d136986e0cc9a7d28c18d3a SHA512 9a2ce531712e5003fdd8a708cbd59d01b4b7dbbc2f1db132a90ddfb701d702415c29bae8943f36a0ad802f9daee635792df3f26a13ba0e176f79d90b35e5461e
+DIST grafana-bin-5.1.2.tar.gz 52436054 BLAKE2B 653361e5dba07b9f0e6105af7fce7ec0785c31968b34b20850fec35441bb6af171571528ee243fd8a0bc95b7b799ae659ae19ed80e318b2241f984a376f09189 SHA512 e44cd9ba5dc5de93b8d7d3ffcef8d127b62676672e14ebef6df1f4345268ac2acdc1c74c4cfcd6e09511076d43e0a226bc7d48c56b49e6f1cf73d6541982f092
 EBUILD grafana-bin-5.0.4.ebuild 1744 BLAKE2B 44baac3eb8ab856235c2eadc43c415e0973722024c3dca157b0aa7c11d9967c30b6f5d55f8d2a534b99c2cc9ddc3e1c1c381aa2c50543042ffa8b134264f6e90 SHA512 6eed7ec805a005b2f7cf7fb959b77c2d8169f1812cc0cee829112cf4e97c2d8f38af07a5c32712f878926fec735034378b18f4ed650ce21fbf0ef81e088824c4
-EBUILD grafana-bin-5.1.1.ebuild 1744 BLAKE2B 44baac3eb8ab856235c2eadc43c415e0973722024c3dca157b0aa7c11d9967c30b6f5d55f8d2a534b99c2cc9ddc3e1c1c381aa2c50543042ffa8b134264f6e90 SHA512 6eed7ec805a005b2f7cf7fb959b77c2d8169f1812cc0cee829112cf4e97c2d8f38af07a5c32712f878926fec735034378b18f4ed650ce21fbf0ef81e088824c4
-MISC metadata.xml 299 BLAKE2B f907a1d524382aed556259ab450e2e6b9c927b7b07a975d468867855e3dc184d7d296a4f6f098a65598b377b2c46cab1c90dced667c7b0cdad16e156949807b1 SHA512 3c543eb4a0465af174a2a80650a542daead9f89685993575eef9ab826b98c84585184152f8ebc5e81fdafd9bbe24d63f467b251a4c9aeaaeef52408a1a3812df
+EBUILD grafana-bin-5.1.2.ebuild 1744 BLAKE2B 44baac3eb8ab856235c2eadc43c415e0973722024c3dca157b0aa7c11d9967c30b6f5d55f8d2a534b99c2cc9ddc3e1c1c381aa2c50543042ffa8b134264f6e90 SHA512 6eed7ec805a005b2f7cf7fb959b77c2d8169f1812cc0cee829112cf4e97c2d8f38af07a5c32712f878926fec735034378b18f4ed650ce21fbf0ef81e088824c4
+MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-5.1.1.ebuild b/www-apps/grafana-bin/grafana-bin-5.1.2.ebuild
index a2e20a0a3685..a2e20a0a3685 100644
--- a/www-apps/grafana-bin/grafana-bin-5.1.1.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.1.2.ebuild
diff --git a/www-apps/grafana-bin/metadata.xml b/www-apps/grafana-bin/metadata.xml
index 8be214149912..916283cbb202 100644
--- a/www-apps/grafana-bin/metadata.xml
+++ b/www-apps/grafana-bin/metadata.xml
@@ -7,4 +7,8 @@
 	<maintainer type="person">
 		<email>patrick@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 29aaee5456cb..515154c4ca6b 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -3,8 +3,8 @@ DIST otrs-5.0.25.tar.bz2 20671315 BLAKE2B 045037411039f480434e7c36ab84b63ec0c119
 DIST otrs-6.0.3.tar.bz2 24314514 BLAKE2B 97d794d59269d354b28003879bf0d30cc9b0f7a7d375416df90d85b694ac59e84978fe61183aa058497da18631513c25ecc93e3150f662e2e2efd335014e1e75 SHA512 d7f551e2c9bbe8b303d3de1f7993d76ea22cfd876b61941cfb72a25f2ba7e0a889c275c87aa40c104c1f2e6e1923b7a530cd088bd11b7b575a608b623e2b0541
 DIST otrs-6.0.4.tar.bz2 24355298 BLAKE2B 2f27e7a34b1bad0d58193c834503f051a1a1822afb53dca185ae2f8329d048446acc4e27e823b6f27660c79179bbb48f1976c0b3a6710bc083f791c0a777152c SHA512 23e9a29a6f080c6afa92704d25363687d50073c94192ba81e69ddab55fb9f945a38a5757a4c60c2d46bfc5a0002ca13bbbce1cc0c945f40e23bb864ebc57edd1
 DIST otrs-6.0.5.tar.bz2 24368010 BLAKE2B 20511dfbca16d275a1c4f7f07f8cc9e350c182661c95932f59899400b232612aed95fecac422528e37dd01b772225e78f25464bae40490abd88b391b05ac7b15 SHA512 fe669fb83acef8252cc53b24378757e498201e916a7fc1cb5f509efe777ec2bf36925264a7080f02e50a115285c26429506927390e3b10b35622f3c65a8cd066
-EBUILD otrs-5.0.25.ebuild 4124 BLAKE2B 0022cb1f8819c580bcfc75312bb21ae13406e03cd70ad9a05e433c041a76ab6e05c0076f1866d6047ad324eebe0c683c7bc201ae73d1725f424e97b02f927cac SHA512 bca3059455541b65749e612773d46983c5b6eb8b7e64696a9b807c07c26237e6b072b4269737efe2b94e5ecded5bbf8388261223b6c65d4c47a1689f57ad6479
-EBUILD otrs-6.0.3.ebuild 4171 BLAKE2B aa4f31b8f816fd0335c49f57bc4085a163bc18629c91527094fdfce79ed163196b721e65d6a429c429290a6325bf65c49abcbfad43c19bc3f997e98335979f73 SHA512 4d866bdbca92105912b1fdc8a1a7b1777c942bb1125536aeee367f49bd13a52c39164f1edf1e8122ec039aa6a29190a08db99c1e72ea47f33f681784ebf5bef1
-EBUILD otrs-6.0.4.ebuild 4171 BLAKE2B aa4f31b8f816fd0335c49f57bc4085a163bc18629c91527094fdfce79ed163196b721e65d6a429c429290a6325bf65c49abcbfad43c19bc3f997e98335979f73 SHA512 4d866bdbca92105912b1fdc8a1a7b1777c942bb1125536aeee367f49bd13a52c39164f1edf1e8122ec039aa6a29190a08db99c1e72ea47f33f681784ebf5bef1
-EBUILD otrs-6.0.5.ebuild 4171 BLAKE2B aa4f31b8f816fd0335c49f57bc4085a163bc18629c91527094fdfce79ed163196b721e65d6a429c429290a6325bf65c49abcbfad43c19bc3f997e98335979f73 SHA512 4d866bdbca92105912b1fdc8a1a7b1777c942bb1125536aeee367f49bd13a52c39164f1edf1e8122ec039aa6a29190a08db99c1e72ea47f33f681784ebf5bef1
+EBUILD otrs-5.0.25.ebuild 4116 BLAKE2B acd72a3d46fc25ee805a32df1e13c7a3e724f2a6c2809993aec7870fa4fdea3448375ff371a1ee229dc6f280133b68f059c8f167a2e140dbdea6fa26b6b65bfd SHA512 b388b96afdfe456c560a917b830f617dbd4939c9147a55e3bfb3fa2d487f016093274a86f0cdfcccab0f6c7c549978a58395eb3a15da5a97a15b9ed00bd158cd
+EBUILD otrs-6.0.3.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
+EBUILD otrs-6.0.4.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
+EBUILD otrs-6.0.5.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
 MISC metadata.xml 581 BLAKE2B 14a4dfee6a80d7b1640d67ea954dd638978ebee0f6770a70a9a3e9f8a0182954d660439aa8f81cec5a85039a028f507e704109c7d946dc85b2491311f8e3f090 SHA512 8b39dcc1639161c524b1d34de6184409c72422e6442e4a61b0c47f7b1c37ef04d267936dc43c2a10f11f702c50b0b7fe04ffcf9de084f5196f1135ada3c3c802
diff --git a/www-apps/otrs/otrs-5.0.25.ebuild b/www-apps/otrs/otrs-5.0.25.ebuild
index 172bd42f6b4e..3701f495278f 100644
--- a/www-apps/otrs/otrs-5.0.25.ebuild
+++ b/www-apps/otrs/otrs-5.0.25.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"
 
 inherit user systemd
 
-DESCRIPTION="OTRS is an Open source Ticket Request System"
+DESCRIPTION="An Open source Ticket Request System"
 HOMEPAGE="https://www.otrs.com/"
 SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
 
diff --git a/www-apps/otrs/otrs-6.0.3.ebuild b/www-apps/otrs/otrs-6.0.3.ebuild
index 5ab8f192a5bc..3158404230ca 100644
--- a/www-apps/otrs/otrs-6.0.3.ebuild
+++ b/www-apps/otrs/otrs-6.0.3.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"
 
 inherit user systemd
 
-DESCRIPTION="OTRS is an Open source Ticket Request System"
+DESCRIPTION="An Open source Ticket Request System"
 HOMEPAGE="https://www.otrs.com/"
 SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
 
diff --git a/www-apps/otrs/otrs-6.0.4.ebuild b/www-apps/otrs/otrs-6.0.4.ebuild
index 5ab8f192a5bc..3158404230ca 100644
--- a/www-apps/otrs/otrs-6.0.4.ebuild
+++ b/www-apps/otrs/otrs-6.0.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"
 
 inherit user systemd
 
-DESCRIPTION="OTRS is an Open source Ticket Request System"
+DESCRIPTION="An Open source Ticket Request System"
 HOMEPAGE="https://www.otrs.com/"
 SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
 
diff --git a/www-apps/otrs/otrs-6.0.5.ebuild b/www-apps/otrs/otrs-6.0.5.ebuild
index 5ab8f192a5bc..3158404230ca 100644
--- a/www-apps/otrs/otrs-6.0.5.ebuild
+++ b/www-apps/otrs/otrs-6.0.5.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"
 
 inherit user systemd
 
-DESCRIPTION="OTRS is an Open source Ticket Request System"
+DESCRIPTION="An Open source Ticket Request System"
 HOMEPAGE="https://www.otrs.com/"
 SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
 
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 61cd552a22e4..ab8fcaad656a 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 0d0399265a10..65ff9ed08f83 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -14,13 +14,14 @@ AUX chromium-memcpy-r0.patch 1306 BLAKE2B 585c015fbc6cfda61fb28c451da1433047c21e
 AUX chromium-stdint.patch 623 BLAKE2B a4bc24a472bef266cc8e67fde8249b17dcd407fd86e6f614f24bb5acb18426b620b7b5e8e4d392940cab3474e8e8ee9633c61a99853f6316c77417ff78f1c034 SHA512 adfd265ecb2326f221eae07f910b7217f5bccf6be4ba750069bc05d7ae458f3b32ae825782d032299330e7c29a93a76fc732c5f5865669ea5eecbe167e04133a
 AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b018af2bbe7e701b878b78f1480317bfb6394b0184b49da3c4361acebf6f6eb164b12246a61a9b205e209d8e598b SHA512 325e269e6c24e9d3103ae360653e0bda764356655534be08cfe308d8c63ed8c93c80c09f58d023afbc6e141f7cbe5b86f7983c57b8f6c794b7675d332439b051
 AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab56248cdf378ae4d6fe99f239f95e89f28fd0b2b7dc36dd85557e7a5403d9a30a8189b7f56a9bae678831dfa49d2b SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a
+AUX chromium-widevine-r2.patch 1488 BLAKE2B fc4dc6ce40b2d2a152a0bbc5958d8050d9a7f4176cd0121d81ae1a9e76d361c064f54e034fb9213fc802e0a4b1b8d661788dbe9089daf8b197414724a057d4e4 SHA512 6fe8eb7b0e6c88e00d1b3dadf433b886c71cbf9b3dd4e712845a636a689cad6bc58fa8b20b412a1f7a8a1b649bccc8c961e762fa5f4d4ae092355e70db0a9cfe
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-66.0.3359.139.tar.xz 583978636 BLAKE2B 0727ba9f87a738b691b2120dee7f45f7b16b234e871988b1257f01589a6a5ec2cd2470e8d95fc3087be2ab140f71afce63c7fccc851e87a932f69326966c3303 SHA512 9fe78fb6970fc5a3455e6545a4869d3a73075329ccd26719f503fd9bbfbdd6aec4f3db4cc748e8f12abb81adb318b8f8b42c7ab5c289a1f698536e81b7d2f14f
-DIST chromium-67.0.3396.18.tar.xz 589707412 BLAKE2B 925d258b388b9c28c64db8a423139d52ff4bada2a3971c1c3735e8caf9c9f6991e44153ae57650285f76f5b185046259d6305abaa2bf6ed9ff00c87a91162da2 SHA512 38e19697d4386fc0497312f2dd408f0e950fabb58f78572509caa68cbdbc7f5c5e54bb945c1afe17c64ef5180711759735d5cacb61fb8847b4fe3ac1a4485066
 DIST chromium-67.0.3396.30.tar.xz 589816436 BLAKE2B 05f2d9c1119f5819793e343c485d49296b0e6b852bb49aef7558c8f492ed62db29e30957d7f299aef45eae3ea8a292c526975141abd843524e776ffe20d716e9 SHA512 c1ce45d899f34a1ee492ee4176a23aceefc3aaeacbe36effda7616c6cfe40187102b07763267295d07d862c6dba0210e03db7447320dd02b4cc95b52ac6e6ac0
+DIST chromium-67.0.3396.40.tar.xz 589878296 BLAKE2B e02d8980cb882fb67eb6e048dfa8534fb423259af257040cdda8198aac9433a221d6218873a8e5623ae3cfb8e081f22bfc40444e53be38b17a0ebff77537263d SHA512 1d4986d444076a4a48bf9ad7061dbb424f520e46f2f58f8f84dfee2fefea05a3b019ef27acda553efb9a75db9731acbc0c80f5dfb39a9137e9e27336306d5981
 DIST chromium-68.0.3409.2.tar.xz 595647380 BLAKE2B 3f3ebb7de759ae92b8feca74a931c10c4bdf4f75a0a7aeb2f56b59e635e1f03becccdf2b26d306e5753d9379eadede6ef50ec4e44338a3a6bdfb960b74003770 SHA512 2ce35251392570bcfe0cc02813bf6cee1761b2227888a135491828bfdfa9eafa4538e8fb981165503f901eecbf91cc8ce17cebab1681c63a43f0625dae7a2dd8
-EBUILD chromium-66.0.3359.139.ebuild 21055 BLAKE2B c74cd0f0c8a50c99879aa82b87f6802239f3f56c462baabd4d3c4c618f90cf96ff7787fa13bdff63305dc60183f709ec727663bbe83bc0a0c662bbac52be1b5d SHA512 d51c2d8323ec5fd507d53e7ce2ecc2eaea83448a592d8bf7e36b30db315e85572cd00dbe8a26e12b11fa7cc47ab46121fab7c42179a60c0143794b4d2aec92e7
-EBUILD chromium-67.0.3396.18.ebuild 20774 BLAKE2B 85841d5b0afc8d0661ba32f0375c10b76d22228782c45790b6978d454d7304d758d111be11aa93a18bb74bf7fd4636d9463a7d56c608305df03a82cb13a7a378 SHA512 06d5090324b77677d4e22f3c5b7e515f05c7df7ad8112ac901ce6962f121d997ca1dc9c706bc3c1c11f1bf791dce8887cb7faf4be6041e1e5092d0aac4cf4ad3
-EBUILD chromium-67.0.3396.30.ebuild 20774 BLAKE2B 85841d5b0afc8d0661ba32f0375c10b76d22228782c45790b6978d454d7304d758d111be11aa93a18bb74bf7fd4636d9463a7d56c608305df03a82cb13a7a378 SHA512 06d5090324b77677d4e22f3c5b7e515f05c7df7ad8112ac901ce6962f121d997ca1dc9c706bc3c1c11f1bf791dce8887cb7faf4be6041e1e5092d0aac4cf4ad3
-EBUILD chromium-68.0.3409.2.ebuild 20932 BLAKE2B b35334258b4776b1a15d35108d1737797b87ffd00c3718700ccef00d89d32a44427b0e44d8a053ead0fe2d806bfcd5473665e141f4171508a592946950d322df SHA512 dd405771880cb839ad4fa6a7fdfc0efb55fd6061e9fb75af2953b2b26f15cfb57f90438f59cc3baae3796fb63be13aad8bdd599f6966e82bb05ac12dcbd03241
+EBUILD chromium-66.0.3359.139.ebuild 21079 BLAKE2B ad63d299090512b44fe6d1deccb754a9c3471abeb4cdb013c5e2b4743d500cfb3a3434ee842310c5b5e1a3145028b98a112ecbf0f31004cf1966aeb92a1a16a8 SHA512 17d7f7856cfbe4b9006e153d312b43c43ffccb9c1c5f2e9f4f920eefccc83000f29177028319597bae453148a6c8c255695694345b289ef5b6da2842abe4e4c6
+EBUILD chromium-67.0.3396.30.ebuild 20970 BLAKE2B 7a26f21631d49d99a738775de819c4abb3df639a13a3eebfd5c38780cc94e208a8e1b3dd785c06c0e91b9a1a7ed1c5a0e564fc9392f6e9b031c58c8fa7ac363e SHA512 3a19fd0b2fd59c86a59625097d56e8d16e698df56279327f0c9c929a0654913dca957be153e0f9c6b92e812f7b16118225089af50dc9751f99cbf789a231e4dd
+EBUILD chromium-67.0.3396.40.ebuild 20970 BLAKE2B 7a26f21631d49d99a738775de819c4abb3df639a13a3eebfd5c38780cc94e208a8e1b3dd785c06c0e91b9a1a7ed1c5a0e564fc9392f6e9b031c58c8fa7ac363e SHA512 3a19fd0b2fd59c86a59625097d56e8d16e698df56279327f0c9c929a0654913dca957be153e0f9c6b92e812f7b16118225089af50dc9751f99cbf789a231e4dd
+EBUILD chromium-68.0.3409.2.ebuild 21128 BLAKE2B c0b3f816629ad411e9a1173d8613b56b265ac2d64c314d0ffcc146e6692ab3a997cc4390658ed8f8926bad36be480a907ad7c0f455d90be445277c56a28622bf SHA512 619db1868802d4857193c91531539084a40177dabc3b622bdedf35f1b3e5a48c751c8a106d19035dc3d6da86e003a2d9a74d936c30cb5c3225b827c39784018a
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-66.0.3359.139.ebuild b/www-client/chromium/chromium-66.0.3359.139.ebuild
index 87ff23089739..068e87e1f027 100644
--- a/www-client/chromium/chromium-66.0.3359.139.ebuild
+++ b/www-client/chromium/chromium-66.0.3359.139.ebuild
@@ -130,7 +130,6 @@ 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
@@ -549,6 +548,9 @@ src_configure() {
 	export TMPDIR="${WORKDIR}/temp"
 	mkdir -p -m 755 "${TMPDIR}" || die
 
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/
+
 	if ! use system-ffmpeg; then
 		local build_ffmpeg_args=""
 		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
diff --git a/www-client/chromium/chromium-67.0.3396.18.ebuild b/www-client/chromium/chromium-67.0.3396.18.ebuild
deleted file mode 100644
index ececa654c8c9..000000000000
--- a/www-client/chromium/chromium-67.0.3396.18.ebuild
+++ /dev/null
@@ -1,692 +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 ~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"
-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-4:=
-		|| (
-			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 )
-"
-# 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
-	>=sys-devel/clang-5
-	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-compiler-r0.patch"
-	"${FILESDIR}/chromium-webrtc-r0.patch"
-	"${FILESDIR}/chromium-memcpy-r0.patch"
-	"${FILESDIR}/chromium-math.h-r0.patch"
-	"${FILESDIR}/chromium-stdint.patch"
-	"${FILESDIR}/chromium-ffmpeg-r1.patch"
-	"${FILESDIR}/chromium-ffmpeg-clang.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
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		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/angle/third_party/glslang
-		third_party/angle/third_party/spirv-headers
-		third_party/angle/third_party/spirv-tools
-		third_party/angle/third_party/vulkan-validation-layers
-		third_party/apple_apsl
-		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/crashpad
-		third_party/crashpad/crashpad/third_party/zlib
-		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/llvm
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/modp_b64
-		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/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/pdfium/third_party/skia_shared
-		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/unrar
-		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=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if ! tc-is-clang; then
-		# Force clang since gcc is pretty broken at the moment.
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# 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
-
-	# 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+=" 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"
-
-	# 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
-
-	# 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
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# 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
-
-	# 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
-
-	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-67.0.3396.30.ebuild b/www-client/chromium/chromium-67.0.3396.30.ebuild
index ececa654c8c9..773792ab8f90 100644
--- a/www-client/chromium/chromium-67.0.3396.30.ebuild
+++ b/www-client/chromium/chromium-67.0.3396.30.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~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"
+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="
@@ -85,6 +85,7 @@ RDEPEND="${COMMON_DEPEND}
 	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
@@ -129,7 +130,6 @@ 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
@@ -144,6 +144,7 @@ GTK+ icon theme.
 "
 
 PATCHES=(
+	"${FILESDIR}/chromium-widevine-r2.patch"
 	"${FILESDIR}/chromium-compiler-r0.patch"
 	"${FILESDIR}/chromium-webrtc-r0.patch"
 	"${FILESDIR}/chromium-memcpy-r0.patch"
@@ -467,6 +468,7 @@ src_configure() {
 
 	# 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)"
@@ -547,6 +549,9 @@ src_configure() {
 	export TMPDIR="${WORKDIR}/temp"
 	mkdir -p -m 755 "${TMPDIR}" || die
 
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/
+
 	if ! use system-ffmpeg; then
 		local build_ffmpeg_args=""
 		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
diff --git a/www-client/chromium/chromium-67.0.3396.40.ebuild b/www-client/chromium/chromium-67.0.3396.40.ebuild
new file mode 100644
index 000000000000..773792ab8f90
--- /dev/null
+++ b/www-client/chromium/chromium-67.0.3396.40.ebuild
@@ -0,0 +1,697 @@
+# 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 ~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-4:=
+		|| (
+			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
+	>=sys-devel/clang-5
+	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/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-r2.patch"
+	"${FILESDIR}/chromium-compiler-r0.patch"
+	"${FILESDIR}/chromium-webrtc-r0.patch"
+	"${FILESDIR}/chromium-memcpy-r0.patch"
+	"${FILESDIR}/chromium-math.h-r0.patch"
+	"${FILESDIR}/chromium-stdint.patch"
+	"${FILESDIR}/chromium-ffmpeg-r1.patch"
+	"${FILESDIR}/chromium-ffmpeg-clang.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
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		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/angle/third_party/glslang
+		third_party/angle/third_party/spirv-headers
+		third_party/angle/third_party/spirv-tools
+		third_party/angle/third_party/vulkan-validation-layers
+		third_party/apple_apsl
+		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/crashpad
+		third_party/crashpad/crashpad/third_party/zlib
+		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/llvm
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		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/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/pdfium/third_party/skia_shared
+		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/unrar
+		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=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# 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
+
+	# 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"
+
+	# 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
+
+	# 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
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/
+
+	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
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# 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
+
+	# 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
+
+	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-68.0.3409.2.ebuild b/www-client/chromium/chromium-68.0.3409.2.ebuild
index 86da01dec685..8abff3abbda3 100644
--- a/www-client/chromium/chromium-68.0.3409.2.ebuild
+++ b/www-client/chromium/chromium-68.0.3409.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~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"
+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="
@@ -85,6 +85,7 @@ RDEPEND="${COMMON_DEPEND}
 	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
@@ -129,7 +130,6 @@ 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
@@ -144,6 +144,7 @@ GTK+ icon theme.
 "
 
 PATCHES=(
+	"${FILESDIR}/chromium-widevine-r2.patch"
 	"${FILESDIR}/chromium-compiler-r1.patch"
 	"${FILESDIR}/chromium-ffmpeg-build-r0.patch"
 	"${FILESDIR}/chromium-webrtc-r0.patch"
@@ -472,6 +473,7 @@ src_configure() {
 
 	# 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)"
@@ -552,6 +554,9 @@ src_configure() {
 	export TMPDIR="${WORKDIR}/temp"
 	mkdir -p -m 755 "${TMPDIR}" || die
 
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/
+
 	if ! use system-ffmpeg; then
 		local build_ffmpeg_args=""
 		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
diff --git a/www-client/chromium/files/chromium-widevine-r2.patch b/www-client/chromium/files/chromium-widevine-r2.patch
new file mode 100644
index 000000000000..5527f7f293c6
--- /dev/null
+++ b/www-client/chromium/files/chromium-widevine-r2.patch
@@ -0,0 +1,39 @@
+Minimal patch to get chromium to compile with widevine support.
+
+Exactly the same as -r1, but we now need to patch
+ninja to pretty please not terminate our build.
+
+caveat emptor: it's in no way clear that building chromium this
+way is safer, from a security perspective, than whatever Google
+Chrome does.
+
+Upstream appears to be cooking up a code-signing trust-chain
+which may protect users against malicious cdm blobs; I doubt
+we benefit from these using this kludge.  Ideally, someone
+would look into this more carefully than I have ... tbh as
+soon as I got my "stories" back, I pretty much lost interest :)
+
+-gmt
+
+--
+--- a/third_party/widevine/cdm/stub/widevine_cdm_version.h
++++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h
+@@ -10,6 +10,7 @@
+
+ #include "third_party/widevine/cdm/widevine_cdm_common.h"
+
++#define WIDEVINE_CDM_VERSION_STRING "unknown"
+ #define WIDEVINE_CDM_AVAILABLE
+
+ #endif  // WIDEVINE_CDM_VERSION_H_
+--- a/third_party/widevine/cdm/BUILD.gn
++++ b/third_party/widevine/cdm/BUILD.gn
+@@ -11,7 +11,7 @@ import("//third_party/widevine/cdm/widev
+ # Internal Cast builds set enable_widevine=true to bring in Widevine support.
+ # TODO(xhwang): Support component updated CDM on other platforms and remove this
+ # assert.
+-assert(!enable_widevine || is_win || is_mac || is_chromecast,
++assert(!enable_widevine || is_win || is_mac || is_chromecast || is_linux,
+        "Component updated CDM only supported on Windows and Mac for now.")
+
+ widevine_arch = current_cpu
diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index 95f8707d9127..d63f6e0e9b9f 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -1,3 +1,5 @@
 DIST falkon-3.0.0.tar.xz 1985800 BLAKE2B 8505e2c91600d265c28f70c37bf9e8f669ecd907dd9263371a4a4c10b854d32415ec1a3fd6ac163b297d0a9f42c542d4691a6cd417ed81864585f0c66b769e34 SHA512 1d99ecd47022986570dd6bb9b57484abe30838bf52daf669c977e1d2a9381efdd60912fd72b97e0b43b6102159f4343c4d1589d4f6442d0ed62c24f1482a8d97
+DIST falkon-3.0.1.tar.xz 2219444 BLAKE2B 013d29925f9a1c7e77d5f194eb4a1371dadda05de01a0c103902acfbb16941c6fa9c7256a98ef1965c622222ccfcee8b44c48076cb00bd892378157502f73916 SHA512 e2384cb49d4e1ec52ff7804cf798688be2d80fa5957c72accb09376aa0c41ee491c45234fd53c79871bc474a8d0677e40ddb48241a70d77102c67406b0719191
 EBUILD falkon-3.0.0.ebuild 1605 BLAKE2B 5af00f3e964cc1d7703ed335ad2502c2d9dc4556e242cd98a8721f1dfbd43b485e011cd8a9baafb180d39fbcf09ece10cbc69a1fb90c11eb8fecb797b37cec3f SHA512 9e95e10ef76a536e966736f0b57f3770d3f58a4170d6fa9a4f4bf68aa94cbcd93cba94013b7b80c80725d39a6e7cba301a9ecadd00cace3df82dbdbf9a35bd01
+EBUILD falkon-3.0.1.ebuild 1703 BLAKE2B f90856c653da3d9cdf812cfb6a347da6bbfc5b6675b1cb539e068cd3e1fdb44f69f1724aea14dd1d14a341792c9bdd39c4078010dc74f24d0e01fcb764da1930 SHA512 c7a7b56a79d1fd8a60642501ba3ef6eb2a504fa7b229debd8de32c52d3a17ecdbd36b421c1314888d16c5611e538272902f33e2e716b6e06dc251688cc7d2255
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/www-client/falkon/falkon-3.0.1.ebuild b/www-client/falkon/falkon-3.0.1.ebuild
new file mode 100644
index 000000000000..8db691656aae
--- /dev/null
+++ b/www-client/falkon/falkon-3.0.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+QT_MINIMAL="5.9.2"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Cross-platform web browser using QtWebEngine"
+HOMEPAGE="https://www.falkon.org/"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus gnome-keyring kwallet libressl +X"
+
+COMMON_DEPEND="
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwebchannel)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	dbus? ( $(add_qt_dep qtdbus) )
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	kwallet? ( $(add_frameworks_dep kwallet) )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb:=
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep linguist-tools)
+	$(add_qt_dep qtconcurrent)
+	gnome-keyring? ( virtual/pkgconfig )
+"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	DEPEND+=" $(add_frameworks_dep ki18n)"
+fi
+RDEPEND="${COMMON_DEPEND}
+	!www-client/qupzilla
+	$(add_qt_dep qtsvg)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_DBUS=$(usex !dbus)
+		-DBUILD_KEYRING=$(usex gnome-keyring)
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+		-DNO_X11=$(usex !X)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "If you were previously using QupZilla, you can manually migrate your profiles"
+	elog "by moving the config directory from ~/.config/qupzilla to ~/.config/falkon"
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 534ff1dadfeb..1d336ee0b7d4 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_67.0.3396.30-1_amd64.deb 53582390 BLAKE2B 61aef8d12daf5b34e67d6deca7725ecc98ac3c368a3c8a8457763458e5a2ed2235ed4dc0333ee45d5ba93b1d8a917248c16f538395fce7b9d5c4efd7d08a809b SHA512 e578582532a797fe8a2cda63d0d3e2e9b3ff98a5b8a50f32aa45e98723bbe5ca2812337fdfc655a1214dab5927c12c25ff6ab7596a0c549dde90125b1495020b
-EBUILD google-chrome-beta-67.0.3396.30.ebuild 3615 BLAKE2B 6d174a808c9f33ec215bd4caa269afcbc50a5d89a96d30f841d9b5f2355bc8fbfa06ea96aa1c2af61138e529a6248941b19f398d06a87f6d337e98926ff767c1 SHA512 862516fc6d507feaae8c2a2d424c47d38f0fa557f5254dfd3b9a7c2caf84febe85e72ed70ee84599a94028eb168360ed545c318ff95819babe2ef708a389845f
+DIST google-chrome-beta_67.0.3396.40-1_amd64.deb 53706590 BLAKE2B 4713df66465982ee13e0092710f66c08cc4da3300c0a6745bc88735beda6c6e07e07a7d14661680ab211f448baf28b931694770d30aa7ba2d2edad785f23e600 SHA512 b2b469cf46f8380f1c4139ab090592b219a86f3266061151b6641a6491582622020aceb869c0f5de68a2e6cd3ddaf5c713e4c01c013928480dcbfcecaca4605f
+EBUILD google-chrome-beta-67.0.3396.40.ebuild 3615 BLAKE2B 6d174a808c9f33ec215bd4caa269afcbc50a5d89a96d30f841d9b5f2355bc8fbfa06ea96aa1c2af61138e529a6248941b19f398d06a87f6d337e98926ff767c1 SHA512 862516fc6d507feaae8c2a2d424c47d38f0fa557f5254dfd3b9a7c2caf84febe85e72ed70ee84599a94028eb168360ed545c318ff95819babe2ef708a389845f
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.30.ebuild b/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.40.ebuild
index 500479b752d3..500479b752d3 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.30.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.40.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 5e730ccdfe33..3e05deb936af 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_68.0.3418.2-1_amd64.deb 54061810 BLAKE2B 68476e5461717c0daf88e5022eace717745570071cf5b76a8e0e567af7e594692275d82e328024661275c24028e90e0ee9010bdc44bedde5a669954013a5e3f3 SHA512 4fc7fc585ccb3fe8e36f1ba5fe53ce15765e30d4c053c5405adc96399ff4da77b1c11ccab5e91914680d6e9cb97290af344ab6c6fa354c6fee10f6e94deafe34
-EBUILD google-chrome-unstable-68.0.3418.2.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15
+DIST google-chrome-unstable_68.0.3423.2-1_amd64.deb 54165194 BLAKE2B 10f8a44de80400a87e04102625cc3b968107df287cfd4df70a4c2fcf59267b13afdfec1fbd6f672a83f49a1ad36cac36bbcb3c36f02ca99b29c6c9f39623990f SHA512 eb27e8e3631fe69c54cce86161f5b5e1e1a64cb64863462b81a43f29a82cd2c6498cf4d1251bc9a9efcb5a2e4bfe995274b4d0b95108dde5468ff1cd5ff9e91d
+EBUILD google-chrome-unstable-68.0.3423.2.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3418.2.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3423.2.ebuild
index 43d5352b4dd5..43d5352b4dd5 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3418.2.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3423.2.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index f1241ca86db4..b52dee6d5d2c 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,3 @@
-DIST opera-beta_53.0.2907.21_amd64.deb 54899728 BLAKE2B b6c7862f51b9e431a2583c79f047d1f69ea6deedf9f1b2895a133411a212e9a0a70f742b048cfb7ae72663b974eda864f82210ada172d99d7a46ccf5c7b313b7 SHA512 d2e74cc5cd2ace74148e5f5cb12b1f7f01fb4defe740ceadc14d89dfb7ebd5f9f2eb02b21b2da0da91bf30b7bf5398c1408440efa38a33669fdbf3a61689b7e9
 DIST opera-beta_53.0.2907.31_amd64.deb 54224526 BLAKE2B c9be699e1ef4851b27b4688dffc38e6a48069c29d0ff89c598d4cd68bb6819da4d34d0b842837fc79a75043539fee75e5a01da372bf04f86290a50b3bfa235d2 SHA512 a9125c835806fb322a87557583f7c4c39fd4d60c0a31c79dfe66c5bd2e2db53fb1b2b816cdb59c1fe106796e82152068ccc2836e697372ba543494f8cfc54d05
-EBUILD opera-beta-53.0.2907.21.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
 EBUILD opera-beta-53.0.2907.31.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-53.0.2907.21.ebuild b/www-client/opera-beta/opera-beta-53.0.2907.21.ebuild
deleted file mode 100644
index 308b38bc8be3..000000000000
--- a/www-client/opera-beta/opera-beta-53.0.2907.21.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	http://download1.operacdn.com/pub/
-	http://download2.operacdn.com/pub/
-	http://download3.operacdn.com/pub/
-	http://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 7f06ffa3b37f..c7b74d926f4a 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_54.0.2934.0_amd64.deb 55198712 BLAKE2B 1d94cb440146405d27f9757d8175d0bb44151f272bc948595d2f69d37d88155278d6fae86bee25982ecc8eee85414551cea5e8a7c4eb04756a0d518f92fce491 SHA512 7fc9189d63871626a33454201c51f460bab85356b1a6e31b81b9fd199b75838e5af3a704d5fcc38cc23d30aea6626ee008c7d7773a0ee20db2c5e3fd93ed53cf
 DIST opera-developer_54.0.2936.0_amd64.deb 55512814 BLAKE2B 171f09cc453d08b6f225e1c67d0b239e3f0f3a479d6aed8feb07b3ade1f8629e963c3bdc96defe1c18d0bbdca6daafccdb8bc0961b2e992d704cf080ba130551 SHA512 8f808c5c3b814f108a63b2b1e1862ddd8c81e3d46404c3d05fd583e6e69c52271226d49b320c005d70455e02900a7cd079e8f6ee84b005e309d861e4482b2f84
-EBUILD opera-developer-54.0.2934.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+DIST opera-developer_54.0.2949.0_amd64.deb 55600592 BLAKE2B da3dd24293d9023a70cde720863065a06b13d2dda9b0860091f8f90e52502aff7c363492143a30c0a150ad7e5a478292096d7b8c3eefc6b07d5c9bf1fbac5401 SHA512 85551b992e47dc1740c9ff5772e6c099fba190605f9c8aadfa885042f5fa8b655462811e1851e6a3bda17174a3552b0bb581ce77f76412b9013986672ba9d158
 EBUILD opera-developer-54.0.2936.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+EBUILD opera-developer-54.0.2949.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-54.0.2934.0.ebuild b/www-client/opera-developer/opera-developer-54.0.2949.0.ebuild
index 12a41bce61c8..12a41bce61c8 100644
--- a/www-client/opera-developer/opera-developer-54.0.2934.0.ebuild
+++ b/www-client/opera-developer/opera-developer-54.0.2949.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index cd75a7502d8e..e150e9beb5b8 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,9 +2,9 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabe
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11ff3fed440d9c8f83ce5f9a0a8aad3f68deb470a7d82accfe7c9c93be225b458c0fc8e738ca7841d3d14abcaa201801321f3280f2b58f SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
-DIST opera-stable_52.0.2871.97_amd64.deb 55355200 BLAKE2B ae2e2418d83be0c7629bb89ad461de436a55f941ec5499ae45513949e52f23444a6c6a79e47c30f4801694443b00f9123ed415780341891dc1ac212ea5cca891 SHA512 9ec91be6599c13241e1ee77510f6973ecc4c25a3688c1ceb6d3234216607c0b66f668c97fb160d942ed9860fd54c325fcc8b12e09a452bee42a9ecafb05a011d
 DIST opera-stable_52.0.2871.99_amd64.deb 55487250 BLAKE2B 9720dfa8d113df8872505ba4069faa00a0db9176cc3504f1992cfa59a8dfaae46d0e4176a783480d6bbbace01655174fab62f56392f780e74a72941078cb7519 SHA512 62048f86ec00b5eb57e5206c51ec98e36e0bafa6d3e4813def4e25d5e25f070d7fa6d5ac87f19b725020f706f70b4e8a4c773494088957278eb0025a73083297
+DIST opera-stable_53.0.2907.37_amd64.deb 54641998 BLAKE2B 32085d1cc8aa5248d0bd1e1c1979bc66cd6f56faab0dfa99668d05ae3caa773bf3b106485b564c8dc60833bcf4a3bbcee563ce266961de7a897d6b526f26ed61 SHA512 fa3540239cba45a1848b9a37d127c5f43109eb5ab939590be15575b6338369bc1dc88830d97a6e32f0a98d72da0f0794e4ec1eca88f5f973d696ad4df6d6d6a6
 EBUILD opera-12.16_p1860-r1.ebuild 6115 BLAKE2B 6805a42231575003626bfc50af74664b53d007cc53cf99a215c764b85d68c1ce824a68c909b56c5b96bbcfda0f0d1caa6e21745f38571b563f2221cfda224da4 SHA512 9e280c4b9f15207a476196e103c265de4ecc3a4a36e5fae12d8330b12e85a774a39b6188ba4d13d028ef191b621b69bdecdd7e4362c0c49be689e6be69b46b1a
-EBUILD opera-52.0.2871.97.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
 EBUILD opera-52.0.2871.99.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
+EBUILD opera-53.0.2907.37.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-52.0.2871.97.ebuild b/www-client/opera/opera-53.0.2907.37.ebuild
index 139f6afa7c77..139f6afa7c77 100644
--- a/www-client/opera/opera-52.0.2871.97.ebuild
+++ b/www-client/opera/opera-53.0.2907.37.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 1efa1c95f476..7d3ddbf7f291 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -2,5 +2,9 @@ AUX vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch 603 BLAKE2B a4b048e605d70544
 DIST vivaldi-snapshot-1.16.1170.3_p1-amd64.deb 53985548 BLAKE2B 08fec53970742cedbf7644aefcf3762c64c8fdfd2a9c7b129f21af4842986d3847af69f204d9dcc51464b3426193e2c5bf1bc6ebe5f2208e470e006fdd7a189a SHA512 01f78969343d7bf4f27281514a16924b35cc4cbb2719d23655b2444993786957cfc1eda58ce03cca94f02d2436d5708c329bd29916acf19376ee36f2d990f396
 DIST vivaldi-snapshot-1.16.1170.3_p1-armhf.deb 47799872 BLAKE2B f163906e7671e32105300540078e792b0849b822d18594cb3a8ee1116efaa800af183f6dee151e1cb82f793e95e3e74b6488e9dcdaaf56ea9e49fa3def5257ce SHA512 ad0ffde292e4001567278c1971dc5e593464cd2223bc2e74b3d88474bbcbfcdeb40daf883f4abb8ea92d3a5c93744c98b9ee603e66f6d56f16df3f9393b0e25d
 DIST vivaldi-snapshot-1.16.1170.3_p1-i386.deb 53635666 BLAKE2B 1f7b05594a9fae45f8083637e7782da8cdf27d269c668065d58d75e7b66dc9b31504c7679c675ff8a84f8f19eba3f0d90a19f715a7bb475caddd16e5bfc288c8 SHA512 1c5963428d8f79ceb6c4f185d55c67f799f1d61337e40c4773e0f8536b61a2fca99d1a0b93ed8c450864771973784a34074af734e6596c4bd172e7366e8a5c30
+DIST vivaldi-snapshot-1.16.1177.5_p1-amd64.deb 54064562 BLAKE2B c30afb6c6a15d6558aa1479a0a114329359cd9e1ca80de25498917e8bc6cc2478998cb969cb8937ef6509afc5f790a8d58c7596f55cb91a5ba4f59f2a0831c49 SHA512 76d68038f3fd8a45e5cea88513a67af0cce7a9b8971203027b8490d1fc9f0b64ee0c3659ebffbc693e25876cd83d9b2afd74c10f24e8bae1a2ef7a315882ca4b
+DIST vivaldi-snapshot-1.16.1177.5_p1-armhf.deb 47810656 BLAKE2B c43609c45cb2281e09ad2251e44025da3d18d9fd06d50d3f13eb10417782d7f2463c12035f6aa0b618910e4cb76cb662b47b22202d6b6889acdc70c0589124b8 SHA512 eaf900cb88d1b207d7d799c6818bfa679921864aab0df85676df694be26b9b8f9f9439c72a653366df8f4249d926c6aa8828dbd67bd0417ed394b4aa82fdd7c5
+DIST vivaldi-snapshot-1.16.1177.5_p1-i386.deb 53642380 BLAKE2B 60e0e162a45174b1360d443c24b39d2ce4e182e83b2fe0b8c269067a93a34cb6d92f95a5523a57ede26c30007a155fa2283307e38ae3b32ad26536da8949890b SHA512 7a99da24cf7198a7d875c9b242349e0f9f3c548b8ff277dcc30f66c9cc75ec29f8d1e2d6abd275f3478bfcf826fb9695fa3f65d167153582d0b9557fb19d53fd
 EBUILD vivaldi-snapshot-1.16.1170.3_p1.ebuild 2583 BLAKE2B d8f59fafcf19aa3221f32faf2cb1d2063ca6c020f3629ea2a55d8e849b5950a8728831d3dbf2054fff10fda00bcf630ed438cb34fc49d373defc6f43989f1d39 SHA512 4095c89b9c95d9e0570e787aa1d9c19b53593b0482bdd6e124a1e9d49df37ca2a7b2780c65e7df6669e9d73705bac781ca06006094439110b924a6671eb9c760
+EBUILD vivaldi-snapshot-1.16.1177.5_p1.ebuild 2583 BLAKE2B d8f59fafcf19aa3221f32faf2cb1d2063ca6c020f3629ea2a55d8e849b5950a8728831d3dbf2054fff10fda00bcf630ed438cb34fc49d373defc6f43989f1d39 SHA512 4095c89b9c95d9e0570e787aa1d9c19b53593b0482bdd6e124a1e9d49df37ca2a7b2780c65e7df6669e9d73705bac781ca06006094439110b924a6671eb9c760
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1177.5_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1177.5_p1.ebuild
new file mode 100644
index 000000000000..b70af0fb4cf5
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1177.5_p1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${PN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	epatch "${FILESDIR}"/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
+
+	epatch_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index c88f9a5063fc..cbbe83186866 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index eb105bfa31e3..401ab8e4304f 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,9 +1,9 @@
 AUX mms.cfg 4420 BLAKE2B 4557315bfa6f8edb6c8b28907065cdac3771175bd36a8ce2b6e72f0e1f0af20a7bb1ea8abb67f5c7b16fcaa7dd81c3eb89f926957d2ae5fffd499a7e6e709354 SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd
 AUX pepper-flash 151 BLAKE2B ab58f8d7dd307fea0d53b7f58887e3caeef8913940d6bfb662a42cc1f475ec59009998898e991d7a82d55a26ec1b2fbbc8b2a626fb8c9ba0d2da1e1735ab26ac SHA512 f20176b9567097482c3b1fdd062affb33a69b671f6298a98cd58e03ca80dd01bada4126ac5fd940fddc53a097669f52d4b8bba7850daf211e11dc24cc4d97eb1
 AUX pepper-flash-r1 143 BLAKE2B 049f7ec4e3df5fbdaa62e40acf8d21d42f61789c6d9ecde64f300df3d3c51f2b5580fb571ebbf172d590799801c632a2eb4daa01dd86e318441719ff6412f3ed SHA512 e4e1c1f204af1e5ce531dd43a22b4cd08e8def1099bba88ac96af09bd0879dfbb6383653ec85d5d199d418098e4b17d71998bee5a9fb5bb7bd8873432a4f66ee
-DIST adobe-flash-29.0.0.140-npapi.i386.tar.gz 8520298 BLAKE2B 81fbfa2a82702314f06196ca346dbfe768c4c0ae6512c012fb1b5c2323385c58d64ca87a3c6f7745c2840832c7e0e9e7fe500c1974786b7f835f454aac64b1b8 SHA512 0b478fdc4d606bfa3b1a379dd5d84aaee9ac1fe6f66acd2d79e787f8590f5140c1c6c48c26e3679375910f197945728625944963f1081a1e324b49add2a6d6dc
-DIST adobe-flash-29.0.0.140-npapi.x86_64.tar.gz 9036010 BLAKE2B d1c25e93740cf53f0d551ba859cb4a23ba61fb2816e30d7f8ce503d11cb56ad8058e1bc2259b6bb2986ff751b45b2c2f2a8d63fbf6503e64df1342b73e2976a7 SHA512 acd2ea77a8e7baf4dc473f6301e7ca3df633fd0e61815b99fa16204b574409190811daeb31a936fdc8187f1a7da4e5014ab1a95572b6fb3d2b2276498fa8bcc8
-DIST adobe-flash-29.0.0.140-ppapi.i386.tar.gz 8554989 BLAKE2B 7c662ce66f6d0079f673b28691afea5cca6276a934b851d0d91fcbc4e81320eedf8ee4bf6bf909a8909a76c83a3e6839cb3d521813891f9a7675f69c17da79f1 SHA512 979fc4d626449e0caa350fd8d8ec2a023e72089aaa9ce1a828e1bb37b0bb1431653642c30e0aaef30df8a0d7c8633b232d7f6525f6dc8df2a708f8af7c46e1b9
-DIST adobe-flash-29.0.0.140-ppapi.x86_64.tar.gz 9471488 BLAKE2B 94d3a3fd549cf0f6e9358f153c665160ddc2e4366b92370f615fb328c422e990f9b9785218a0fe0ba998089f5bc3fd241bfd58dd40b210ba05aabc01bfba6602 SHA512 7af12d05a0043d67c6db71b0f4f3797330b4fa27da75877ee7ac9371f80f67131fa499f5cb4f271b80e30cd02845d7ab40a68c7e8dffa0a769f89b1d9b393cc2
-EBUILD adobe-flash-29.0.0.140.ebuild 3662 BLAKE2B 498cd0a7cfd254b95c9f597a640131189fdd0c18889c0f932cdf93b07d4d9f5e19205f4fd625942c73bea2531feafb04266cb528d121352752629d8abce61519 SHA512 aa2662560e571a3adce5860f107ce640cf5dc6a8a77f75223f76cebdace872e7d6b305ed9c107efd0b48b379d19fe4477bc890a231b14bc8ab2fcfa76183c9fd
+DIST adobe-flash-29.0.0.171-npapi.i386.tar.gz 8520030 BLAKE2B 7a9512dea7dcf769f090ea179482bfccd2c59cab0e3660425bf4642bd688b497b21d95a17b4dcdbe57fda6d3c13d6ab71285dd94ba72a30b086390bd4bf64ebd SHA512 911237ffcad3b582ff4090de63a90ec8b7793390dae39cea644f1508a49ae6c00c7477b695e9afb19dcbef4ec475eac42f0494e75a45df5973af0f481ba32d87
+DIST adobe-flash-29.0.0.171-npapi.x86_64.tar.gz 9036933 BLAKE2B 11a873b8611327c224f3501e976cd3ce3480a81f306f7175d9e15c6178b2eb195f5c1276d4b84201532f4ac74584420a0f2ec488a159f084bd58c3a433345dec SHA512 0489682989b17686f6de4786f9a7394b5bdd8a7465f624d1682db06b223effb4bf47670abd74b38a7b9e8fd2535660f1fb06435796f1d875001cdc667a8452b4
+DIST adobe-flash-29.0.0.171-ppapi.i386.tar.gz 8554691 BLAKE2B 4b9c0bd8bfdaa09d7a126a1ab02914322983dd366a3edaeea3ff481569597d38d510dabbc90def1b8b9f480598f891467e7465b8dc5fe67ec556416820f8d156 SHA512 efa5898bdbbfc23017b01e5fbee964d1728f22297fb0f29d82f2b02da84a5d0ceb70cc079312fcd4fe77deb112ddf9670ccd475177c33a316d271f4c8b501154
+DIST adobe-flash-29.0.0.171-ppapi.x86_64.tar.gz 9471706 BLAKE2B 2f054806f3f010b3bdc95166bb359c38e2425560ae6fe5c91b8ce241eeaef00ff29797e36acaa1a6f6e3e8feb37ed7239cdaf8c48a670a2adc5bd146a06b0968 SHA512 84e2abee91394781f5b7628d2269bb28a24701d32eeecbe9fbc8233b3f755f3148933fd9513b09f9ac4f6878196ba0bdb08969ad17121666337a684bbff50497
+EBUILD adobe-flash-29.0.0.171.ebuild 3662 BLAKE2B 498cd0a7cfd254b95c9f597a640131189fdd0c18889c0f932cdf93b07d4d9f5e19205f4fd625942c73bea2531feafb04266cb528d121352752629d8abce61519 SHA512 aa2662560e571a3adce5860f107ce640cf5dc6a8a77f75223f76cebdace872e7d6b305ed9c107efd0b48b379d19fe4477bc890a231b14bc8ab2fcfa76183c9fd
 MISC metadata.xml 552 BLAKE2B 56ec8c5f43e9624c4102f52834b63855be35d064ce05bfbc866af225fb8e60cf1b83e02c9917b474183b81cad9e4ecfba7595d8de7fa94974824d2a7f4de302d SHA512 0f84cf3e517eb92f73629e6a157a2999f409fa6dea40682e2248edeb957e5bc6f5228c49aebdc3b5d434d0fd8f717a19c793aee8776397871e1bc5ebf8cf7fa1
diff --git a/www-plugins/adobe-flash/adobe-flash-29.0.0.140.ebuild b/www-plugins/adobe-flash/adobe-flash-29.0.0.171.ebuild
index c0de0f4b7479..c0de0f4b7479 100644
--- a/www-plugins/adobe-flash/adobe-flash-29.0.0.140.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-29.0.0.171.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index ce77ea3cc17d..f85825ab5aef 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_67.0.3396.30-1_amd64.deb 53582390 BLAKE2B 61aef8d12daf5b34e67d6deca7725ecc98ac3c368a3c8a8457763458e5a2ed2235ed4dc0333ee45d5ba93b1d8a917248c16f538395fce7b9d5c4efd7d08a809b SHA512 e578582532a797fe8a2cda63d0d3e2e9b3ff98a5b8a50f32aa45e98723bbe5ca2812337fdfc655a1214dab5927c12c25ff6ab7596a0c549dde90125b1495020b
+DIST google-chrome-beta_67.0.3396.40-1_amd64.deb 53706590 BLAKE2B 4713df66465982ee13e0092710f66c08cc4da3300c0a6745bc88735beda6c6e07e07a7d14661680ab211f448baf28b931694770d30aa7ba2d2edad785f23e600 SHA512 b2b469cf46f8380f1c4139ab090592b219a86f3266061151b6641a6491582622020aceb869c0f5de68a2e6cd3ddaf5c713e4c01c013928480dcbfcecaca4605f
 DIST google-chrome-stable_66.0.3359.139-1_amd64.deb 52214770 BLAKE2B 2eebeb728e921cd89db1c06ff3c7d55f08f1565ac59f0260b9f079a951c21b8af944aac7d2ac2af6eac1833e4d0b0ad5ce5cc09705c5f7fabb1a5a0d5e4cab4f SHA512 7eacb4c6bcdcb330c3ce0a39ff7035117ac0040bfd647135562b6a01cbe214ac2edf5d110b7f69ffb58ca60f128be3cc948e8eb8ce94c803a4d4294279b9dac6
-DIST google-chrome-unstable_68.0.3418.2-1_amd64.deb 54061810 BLAKE2B 68476e5461717c0daf88e5022eace717745570071cf5b76a8e0e567af7e594692275d82e328024661275c24028e90e0ee9010bdc44bedde5a669954013a5e3f3 SHA512 4fc7fc585ccb3fe8e36f1ba5fe53ce15765e30d4c053c5405adc96399ff4da77b1c11ccab5e91914680d6e9cb97290af344ab6c6fa354c6fee10f6e94deafe34
+DIST google-chrome-unstable_68.0.3423.2-1_amd64.deb 54165194 BLAKE2B 10f8a44de80400a87e04102625cc3b968107df287cfd4df70a4c2fcf59267b13afdfec1fbd6f672a83f49a1ad36cac36bbcb3c36f02ca99b29c6c9f39623990f SHA512 eb27e8e3631fe69c54cce86161f5b5e1e1a64cb64863462b81a43f29a82cd2c6498cf4d1251bc9a9efcb5a2e4bfe995274b4d0b95108dde5468ff1cd5ff9e91d
 EBUILD chrome-binary-plugins-66.0.3359.139.ebuild 1438 BLAKE2B 25df8bdde008f7711eb41c4f616ba55ad4fee20604ba67ffd3e0b55b016896b1e71258cd894f1060e69b3ba65499ed16218bc835f5bff1318fe6529c01e9b8da SHA512 bf8818ec496fb2be1edda7f6e84920e048f8f7017e53a4d14bd52329b458f38efd2d5cc3b39190385a5e0926c8cbd6f73f2433c7abd259fdb70d51e0e245c0bb
-EBUILD chrome-binary-plugins-67.0.3396.30_beta.ebuild 1308 BLAKE2B 604e15f5d5ba5fa9cb343e4a409a463ffaf15dc05f53f4af4dc165a127101dfaf642f24f2cff55e313376e90f30a4490727edb55350e1aeec1cc12e6e691a4b1 SHA512 4c374994bf51ea3791ed328846709be41540027fd5a1f57a991c462a04962e00240132ae00010f592098ff6869408488e1a3b6c36b69dfe553d36b8296c5c4be
-EBUILD chrome-binary-plugins-68.0.3418.2_alpha.ebuild 1308 BLAKE2B 604e15f5d5ba5fa9cb343e4a409a463ffaf15dc05f53f4af4dc165a127101dfaf642f24f2cff55e313376e90f30a4490727edb55350e1aeec1cc12e6e691a4b1 SHA512 4c374994bf51ea3791ed328846709be41540027fd5a1f57a991c462a04962e00240132ae00010f592098ff6869408488e1a3b6c36b69dfe553d36b8296c5c4be
+EBUILD chrome-binary-plugins-67.0.3396.40_beta.ebuild 1308 BLAKE2B 604e15f5d5ba5fa9cb343e4a409a463ffaf15dc05f53f4af4dc165a127101dfaf642f24f2cff55e313376e90f30a4490727edb55350e1aeec1cc12e6e691a4b1 SHA512 4c374994bf51ea3791ed328846709be41540027fd5a1f57a991c462a04962e00240132ae00010f592098ff6869408488e1a3b6c36b69dfe553d36b8296c5c4be
+EBUILD chrome-binary-plugins-68.0.3423.2_alpha.ebuild 1308 BLAKE2B 604e15f5d5ba5fa9cb343e4a409a463ffaf15dc05f53f4af4dc165a127101dfaf642f24f2cff55e313376e90f30a4490727edb55350e1aeec1cc12e6e691a4b1 SHA512 4c374994bf51ea3791ed328846709be41540027fd5a1f57a991c462a04962e00240132ae00010f592098ff6869408488e1a3b6c36b69dfe553d36b8296c5c4be
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.30_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.40_beta.ebuild
index f2cb5723b3da..f2cb5723b3da 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.30_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.40_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3418.2_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3423.2_alpha.ebuild
index f2cb5723b3da..f2cb5723b3da 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3418.2_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3423.2_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 56efb8fa0a8e..84be4c36a908 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index ba72c86c5250..60f4709ade37 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1,8 +1,9 @@
+AUX h2o-2.2.4-libressl.patch 1946 BLAKE2B 6acaf45e7db2faf4fa09aa2214f6389e7f5b421c9bae8ae10dd35569d609839c2d9a7e8ca1c7057b37812d7b444406c86fae496084665e57d0688c76cf095b68 SHA512 63558d53fe52deaa54976fe33346708ed9b3c59588930ef463ae9d9f89747acc66038d3105dec1b72051715ba523323a6cb7c4bdbb445d521f23d9682ca4717f
 AUX h2o.conf 673 BLAKE2B 2e7a51fa8ba766df6d3542e434c786e9ffcb4016a1ff9b3a1f065592eb559b90706e927ac8063b5f95f0aa78eb247b366d2a7e69226f261d11a5d610a8c11eab SHA512 48ab93dd7aee65f88bb12bc270f0ba0edf31bcb4610bb4b648936f8ffca47b30a3aa2aec129aa3c985f476450dc47305bd111f326715941f84e54bbc66f1325a
 AUX h2o.initd 1137 BLAKE2B f972dddb7aa076110d4384105b8d4444ee8021f7d28ecd80058063cb01cbf4190c925e3af5e47de287719726ab1acdcc71e000ac6c80f74ce0360ff8dd28943f SHA512 2509b1b6996be25bba158b626c8eb260aae2400d76dc0edcee38869eb1124ae9ed125fb1887bf85f3c96db189b68c77706c7a9aeb9f4be2d2dfd998606d3a763
 AUX h2o.logrotate 176 BLAKE2B 90e56a5170ec4eb6e42a907cb03e38a8944a32416e8b28f8b666262889c0d2a54ca37e3563fe4511038e665c3e6c2dd9a7a3640739a118359e314813818ec59d SHA512 e7e15bb7813b45342a9d435d07eea0627b802a4c03c6f4204b533a7bfac9566152f875965e4ea761572324a278e7b85c507729210d92ca4bede3ef9b9d2ac305
 AUX h2o.service 290 BLAKE2B 3cddabe28f0054d1e9f650ae1520bc13a417227a244ffe7f1b72c87dabeeb244f3d786b7ad5676e8d94c9c98428e7af88e5edd8db35ae596026c9f2f0aa31b87 SHA512 e1acd226a5e333538be782f5d47c8debf418966c86eaa5d7464431ecc399821e336c9539e90370b9f8041c023f876815050e5ad5a7d29288b6f87bd3adbe0e95
 DIST h2o-2.2.4.tar.gz 16212596 BLAKE2B 0c2702fb3c7e85e7eae107294794f80cee02b6b2488bbc2e880ea356d8362f0de8f08c3c3d686512cbf9ae1558aed23354f44e27edaf449e43d5876940248296 SHA512 508ebe93b890f573e735d9b1f9c91a669144be3523e34fb7455227fd10b38e04a5db73e706fe8d05849fea3019e792754097871c073715c9eef4eae7c33560b5
-EBUILD h2o-2.2.4.ebuild 1332 BLAKE2B 69d01537bdeef975c1b46d60da7f3e9eb13d9a063e2fad432264a9f5103e892bf536bee8b58638044028b21a4db23c0e2c4afd05c9fe6361bdc5b1ae2c9a03ad SHA512 839154bc39f5f835624b57e14e32544aedda458c6205d2a3438b812f51a60e70d1d5ce0955a39c625cfab79b54b4f32951880e60148147acc0efffea5e314987
+EBUILD h2o-2.2.4.ebuild 1379 BLAKE2B 2bea638d603a43d339673e315d5a962b489e1927f30f7c887a3cbd27ef8359dc6291ef689d2d70e3eccf51ed2bc5993270e250b49cb43bbf0a7f08fe60a50cec SHA512 d997c62b90e5a80eda61bb9056778fe99f123765529804a19aed8817506df7d1b6fe418d7a91bdfd497cb355ad0c80b182ff2ec258608307a49c0255bd0feddb
 EBUILD h2o-9999.ebuild 1124 BLAKE2B 25f6ead8a1169987f617695b5ff588305dc6f6f44e0210e9844139b169b8fb22af522a3e91ccff1c27935117dcba29c66606bef84c34091fcf802176b7939887 SHA512 7829f692d3611dea66e531492c1035ef3233817bebce5e6b486a958b1b70f4416b98d88d607a912a78dc9197aacedfcd398ed4b0d81dd78c95df0812c065a604
 MISC metadata.xml 728 BLAKE2B 4598619035779d5059c269d24712e86b592636162e5fe5c3a244c6c48dd63dd9391c78cf365ded5052a6ce8e0cc43deaf7dc58b21b9320ee5ddce969d2b92317 SHA512 ae4a00e6c50ef7930e264cb3a747e14e656908fab0e3da4673c6719dda3744b34451361cd118feaaa6eebf3980c56ec297df9306e9ffa56c56df6c150e27707b
diff --git a/www-servers/h2o/files/h2o-2.2.4-libressl.patch b/www-servers/h2o/files/h2o-2.2.4-libressl.patch
new file mode 100644
index 000000000000..3849dd0e2b68
--- /dev/null
+++ b/www-servers/h2o/files/h2o-2.2.4-libressl.patch
@@ -0,0 +1,54 @@
+--- a/include/h2o/openssl_backport.h
++++ b/include/h2o/openssl_backport.h
+@@ -25,7 +25,7 @@
+ #include <stdlib.h>
+
+ /* backports for OpenSSL 1.0.2 */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+
+ #define BIO_get_data(bio) ((bio)->ptr)
+ #define BIO_set_data(bio, p) ((bio)->ptr = (p))
+@@ -57,7 +58,7 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
+ #endif
+
+ /* backports for OpenSSL 1.0.1 and LibreSSL */
+-#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+
+ #define SSL_is_server(ssl) ((ssl)->server)
+
+--- a/deps/neverbleed/neverbleed.c
++++ b/deps/neverbleed/neverbleed.c
+@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *buf)
+     return 0;
+ }
+
+-#if !OPENSSL_1_1_API
++#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+
+ static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
+ {
+
+--- a/deps/picotls/lib/openssl.c
++++ b/deps/picotls/lib/openssl.c
+@@ -41,13 +41,15 @@
+ #include "picotls.h"
+ #include "picotls/openssl.h"
+
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
+-#define OPENSSL_1_0_API 1
++#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
++#define OPENSSL_1_1_API 1
++#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL
++#define OPENSSL_1_1_API 1
+ #else
+-#define OPENSSL_1_0_API 0
++#define OPENSSL_1_1_API 0
+ #endif
+
+-#if OPENSSL_1_0_API
++#if !OPENSSL_1_1_API
+
+ #define EVP_PKEY_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_EVP_PKEY)
+ #define X509_STORE_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_X509_STORE)
diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
index d33e39efe54d..ab022fd47830 100644
--- a/www-servers/h2o/h2o-2.2.4.ebuild
+++ b/www-servers/h2o/h2o-2.2.4.ebuild
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 		${RUBY_DEPS}
 	)"
 
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
 pkg_setup() {
 	enewgroup h2o
 	enewuser h2o -1 -1 -1 h2o
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 01156ddd421e..16074142be90 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -10,8 +10,7 @@ AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469a
 AUX lighttpd.tmpfiles.conf 44 BLAKE2B 00550d523dc350184ef0d681e9e8da5ad1909dd6226698c79d88c7cab7d35c8e20a0c308b5342f94872442aeac240e202ea6055f4666759f9ec853debac18730 SHA512 795448ad726ebfe7688236a23cb21bf06bbf8edd7e243924e3d1c21d33fffba1e04501734b189eb2081f6737b74af7c978eed802fb5e540dcc5c5aea69544936
 DIST lighttpd-1.4.45.tar.xz 660432 BLAKE2B 31ea3209b8efad32c3811d39b1c1a682d9f2d79a2ecd7d90c413ad066b6a7d5f84df9b3af2ffb2d49a701856ac496626f2a744b25f1dc4fe1c3b9af586fc437f SHA512 d030674a8c55aab12d32ac75f8df2628ba2332a5263c8bd2dd4f39342530080edc6ba2a6fee749c1301d601ab766a265d3c630b04d38bb26bba3cf045935573d
 DIST lighttpd-1.4.49.tar.xz 710964 BLAKE2B 112ceb36b45f51c7d5526caba27d2b2aa57ec9d14751e1334472c9079c25317c5e37faf884788c84d61fa6cfa2efedc0b4ec02e32308beb6a0b6be28eea44fbd SHA512 de766da68b4cacfb6c322210eafe819b6423334272e9fae4688c2282a66a2e55aaf580c5fdbf02676ed6f7b32d13f2f28cefd22518f77127055ec336ec5d6784
-EBUILD lighttpd-1.4.45-r1.ebuild 6093 BLAKE2B 427d34a215d4c740e209c1f559dde12995f50a611cde0bb4d3cb91f2de44ba6abe87938c392627dcc79e1d2129949b33d4189349f1ae9f0f4ee0b7cb08e6dda3 SHA512 0d010af52425208f566aa8b350d5f98acf5957603afe256497089643995a541b494ec19a9e848fd983511af9ab40f6b453b529e92902a0c210dfb44f88ee475f
-EBUILD lighttpd-1.4.45.ebuild 6063 BLAKE2B 942870141dd2adbd548f64336d3836bba9c8d74366a7a727bb146b2d2099a6000f9863133d1828658590f47b6768726f7a45ead3ffe96b75e6d46f2890685aed SHA512 9f6730c0a3e23ee0bf22a5e8ef6ca20dc801ccedc3c3a4bececa1db728a0d4ff90c4f03e3ee131f9804af287f9452682e5bdf2494fc655fd3852f2e933bf0d14
-EBUILD lighttpd-1.4.49.ebuild 6473 BLAKE2B e7d6350f1da2cfe4057fb20eb738e8229e82dbdc63e7948c2ef24bd9a6cb060fd643c8ecdefb87c94f478f2714b929aac49ea06ea880929fd14fc3c6a4e0adbb SHA512 863efd3675de773aaf1443023c686e4bbc75de21cd1caf7caf1b4b5be823f71eca8068c421878288519a22a2ca63cad59463b19ab02bcef8a14175efca63539b
-EBUILD lighttpd-9999.ebuild 6099 BLAKE2B d87603bcad95aa7a64874ec363cd581757af5be5ac49aa90cc1c21b3ebec3548515b521aaed6bf5e8e87aa42fdb0d20d471b36d06b1b9d73764420e747b83b25 SHA512 f9b9208c90ceca9eefe93b5da39c8a7bc39671a03fad782d05c14cea1bd1ee54cbc2515fb0cbaa27432e4b20c7dde98ea9d14903e5d179bde519bf5034097366
-MISC metadata.xml 1162 BLAKE2B 1c22a68843890ac45b6a9f446ea8494f0768c13d20c77daf512988f18e764921c6f098afdf8a5bde09a3d8600153f30e1232c28f73188c49e83b02777be0150a SHA512 b796cfcd6c4f0340db88f24acd2cc3c11315b35e37f2bd0aea0b8608ad8ce67f8df7a64658628527179db65324ff8a8db441d5991309f70a13c855ab58afcea4
+EBUILD lighttpd-1.4.45-r1.ebuild 5944 BLAKE2B 629426653d2552bcf32d9e8f003b847d30c6692e81625eb1d772929bc4353db4995e8a82241ce645ebb9d9ca3be1482a1d789db4d296e90af0ee771548334966 SHA512 33632d1ab6fd7bb019b1fe8613a931b12e21a7ca79ea486e96c55cbd9529f2c551efcd91f6dc48c663b25087d557a765b729a1bfb93ccbf0ec4d32d4933732b6
+EBUILD lighttpd-1.4.49.ebuild 6324 BLAKE2B be7447a25ce7653d34b744bd5c21aaa653847591ea06616996c7703c22f50481102edd9f0f7b0e6bff42019832efc99c9345760f2cd8b8e50399eba02f64c0ae SHA512 d25bf67fcaf6c28009d45aedf338f93a9848da443c70b745d6e4aa000b547b0d9b53f80d2a430c8b99742dc4988505537916905276d3cfc583f995b0f3e751b3
+EBUILD lighttpd-9999.ebuild 5950 BLAKE2B f32cb4e5ddf22af2b698aaf17fb33f16862d13e28025984d0468e769af84acff9f2981e69526c139d9192964d57b8b95200edcfb756725855481fc31fbbf73be SHA512 50d096574b0f05c207eca9c18b7b70324c923bbbafe7d42c56770cae8eea3793f46e39c1a9be497fd35dba4844c83a8342c38afcfa4aa4c60ea7f0eb72856e69
+MISC metadata.xml 1165 BLAKE2B c30ad1b686464b6fe7a03b8974b5e74a3ce83644b9509d8c22df81a2b4b8894f7499c0923c11fabeb3124bff27393c5b20fae8014d93e19fe0191f365001d9aa SHA512 c4561396821150f7637246e17680e3c1ae7f3522206c731af66885950c1b2c90405b31d1a066b9c017ea003d37decc647a4676802f7684eae9a62e958d74e32d
diff --git a/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild
index 492f35263c47..517cf66fb0de 100644
--- a/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild
@@ -6,7 +6,8 @@ EAPI=6
 inherit autotools readme.gentoo-r1 systemd user
 
 DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net/"
+HOMEPAGE="https://www.lighttpd.net
+		  https://github.com/lighttpd"
 SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
@@ -94,11 +95,7 @@ pkg_setup() {
 		ewarn "as conditionals and modules such as mod_re{write,direct}"
 		ewarn "and mod_ssi."
 	fi
-	if use mmap; then
-		ewarn "You have enabled the mmap option. This option may allow"
-		ewarn "local users to trigger SIGBUG crashes. Use this option"
-		ewarn "with EXTRA care."
-	fi
+
 	enewgroup lighttpd
 	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
 
diff --git a/www-servers/lighttpd/lighttpd-1.4.45.ebuild b/www-servers/lighttpd/lighttpd-1.4.45.ebuild
deleted file mode 100644
index 8a2378ddd723..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.45.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools eutils readme.gentoo-r1 user systemd
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net/"
-SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
-
-REQUIRED_USE="kerberos? ( ssl !libressl )"
-
-CDEPEND="
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	libev?    ( >=dev-libs/libev-4.01 )
-	lua?      ( >=dev-lang/lua-5.1:= )
-	memcached? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( dev-lang/php:*[cgi] )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] )
-		libressl? ( dev-libs/libressl:= )
-	)
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )
-"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${D}/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
-
-	# enable stat() caching
-	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
-
-	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
-	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-	use zlib    || rm -f ${libdir}/mod_compress.*
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}"
-		ewarn "and mod_ssi."
-	fi
-	if use mmap; then
-		ewarn "You have enabled the mmap option. This option may allow"
-		ewarn "local users to trigger SIGBUG crashes. Use this option"
-		ewarn "with EXTRA care."
-	fi
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-
-	DOC_CONTENTS="IPv6 migration guide:\n
-		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-}
-
-src_prepare() {
-	default
-	#dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
-		die "sed doc/Makefile.am failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_enable mmap) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with libev) \
-		$(use_with lua) \
-		$(use_with memcached) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc || die
-		emake html
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		default_src_test
-	else
-		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-	use fam && has_version app-admin/fam && \
-		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
-
-	# configs
-	insinto /etc/lighttpd
-	doins "${FILESDIR}"/conf/lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS doc/scripts/*.sh
-	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
-	use ipv6 && readme.gentoo_create_doc
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/outdated/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
-
-	use minimal && remove_non_essential
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-}
-
-pkg_postinst () {
-	use ipv6 && readme.gentoo_print_elog
-
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		elog "Gentoo has a customized configuration,"
-		elog "which is now located in /etc/lighttpd.  Please migrate your"
-		elog "existing configuration."
-	fi
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.49.ebuild b/www-servers/lighttpd/lighttpd-1.4.49.ebuild
index 902e56f4bb6f..efcb7010d961 100644
--- a/www-servers/lighttpd/lighttpd-1.4.49.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.49.ebuild
@@ -6,7 +6,8 @@ EAPI=6
 inherit autotools flag-o-matic readme.gentoo-r1 systemd user
 
 DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net/"
+HOMEPAGE="https://www.lighttpd.net
+		  https://github.com/lighttpd"
 SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
@@ -99,11 +100,7 @@ pkg_setup() {
 		ewarn "as conditionals and modules such as mod_re{write,direct}"
 		ewarn "and mod_ssi."
 	fi
-	if use mmap; then
-		ewarn "You have enabled the mmap option. This option may allow"
-		ewarn "local users to trigger SIGBUG crashes. Use this option"
-		ewarn "with EXTRA care."
-	fi
+
 	enewgroup lighttpd
 	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
 
diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-9999.ebuild
index 4c0d54541a2c..72943866311b 100644
--- a/www-servers/lighttpd/lighttpd-9999.ebuild
+++ b/www-servers/lighttpd/lighttpd-9999.ebuild
@@ -5,7 +5,8 @@ EAPI="6"
 inherit autotools eutils readme.gentoo-r1 user systemd git-r3
 
 DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net/"
+HOMEPAGE="https://www.lighttpd.net
+		  https://github.com/lighttpd"
 EGIT_REPO_URI="https://git.lighttpd.net/lighttpd1.4.git git+ssh://git@lighttpd.net/lighttpd/lighttpd1.4.git git://git.lighttpd.net/lighttpd/lighttpd1.4.git"
 
 LICENSE="BSD GPL-2"
@@ -93,11 +94,7 @@ pkg_setup() {
 		ewarn "as conditionals and modules such as mod_re{write,direct}"
 		ewarn "and mod_ssi."
 	fi
-	if use mmap; then
-		ewarn "You have enabled the mmap option. This option may allow"
-		ewarn "local users to trigger SIGBUG crashes. Use this option"
-		ewarn "with EXTRA care."
-	fi
+
 	enewgroup lighttpd
 	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
 
diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml
index 6131a5ff7f83..592c03d4a050 100644
--- a/www-servers/lighttpd/metadata.xml
+++ b/www-servers/lighttpd/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Mikle Kolyada</name>
 	</maintainer>
 	<longdescription lang="en">
-		lighttpd a secure, fast, compliant and very flexible web-server
+		lighttpd is a secure, fast, compliant and very flexible web-server
 		which has been optimized for high-performance environments. It has a very
 		low memory footprint compared to other webservers and takes care of cpu-load.
 		Its advanced feature-set (FastCGI, CGI, Auth, Output-Compression,
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 57195fee3f30..9569ccac11e2 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
index bbdeca0d2a97..6407a2bcea3d 100644
--- a/x11-apps/intel-gpu-tools/Manifest
+++ b/x11-apps/intel-gpu-tools/Manifest
@@ -2,6 +2,6 @@ AUX intel-gpu-tools-1.12-inttypes.patch 679 BLAKE2B 931206b978425a46566f0d82ce8a
 AUX intel-gpu-tools-1.12-sysmacros.patch 981 BLAKE2B a6183a9d0d07c57ed34205c028cca8244068a5565eebb802dd5282d715c28565310b1e1194e2d8930ec46d06f54f3f763b3c2a3bb5422e9a1e6af68ef40428d6 SHA512 382094cdf8b3303f0691820e8937c15b978d34cd5c99eb43563ad2556eea261085a052bc3e8f8698b22537981a386ca30c824f80e480548a3b20f45a9e533e7a
 DIST intel-gpu-tools-1.15.tar.bz2 1827851 BLAKE2B dac481571603ff36957ad2d5ef89266e744ec39a5623bb2b8e3d2e389d39d7aa09130cd7591e876b02d8edd970fb287c53ea9b520801a4a9ceede294e2917a7f SHA512 407f7c4ce72babbbd3ed08fc77719f88321b56745601b588bb6dce1a659786215e6d1b121af748087746df6f7da1bfd3ae8f9a898173eede5d5bb4a5b24b4559
 DIST intel-gpu-tools-1.20.tar.bz2 2274390 BLAKE2B 55c8614f93f5ed6391d35570ed6e4e36a659bd8ba5d98e321cb1daaf89413a95d1f0911cd07ed00670f0dceacd8f4443894a59b85cce1debeae9f8e01a75f824 SHA512 7b930c6949c04a600792df359f7cd230ca7b843072936c0c674cb9212b2d8c0701c43ef3bebe66b34141ed7a9b39774bbb99466cd52d70b3f1abfe5e52608f25
-EBUILD intel-gpu-tools-1.15.ebuild 1310 BLAKE2B c164f8ec91977160c9ccf41a8a1061089106b837835da44201072e4083cc1a31b480f03645b8d5b0202c448c878025023d947798fa273d2f50e787e87ad2fd39 SHA512 aab618d20956444222de42e8bb27130e6a6f76e2d83555da0fc6e450ed8f8304778366d9533e519e3c01760ec5027d1e83faf55de4de77e373bdf3d90503abc4
-EBUILD intel-gpu-tools-1.20.ebuild 2339 BLAKE2B 4f90803e8e31858669fb75c11a2d0a9c77752e7a825c4895459e8edbbd07edb853e0181436be871dac9f0a844c5f89e99e6f4718ecd2bd6c2a6d0aee0671fb40 SHA512 6455bdf9bd7f0a661289df456b42bc238e68b71bc08dcf9a6611db887cf843dd0264392277035fd6f4425c6da2b35e41836acd9b34d484ba377c2eccd0e03299
+EBUILD intel-gpu-tools-1.15.ebuild 1312 BLAKE2B aa33654e6b13869db7925a3bb6b9b9e20491c382021289ddb6fb1bdc29f2931c017e30ddf8db7e0e0ab4594545a91f5a7ed35b3197cc423ace1011e48678c0ff SHA512 4c76d129ea87cdc22ec85fd0572978c17bf6a6c11aaf43d0265a3bed1b444741e172c44d89348d7eb94d6ca2f91d8c332a6877c7c6656b336dbf205ab5461bdd
+EBUILD intel-gpu-tools-1.20.ebuild 2340 BLAKE2B 562eec910f1220fb92d60d161a922864aa0e0fd56fda5540ecb9cdf7785c40d60cb6631c109d9df26ba0d3e8afd558ba1aac774e437c2051cd2234b7d21f3bdc SHA512 8a34d86cfa622addbef622db66d0994c26f7e0390f4bdd2e46a7c8bcfc519c3b949e43f4b2e348fbbae50c4409d6e515dc3659e6c5e6ce4d60ec7a574a57f7b4
 MISC metadata.xml 603 BLAKE2B 45dd9f436fa73acc04e08ad1e3bddde995b09fa16da4bcc66898203eb5b72f72ad57d3e3c07f4669e57bcdcc26e5a2711a0295964c49738041ad06d9d4b9c31c SHA512 1d211baff35dbc0ce425b433b9a1a9897184a53800f7a2e4dde8e88a8de87cc9913341a4ff5cd15115067ac4fcbf9151f6c26fd34fb2feaf9477e9636fa32b1f
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.15.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.15.ebuild
index 75ee7a50d996..a05dea860cfe 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.15.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.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="5"
@@ -6,7 +6,7 @@ EAPI="5"
 inherit xorg-2
 
 DESCRIPTION="Intel GPU userland tools"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test-programs unwind video_cards_nouveau"
 RESTRICT="test"
 
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
index 0b6ab028cb0b..f14f3fa384ae 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="Intel GPU userland tools"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa glib gsl sound test-programs udev unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv"
 REQUIRED_USE="test-programs? ( sound? ( alsa gsl ) )"
 RESTRICT="test"
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index ee5fb1ea3b27..7a85b7330ad6 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index 99d93aa15e57..9af46a7f8cfb 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,3 +1,4 @@
 EBUILD xorg-drivers-1.19.ebuild 5115 BLAKE2B 6dcb2ee9b7c786ab24cf8fc8e6d342096a0401de2dffd7a5cf5590ba431f409600c10d1cd00cfadb53c9e125dccc627a03a87360d7eb6a5318bfc623f11866c2 SHA512 9cdf04cd5358e865cd92f6f68cda3da795d83c1c213a91e54f04ea0cd340af123bd0f3ffc0ca6b0083ec38b1706fa0ef5ec810178d28f56d5985f72fb5ab5bce
+EBUILD xorg-drivers-1.20.ebuild 5417 BLAKE2B 5dd64197f9b92a98372a5308196cfaadfa1f8544324af7d77503a055cfccf37026d460ddfcf5acdff8db1557beed889d41f3d2bddf09aed4c457bb4363f59a56 SHA512 0aee53cf2fb14cff4088a8e253d8e6f8e2337c0666639b9db6be6221a7803f75e0b6fbc9368dcaaa3f0a4de3a3e4991d4f866720b29ee782157f8070b61d9f3f
 EBUILD xorg-drivers-9999.ebuild 5283 BLAKE2B 2d5a1e822c760a47f90f7d93b41f3853a6b9482b1ccbe1271f20bc2c0791366816382146d21fb02335d19c97856e35e9a5f855cb10f57c67d5a983f8721e2b88 SHA512 13578f42241b47e0aff1b4bde1796ef9b593673f11a4131953ef6869ca9bbe627613ff1336e9689b13b33f782c7363c0c70b8e4721e2e0c058c308d8bfc62cb9
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
new file mode 100644
index 000000000000..af561b6594c3
--- /dev/null
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Meta package containing deps on all xorg drivers"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+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"
+
+IUSE_INPUT_DEVICES="
+	input_devices_elographics
+	input_devices_evdev
+	input_devices_joystick
+	input_devices_keyboard
+	input_devices_libinput
+	input_devices_mouse
+	input_devices_tslib
+	input_devices_vmmouse
+	input_devices_void
+	input_devices_synaptics
+	input_devices_wacom
+"
+IUSE_VIDEO_CARDS="
+	video_cards_amdgpu
+	video_cards_ast
+	video_cards_dummy
+	video_cards_fbdev
+	video_cards_freedreno
+	video_cards_geode
+	video_cards_glint
+	video_cards_i915
+	video_cards_i965
+	video_cards_intel
+	video_cards_mga
+	video_cards_nouveau
+	video_cards_nv
+	video_cards_omap
+	video_cards_qxl
+	video_cards_r128
+	video_cards_radeon
+	video_cards_radeonsi
+	video_cards_siliconmotion
+	video_cards_tdfx
+	video_cards_tegra
+	video_cards_vc4
+	video_cards_vesa
+	video_cards_via
+	video_cards_virtualbox
+	video_cards_vmware
+	video_cards_voodoo
+	video_cards_nvidia
+"
+
+IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
+
+PDEPEND="
+	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
+	input_devices_evdev?       ( x11-drivers/xf86-input-evdev )
+	input_devices_joystick?    ( x11-drivers/xf86-input-joystick )
+	input_devices_keyboard?    ( x11-drivers/xf86-input-keyboard )
+	input_devices_libinput?    ( x11-drivers/xf86-input-libinput )
+	input_devices_mouse?       ( x11-drivers/xf86-input-mouse )
+	input_devices_tslib?       ( x11-drivers/xf86-input-tslib )
+	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
+	input_devices_void?        ( x11-drivers/xf86-input-void )
+	input_devices_synaptics?   ( x11-drivers/xf86-input-synaptics )
+	input_devices_wacom?       ( x11-drivers/xf86-input-wacom )
+
+	video_cards_amdgpu?        ( x11-drivers/xf86-video-amdgpu )
+	video_cards_ast?           ( x11-drivers/xf86-video-ast )
+	video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
+	video_cards_fbdev?         ( x11-drivers/xf86-video-fbdev )
+	video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[glamor] )
+	video_cards_geode?         ( x11-drivers/xf86-video-geode )
+	video_cards_glint?         ( x11-drivers/xf86-video-glint )
+	video_cards_i915?          ( x11-drivers/xf86-video-intel )
+	video_cards_i965?          ( >=x11-base/xorg-server-${PV}[glamor] )
+	video_cards_intel?         ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) )
+	video_cards_mga?           ( x11-drivers/xf86-video-mga )
+	video_cards_nouveau?       ( x11-drivers/xf86-video-nouveau )
+	video_cards_nv?            ( x11-drivers/xf86-video-nv )
+	video_cards_omap?          ( x11-drivers/xf86-video-omap )
+	video_cards_qxl?           ( x11-drivers/xf86-video-qxl )
+	video_cards_nvidia?        ( x11-drivers/nvidia-drivers )
+	video_cards_r128?          ( x11-drivers/xf86-video-r128 )
+	video_cards_radeon?        ( x11-drivers/xf86-video-ati )
+	video_cards_radeonsi?      ( x11-drivers/xf86-video-ati[glamor] )
+	video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion )
+	video_cards_tdfx?          ( x11-drivers/xf86-video-tdfx )
+	video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[glamor] )
+	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
+	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
+	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
+	video_cards_virtualbox?    ( || (
+					x11-drivers/xf86-video-vboxvideo
+					x11-drivers/xf86-video-virtualbox
+					) )
+	video_cards_vmware?        ( x11-drivers/xf86-video-vmware )
+	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
+
+	!x11-drivers/xf86-input-citron
+	!x11-drivers/xf86-video-apm
+	!x11-drivers/xf86-video-ark
+	!x11-drivers/xf86-video-chips
+	!x11-drivers/xf86-video-cirrus
+	!x11-drivers/xf86-video-cyrix
+	!x11-drivers/xf86-video-i128
+	!x11-drivers/xf86-video-i740
+	!x11-drivers/xf86-video-impact
+	!x11-drivers/xf86-video-mach64
+	!x11-drivers/xf86-video-neomagic
+	!x11-drivers/xf86-video-newport
+	!x11-drivers/xf86-video-nsc
+	!x11-drivers/xf86-video-rendition
+	!x11-drivers/xf86-video-s3
+	!x11-drivers/xf86-video-s3virge
+	!x11-drivers/xf86-video-savage
+	!x11-drivers/xf86-video-sis
+	!x11-drivers/xf86-video-sisusb
+	!x11-drivers/xf86-video-sunbw2
+	!x11-drivers/xf86-video-suncg14
+	!x11-drivers/xf86-video-suncg3
+	!x11-drivers/xf86-video-suncg6
+	!x11-drivers/xf86-video-sunffb
+	!x11-drivers/xf86-video-sunleo
+	!x11-drivers/xf86-video-suntcx
+	!x11-drivers/xf86-video-tga
+	!x11-drivers/xf86-video-trident
+	!x11-drivers/xf86-video-tseng
+
+	!<x11-drivers/xf86-input-evdev-2.10.4
+	!<x11-drivers/xf86-input-joystick-1.6.3
+	!<x11-drivers/xf86-input-libinput-0.20.0
+	!<x11-drivers/xf86-input-wacom-0.34.0
+	!<x11-drivers/xf86-video-amdgpu-1.2.0
+	!<x11-drivers/xf86-video-ati-7.8.0
+	!<x11-drivers/xf86-video-glint-1.2.9
+	!<x11-drivers/xf86-video-intel-2.99.917_p20160122
+	!<x11-drivers/xf86-video-mga-1.6.5
+	!<x11-drivers/xf86-video-nouveau-1.0.13
+	!<x11-drivers/xf86-video-nv-2.1.21
+	!<x11-drivers/xf86-video-omap-0.4.5
+	!<x11-drivers/xf86-video-r128-6.10.2
+	!<x11-drivers/xf86-video-siliconmotion-1.7.9
+	!<x11-drivers/xf86-video-tdfx-1.4.7
+	!<x11-drivers/xf86-video-virtualbox-5.1.14
+	!<x11-drivers/xf86-video-vmware-13.2.1
+"
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 4f111e88646a..3fc3578d720c 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -5,15 +5,11 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1b
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
 AUX xorg-server-1.19.4-sysmacros.patch 986 BLAKE2B 04c111591a6a558913217b24aa2357478e7d931b6cee5185dda31ebd38d68463b4a158a18d8a60ffa7ccc5c65e246f261ebbf7c0ebc81fd3ae31e7579b7adab4 SHA512 858676058779363741901ffbf79666f723f917b49f8627ddd2f31768873adfb416a70bc298e2356861cb5abca8be54a6c64f8fa4fd11a91cce072b93857ad168
 AUX xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch 1555 BLAKE2B ef0a52b2341939f254bdce6b705f0591d0888c8043e5c0da1c4c4e97cdac632c56b27392ac2d7ac63653c7dfe1d381edd619a5e0c1c78f3bf255348c99c30f24 SHA512 66cd27608019557029f15aa81cf1a067e124ec0f854af9e732fef8b12bade4f1797481c86de2437b63ec5364fbeb1e3e05a39aa08df71ad08df79cd7d244e280
-AUX xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch 1501 BLAKE2B 7600b13947bf66e12dd65c2572e56615583f4118995d47d5bd5c87aec82abe37a14c468c3e2e081118af5e19cd56f9e69e9e5ca8af5f58afea145294135e5f88 SHA512 63fb9caa032873dee14b0ce34b615e3fbdf70ccf9e9788e17481ffa8d15290986731694b0f794701649e59c9b0156601e6f9a97146a22f25c62fe1042c0ec568
-AUX xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch 5560 BLAKE2B b0d5420e41417b162a16414ced5b95df046a4612b0064e78e0bc5e1a55551674f86c9083afd581d4a16cb1dd48bfe3721c58fdfc6fd7141a806149be76dc212b SHA512 4193e466cd0fd9c7ef4546cb23e3011e1f6ae671810dfdae5b4950ae7c92bc4abfdc786525626da5c4d922096887ea59b7c0cd2739498cca394f3f9420e09a77
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
-DIST xorg-server-1.19.99.904.tar.bz2 6083787 BLAKE2B 7b5ba4601494ab7714a977e6fcced12e373f5aaf30d433560a899d4446116cc4a5e22ae21378fea6ab07b68bad1a2544e065fd1d449b3b155b2c0e8a6787e479 SHA512 b9dccc777d0a30c6b40bddffe1f359dde4103539c6598f04bf8cf5f59e6770229221a199c1866b4eba0cf8d2d87fe878985bbd2e3c6ec5b65e3f16195ea8d57e
-DIST xorg-server-1.19.99.905.tar.bz2 6088508 BLAKE2B 592404aebb0e1ee1e6c20a36e08a788331467875f304117711583b892442d4e0cbdd91a999b38ec1d2487f33904cd0913c2cfef37f2e49f6ef5ec9f4725372ab SHA512 9a6f173835989f7562debfbadae0077d75e35bfad5be1f78931fe46ac43df20591162950b27e2c813fd857114f98247be28d357566e45e5d3ac6b60873d94466
+DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 EBUILD xorg-server-1.19.5-r1.ebuild 6484 BLAKE2B a8188fbf1974531bfb2aae98e7e43a2c66a70e02456f08e7daf04fdeb2a37d0445d0ab1857be0e560be716634d77c7ef18e932a510bd5c6b781ad5c72fa239bb SHA512 219dd0b969e99d1e96ce61b45c836be8be1050fd02eb7cdbdb42afa78973845df160c9b30bc034b4c15170dc4943775f72170b1a3eb487cd07b8b6c4788eb20d
 EBUILD xorg-server-1.19.5-r2.ebuild 6579 BLAKE2B 98c6ead1d974cad84f88423b17809b21573ef54170526f23e92a034a1ee6b36767523790e17dd7134eff74d89142b2a692d0fcf41c92393bc8db87ea51450eb5 SHA512 8d6762b1b200f58a732ddb9ff0c862a32623a8f449d4ef42eaaa3341e572518457362f045a22491467efc982e2bdaf19156b23f629fd54ff017f3c85ec98bd94
-EBUILD xorg-server-1.19.99.904.ebuild 5793 BLAKE2B 76f42a062c63390d74d36576682786bfc090ba9d297b1aa0ed004f65a04bc6bc89f73a495ef521b973aa4a9b3c145b123a6b3b3c88c3a0c1b9fe92d1d27610ea SHA512 73089210bebaead51c05833149f14681bf37677aeec612757105902b49c85eb64dd08a2788faad2b2cc8bc26e79238596667051cafe3014acbcaa23be43833eb
-EBUILD xorg-server-1.19.99.905.ebuild 5527 BLAKE2B 9ecf7e16160da27f61917a9333ee27522bbe23123dfb1ab4aa0ea362006d20bd5990431e2568cee623e8baf6ce247feb8f7256a2374b7db36cc0572e3b91384e SHA512 476b7aee6d2fe130f95cfef76fef0639126a596790a75d1ee6248e880f88a57d99a67318c6eef9a8990e669cd8c52cb69de2aad0071414ff4c451a3020a5eae2
+EBUILD xorg-server-1.20.0.ebuild 5527 BLAKE2B 9ecf7e16160da27f61917a9333ee27522bbe23123dfb1ab4aa0ea362006d20bd5990431e2568cee623e8baf6ce247feb8f7256a2374b7db36cc0572e3b91384e SHA512 476b7aee6d2fe130f95cfef76fef0639126a596790a75d1ee6248e880f88a57d99a67318c6eef9a8990e669cd8c52cb69de2aad0071414ff4c451a3020a5eae2
 EBUILD xorg-server-9999.ebuild 5553 BLAKE2B 2b29cb7d785839c40f1357671c07bf8ea2685862ac8375f36ba9888fabd27258745e54b6ef1b126098eda8e155415a816f73b9331881ff975b327216948489b6 SHA512 9d8f5af8959c2635d40b8c9bc75947a1c5765032751a2169fac84af529e82168d111856586b00447704bd46835e1a817527788460e4e8dee6d2d8c9fc0804b1e
 MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch b/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
deleted file mode 100644
index f0c4ed58d33d..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From a98a95b798a0062783ae6fd2135ad488af5efcfd Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 15 Apr 2018 23:37:45 -0700
-Subject: [PATCH xserver 2/2] modesetting: Move GBM code inside #ifdef
- GLAMOR_HAS_GBM
-
-Fixes a compilation error without Glamor.
-
-Bugzilla: https://bugs.gentoo.org/653288
-Signed-off-by: Matt Turner <mattst88@gmail.com>
-Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
----
- hw/xfree86/drivers/modesetting/drmmode_display.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
-index 322ef050b..79e91f0f8 100644
---- a/hw/xfree86/drivers/modesetting/drmmode_display.c
-+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
-@@ -998,18 +998,18 @@ static Bool
- drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
-                   unsigned width, unsigned height, unsigned bpp)
- {
--    uint32_t format;
--
--    if (drmmode->scrn->depth == 30)
--        format = GBM_FORMAT_ARGB2101010;
--    else
--        format = GBM_FORMAT_ARGB8888;
--
-     bo->width = width;
-     bo->height = height;
- 
- #ifdef GLAMOR_HAS_GBM
-     if (drmmode->glamor) {
-+        uint32_t format;
-+
-+        if (drmmode->scrn->depth == 30)
-+            format = GBM_FORMAT_ARGB2101010;
-+        else
-+            format = GBM_FORMAT_ARGB8888;
-+
- #ifdef GBM_BO_WITH_MODIFIERS
-         uint32_t num_modifiers;
-         uint64_t *modifiers = NULL;
--- 
-2.16.1
-
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch b/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch
deleted file mode 100644
index 312a5e05cdc6..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From c3ae963a7b19e05b8296aae8b6354587756d48fa Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 16 Apr 2018 09:39:09 +0200
-Subject: [PATCH xserver 1/2] xwayland: Fix build without glamor
-
-Present support in Xwayland relies on glamor, make sure Xwayland can
-be built without glamor by moving references to Present code inside
-the conditional GLAMOR_HAS_GBM.
-
-Reported-by: Matt Turner <mattst88@gmail.com>
-Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
-Reviewed-by: Matt Turner <mattst88@gmail.com>
-Reviewed-by: Roman Gilg <subdiff@gmail.com>
----
- hw/xwayland/Makefile.am |  4 ++--
- hw/xwayland/meson.build |  3 +--
- hw/xwayland/xwayland.c  | 10 +++++++++-
- hw/xwayland/xwayland.h  |  7 ++++++-
- 4 files changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
-index 0291afee7..80d3a1f19 100644
---- a/hw/xwayland/Makefile.am
-+++ b/hw/xwayland/Makefile.am
-@@ -11,7 +11,6 @@ Xwayland_CFLAGS =				\
- 
- Xwayland_SOURCES =				\
- 	xwayland.c				\
--	xwayland-present.c			\
- 	xwayland-input.c			\
- 	xwayland-cursor.c			\
- 	xwayland-shm.c				\
-@@ -35,7 +34,8 @@ Xwayland_built_sources =
- 
- if GLAMOR_EGL
- Xwayland_SOURCES += 				\
--	xwayland-glamor.c
-+	xwayland-glamor.c			\
-+	xwayland-present.c
- if XV
- Xwayland_SOURCES += 				\
- 	xwayland-glamor-xv.c
-diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
-index 69a5c819a..8d178825e 100644
---- a/hw/xwayland/meson.build
-+++ b/hw/xwayland/meson.build
-@@ -1,6 +1,5 @@
- srcs = [
-     'xwayland.c',
--    'xwayland-present.c',
-     'xwayland-input.c',
-     'xwayland-cursor.c',
-     'xwayland-shm.c',
-@@ -53,7 +52,7 @@ srcs += code.process(dmabuf_xml)
- 
- xwayland_glamor = []
- if gbm_dep.found()
--    srcs += 'xwayland-glamor.c'
-+    srcs += [ 'xwayland-glamor.c', 'xwayland-present.c' ]
-     if build_xv
-         srcs += 'xwayland-glamor-xv.c'
-     endif
-diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
-index dd074c341..44bbc3b18 100644
---- a/hw/xwayland/xwayland.c
-+++ b/hw/xwayland/xwayland.c
-@@ -525,6 +525,7 @@ xwl_realize_window(WindowPtr window)
-         wl_region_destroy(region);
-     }
- 
-+#ifdef GLAMOR_HAS_GBM
-     if (xwl_screen->present) {
-         xwl_window->present_crtc_fake = RRCrtcCreate(xwl_screen->screen, xwl_window);
-         xwl_window->present_msc = 1;
-@@ -533,6 +534,7 @@ xwl_realize_window(WindowPtr window)
-         xorg_list_init(&xwl_window->present_event_list);
-         xorg_list_init(&xwl_window->present_release_queue);
-     }
-+#endif
- 
-     wl_display_flush(xwl_screen->display);
- 
-@@ -599,9 +601,11 @@ xwl_unrealize_window(WindowPtr window)
- 
-     compUnredirectWindow(serverClient, window, CompositeRedirectManual);
- 
-+#ifdef GLAMOR_HAS_GBM
-     if (xwl_screen->present)
-         /* Always cleanup Present (Present might have been active on child window) */
-         xwl_present_cleanup(window);
-+#endif
- 
-     screen->UnrealizeWindow = xwl_screen->UnrealizeWindow;
-     ret = (*screen->UnrealizeWindow) (window);
-@@ -621,8 +625,10 @@ xwl_unrealize_window(WindowPtr window)
-     if (xwl_window->frame_callback)
-         wl_callback_destroy(xwl_window->frame_callback);
- 
-+#ifdef GLAMOR_HAS_GBM
-     if (xwl_window->present_crtc_fake)
-         RRCrtcDestroy(xwl_window->present_crtc_fake);
-+#endif
- 
-     free(xwl_window);
-     dixSetPrivate(&window->devPrivates, &xwl_window_private_key, NULL);
-@@ -709,9 +715,11 @@ xwl_screen_post_damage(struct xwl_screen *xwl_screen)
- 
-     xorg_list_for_each_entry_safe(xwl_window, next_xwl_window,
-                                   &xwl_screen->damage_window_list, link_damage) {
-+#ifdef GLAMOR_HAS_GBM
-         /* Present on the main surface. So don't commit here as well. */
-         if (xwl_window->present_window)
-             continue;
-+#endif
-         /* If we're waiting on a frame callback from the server,
-          * don't attach a new buffer. */
-         if (xwl_window->frame_callback)
-@@ -1053,10 +1061,10 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
-         ErrorF("Failed to initialize glamor, falling back to sw\n");
-         xwl_screen->glamor = 0;
-     }
--#endif
- 
-     if (xwl_screen->glamor && xwl_screen->rootless)
-         xwl_screen->present = xwl_present_init(pScreen);
-+#endif
- 
-     if (!xwl_screen->glamor) {
-         xwl_screen->CreateScreenResources = pScreen->CreateScreenResources;
-diff --git a/hw/xwayland/xwayland.h b/hw/xwayland/xwayland.h
-index a65559374..cf2551b99 100644
---- a/hw/xwayland/xwayland.h
-+++ b/hw/xwayland/xwayland.h
-@@ -127,7 +127,7 @@ struct xwl_window {
-     struct xorg_list link_damage;
-     struct wl_callback *frame_callback;
-     Bool allow_commits;
--
-+#ifdef GLAMOR_HAS_GBM
-     /* present */
-     RRCrtcPtr present_crtc_fake;
-     struct xorg_list present_link;
-@@ -143,8 +143,10 @@ struct xwl_window {
- 
-     struct xorg_list present_event_list;
-     struct xorg_list present_release_queue;
-+#endif
- };
- 
-+#ifdef GLAMOR_HAS_GBM
- struct xwl_present_event {
-     uint64_t event_id;
-     uint64_t target_msc;
-@@ -159,6 +161,7 @@ struct xwl_present_event {
- 
-     struct xorg_list list;
- };
-+#endif
- 
- #define MODIFIER_META 0x01
- 
-@@ -378,8 +381,10 @@ struct wl_buffer *xwl_glamor_pixmap_get_wl_buffer(PixmapPtr pixmap,
-                                                   unsigned short height,
-                                                   Bool *created);
- 
-+#ifdef GLAMOR_HAS_GBM
- Bool xwl_present_init(ScreenPtr screen);
- void xwl_present_cleanup(WindowPtr window);
-+#endif
- 
- void xwl_screen_release_tablet_manager(struct xwl_screen *xwl_screen);
- 
--- 
-2.16.1
-
diff --git a/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild b/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild
deleted file mode 100644
index 858fffa92176..000000000000
--- a/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-inherit autotools xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.5
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	glamor? (
-		media-libs/libepoxy[X]
-		>=media-libs/mesa-10.3.4-r1[egl,gbm]
-		!x11-libs/glamor
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	xephyr? (
-		x11-libs/libxcb[xkb]
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-10.3.4-r1
-	)
-	udev? ( >=virtual/udev-150 )
-	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
-		>=dev-libs/wayland-protocols-1.1
-	)
-	>=x11-apps/xinit-1.3.3-r1
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-base/xorg-proto-2018.3
-	dmx? (
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-	!x11-drivers/xf86-video-modesetting
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	xephyr? ( kdrive )"
-
-UPSTREAMED_PATCHES=(
-	"${FILESDIR}"/${P}-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
-	"${FILESDIR}"/${P}-xwayland-Fix-build-without-glamor.patch
-)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-pkg_setup() {
-	if use wayland && ! use glamor; then
-		ewarn "glamor is necessary for acceleration under Xwayland."
-		ewarn "Performance may be unacceptable without it."
-	fi
-}
-
-src_prepare() {
-	xorg-2_src_prepare
-	# needed because xwayland patch touches hw/xwayland/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating; and I have no idea if Gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable debug)
-		$(use_enable dmx)
-		$(use_enable glamor)
-		$(use_enable kdrive)
-		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xcsecurity)
-		$(use_enable xephyr)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
-		$(use_enable systemd suid-wrapper)
-		$(use_enable !systemd install-setuid)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	server_based_install
-
-	if ! use minimal && use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.19.99.905.ebuild b/x11-base/xorg-server/xorg-server-1.20.0.ebuild
index fc971faa6315..fc971faa6315 100644
--- a/x11-base/xorg-server/xorg-server-1.19.99.905.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.0.ebuild
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index e872382f9abb..0e81d6d873ea 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,2 +1,2 @@
-EBUILD xorg-x11-7.4-r2.ebuild 3552 BLAKE2B 62c82494ed3fffa9fa00491b4581fd45d506e0b5496bd814d0624aaffc5e476e21454f19e4d7d91a658867fa01148e8b418901488bf62b5d03dc9cec175ec39b SHA512 7347903377e36252b7bb306b3aa8027ee3892a04f3bfca280f8842888601707b526d96ed340fcff434ed8335e1fd0ea776e20b646bdff5a6841ab596c022bed1
-MISC metadata.xml 304 BLAKE2B e3c575d40eade3124105d9e047e2487f02aa8739dd9192a1cc3997905157687b9995f4272fbf4a25e68424c2aae0a82ab8d057022849248636e50e560a374e86 SHA512 23ae82fc7cc9613c7e27dad6461cdcb5098981b67b7b3179de464af1ceeac08efb4dab11c2d578af542e933a77d51ca3f69427ff216d276f92e66d5bab1ae763
+EBUILD xorg-x11-7.4-r3.ebuild 3354 BLAKE2B dfdb3bfd48d040efe82cdeb5e4bd1827d2a1b8364575a3f9c20147d6bcce35b064cb1edf635db9d9026604e3430bd9af224819ad72cf2c5708aa4957b8cb00a5 SHA512 340be90c77b036eed737d222d43a7fec46784591ce4474650df3e27143d37f3edac085a8cbc7e8edaf97cbe461199c2c960c1ebf44846d8af9af4a3e9bba2cd5
+MISC metadata.xml 369 BLAKE2B 36a4c5573e4280020ac40830cae3056197c2eda56c3161265c163a82d18337da4a2efbfaf7dbd08c76f6231c40a19669e1785b84ce6c89ab5bbc2fbb9b2a1970 SHA512 d0aadbeb8260987c487e28e74ec895b5012c23b8422a12d629444ee54afbe8c266ccba1286e5b1b21366a97b4255ae8724148dcf58eefc3e966fdb382e11d467
diff --git a/x11-base/xorg-x11/metadata.xml b/x11-base/xorg-x11/metadata.xml
index 61b88b3e701d..a0d9b5f6d24d 100644
--- a/x11-base/xorg-x11/metadata.xml
+++ b/x11-base/xorg-x11/metadata.xml
@@ -6,4 +6,7 @@
 	<name>X11</name>
 </maintainer>
 <longdescription>X11 implementation by X.Org Foundation</longdescription>
+<use>
+	<flag name="fonts">Install fonts from X.Org</flag>
+</use>
 </pkgmetadata>
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild
deleted file mode 100644
index c10948f48d8d..000000000000
--- a/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)"
-HOMEPAGE="https://www.x.org/wiki/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-# Server
-RDEPEND="${RDEPEND}
-	x11-base/xorg-server[-minimal]"
-
-# Applications
-RDEPEND="${RDEPEND}
-	x11-apps/appres
-	x11-apps/bitmap
-	x11-apps/iceauth
-	x11-apps/luit
-	x11-apps/mkfontdir
-	x11-apps/mkfontscale
-	x11-apps/sessreg
-	x11-apps/setxkbmap
-	x11-apps/smproxy
-	x11-apps/x11perf
-	x11-apps/xauth
-	x11-apps/xbacklight
-	x11-apps/xcmsdb
-	x11-apps/xcursorgen
-	x11-apps/xdpyinfo
-	x11-apps/xdriinfo
-	x11-apps/xev
-	x11-apps/xf86dga
-	x11-apps/xgamma
-	x11-apps/xhost
-	x11-apps/xinput
-	x11-apps/xkbcomp
-	x11-apps/xkbevd
-	x11-apps/xkbutils
-	x11-apps/xkill
-	x11-apps/xlsatoms
-	x11-apps/xlsclients
-	x11-apps/xmodmap
-	x11-apps/xpr
-	x11-apps/xprop
-	x11-apps/xrandr
-	x11-apps/xrdb
-	x11-apps/xrefresh
-	x11-apps/xset
-	x11-apps/xsetroot
-	x11-apps/xvinfo
-	x11-apps/xwd
-	x11-apps/xwininfo
-	x11-apps/xwud
-	"
-
-# Data
-RDEPEND="${RDEPEND}
-	x11-misc/xbitmaps
-	x11-themes/xcursor-themes
-	"
-
-# Utilities
-RDEPEND="${RDEPEND}
-	x11-misc/makedepend
-	x11-misc/util-macros
-	"
-
-# Fonts
-RDEPEND="${RDEPEND}
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-adobe-utopia-100dpi
-	media-fonts/font-adobe-utopia-75dpi
-	media-fonts/font-adobe-utopia-type1
-	media-fonts/font-alias
-	media-fonts/font-arabic-misc
-	media-fonts/font-bh-100dpi
-	media-fonts/font-bh-75dpi
-	media-fonts/font-bh-lucidatypewriter-100dpi
-	media-fonts/font-bh-lucidatypewriter-75dpi
-	media-fonts/font-bh-ttf
-	media-fonts/font-bh-type1
-	media-fonts/font-bitstream-100dpi
-	media-fonts/font-bitstream-75dpi
-	media-fonts/font-bitstream-speedo
-	media-fonts/font-bitstream-type1
-	media-fonts/font-cronyx-cyrillic
-	media-fonts/font-cursor-misc
-	media-fonts/font-daewoo-misc
-	media-fonts/font-dec-misc
-	media-fonts/font-ibm-type1
-	media-fonts/font-isas-misc
-	media-fonts/font-jis-misc
-	media-fonts/font-micro-misc
-	media-fonts/font-misc-cyrillic
-	media-fonts/font-misc-ethiopic
-	media-fonts/font-misc-meltho
-	media-fonts/font-misc-misc
-	media-fonts/font-mutt-misc
-	media-fonts/font-schumacher-misc
-	media-fonts/font-screen-cyrillic
-	media-fonts/font-sony-misc
-	media-fonts/font-sun-misc
-	media-fonts/font-util
-	media-fonts/font-winitzki-cyrillic
-	media-fonts/font-xfree86-type1
-
-	media-fonts/font-alias
-	media-fonts/font-util
-	media-fonts/encodings
-	"
-
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	# Save xorg.conf because of bug #278268
-	if [[ -f "${ROOT}etc/X11/xorg.conf" ]]; then
-		cp "${ROOT}etc/X11/xorg.conf" "${T}"
-	fi
-}
-
-pkg_postinst() {
-	# Restore saved xorg.conf
-	if [[ -f "${T}/xorg.conf" ]]; then
-		cp "${T}/xorg.conf" "${ROOT}etc/X11/xorg.conf"
-	fi
-
-	elog
-	elog "Please note that the xcursors are in ${ROOT}usr/share/cursors/${PN}."
-	elog "Any custom cursor sets should be placed in that directory."
-	elog
-	elog "If you wish to set system-wide default cursors, please create"
-	elog "${ROOT}usr/local/share/cursors/${PN}/default/index.theme"
-	elog "with content: \"Inherits=theme_name\" so that future"
-	elog "emerges will not overwrite those settings."
-	elog
-	elog "Listening on TCP is disabled by default with startx."
-	elog "To enable it, edit ${ROOT}usr/bin/startx."
-	elog
-
-	# (#76985)
-	elog "Visit https://wiki.gentoo.org/wiki/Category:X.Org"
-	elog "for more information on configuring X."
-	elog
-}
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
new file mode 100644
index 000000000000..bc46011fc15a
--- /dev/null
+++ b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)"
+HOMEPAGE="https://www.x.org/wiki/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+fonts"
+
+# Server
+RDEPEND="${RDEPEND}
+	x11-base/xorg-server[-minimal]"
+
+# Applications
+RDEPEND="${RDEPEND}
+	x11-apps/appres
+	x11-apps/bitmap
+	x11-apps/iceauth
+	x11-apps/luit
+	x11-apps/mkfontdir
+	x11-apps/mkfontscale
+	x11-apps/sessreg
+	x11-apps/setxkbmap
+	x11-apps/smproxy
+	x11-apps/x11perf
+	x11-apps/xauth
+	|| ( x11-apps/xbacklight sys-power/acpilight )
+	x11-apps/xcmsdb
+	x11-apps/xcursorgen
+	x11-apps/xdpyinfo
+	x11-apps/xdriinfo
+	x11-apps/xev
+	x11-apps/xf86dga
+	x11-apps/xgamma
+	x11-apps/xhost
+	x11-apps/xinput
+	x11-apps/xkbcomp
+	x11-apps/xkbevd
+	x11-apps/xkbutils
+	x11-apps/xkill
+	x11-apps/xlsatoms
+	x11-apps/xlsclients
+	x11-apps/xmodmap
+	x11-apps/xpr
+	x11-apps/xprop
+	x11-apps/xrandr
+	x11-apps/xrdb
+	x11-apps/xrefresh
+	x11-apps/xset
+	x11-apps/xsetroot
+	x11-apps/xvinfo
+	x11-apps/xwd
+	x11-apps/xwininfo
+	x11-apps/xwud
+	"
+
+# Data
+RDEPEND="${RDEPEND}
+	x11-misc/xbitmaps
+	x11-themes/xcursor-themes
+	"
+
+# Utilities
+RDEPEND="${RDEPEND}
+	x11-misc/makedepend
+	x11-misc/util-macros
+	"
+
+# Fonts
+RDEPEND="${RDEPEND}
+	fonts? (
+		media-fonts/font-adobe-100dpi
+		media-fonts/font-adobe-75dpi
+		media-fonts/font-adobe-utopia-100dpi
+		media-fonts/font-adobe-utopia-75dpi
+		media-fonts/font-adobe-utopia-type1
+		media-fonts/font-alias
+		media-fonts/font-arabic-misc
+		media-fonts/font-bh-100dpi
+		media-fonts/font-bh-75dpi
+		media-fonts/font-bh-lucidatypewriter-100dpi
+		media-fonts/font-bh-lucidatypewriter-75dpi
+		media-fonts/font-bh-ttf
+		media-fonts/font-bh-type1
+		media-fonts/font-bitstream-100dpi
+		media-fonts/font-bitstream-75dpi
+		media-fonts/font-bitstream-speedo
+		media-fonts/font-bitstream-type1
+		media-fonts/font-cronyx-cyrillic
+		media-fonts/font-cursor-misc
+		media-fonts/font-daewoo-misc
+		media-fonts/font-dec-misc
+		media-fonts/font-ibm-type1
+		media-fonts/font-isas-misc
+		media-fonts/font-jis-misc
+		media-fonts/font-micro-misc
+		media-fonts/font-misc-cyrillic
+		media-fonts/font-misc-ethiopic
+		media-fonts/font-misc-meltho
+		media-fonts/font-misc-misc
+		media-fonts/font-mutt-misc
+		media-fonts/font-schumacher-misc
+		media-fonts/font-screen-cyrillic
+		media-fonts/font-sony-misc
+		media-fonts/font-sun-misc
+		media-fonts/font-util
+		media-fonts/font-winitzki-cyrillic
+		media-fonts/font-xfree86-type1
+
+		media-fonts/font-alias
+		media-fonts/font-util
+		media-fonts/encodings
+	)
+	"
+
+DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+	elog
+	elog "Please note that the xcursors are in ${EROOT%/}/usr/share/cursors/${PN}."
+	elog "Any custom cursor sets should be placed in that directory."
+	elog
+	elog "If you wish to set system-wide default cursors, please create"
+	elog "${EROOT%/}/usr/local/share/cursors/${PN}/default/index.theme"
+	elog "with content: \"Inherits=theme_name\" so that future"
+	elog "emerges will not overwrite those settings."
+	elog
+	elog "Listening on TCP is disabled by default with startx."
+	elog "To enable it, edit ${EROOT%/}/usr/bin/startx."
+	elog
+
+	elog "Visit https://wiki.gentoo.org/wiki/Category:X.Org"
+	elog "for more information on configuring X."
+	elog
+}
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 0bb05eac672c..3532d3f675a7 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-video-vesa/Manifest b/x11-drivers/xf86-video-vesa/Manifest
index bb3492d53b23..1bc1a5dca22b 100644
--- a/x11-drivers/xf86-video-vesa/Manifest
+++ b/x11-drivers/xf86-video-vesa/Manifest
@@ -1,7 +1,7 @@
 DIST xf86-video-vesa-2.3.3.tar.bz2 300571 BLAKE2B 9c7b5ef966234de7ca792925c2d88766df5c75bc0085dc1aad9fe11845e37f7a2214b028f546c88283579a54d476766d57e4acb4942c5a578159c65199a2bf68 SHA512 1e3768e757e889bb8707ce76cc6f54eb3beaf7d5b34750a0e7262612ae300e4cd42985b7cbcd72462b14c8d73945a22cec70ca6a52017491de41715d2ecbaca8
 DIST xf86-video-vesa-2.3.4.tar.bz2 285675 BLAKE2B 88c66b5bc3fbeb74867711e0bbda91f9f693d16a5080790c4e93ed203784ab730563053a2822e92fd2287e1fa59014f7a0a1e1c497e750a2e9c3ef84537f0bde SHA512 5a01c295a03f367281f49bb186a003a91da3aa4cff7c37ef3fb83889b595f641745899c62e4c0954a1daf4b18bd0e1bcbbe1b87d2863d1ce71feffa1744e892d
 DIST xf86-video-vesa-2.4.0.tar.bz2 324599 BLAKE2B ddaa7a54d439b1afb1152e15e0d436cade79c51a61e78837a066e3e0c04d4a2ea6b079e68eca917e618aae125ed4eab7734009a337018460e771265b8daef443 SHA512 4af5c0a7fd64eba503980198cf510688dff2f33482ceac446455d97255dcc828613387ac57828eb6dce080cb15a8644a2b2e278bf356705fdeaea873ab07c2de
-EBUILD xf86-video-vesa-2.3.3.ebuild 331 BLAKE2B 5860348609ee90ea33959765240eba938efe02a0057eb4e4299ac7951b6dda4b1b879a7842e2bbd74214522f8f568110c7166fcf9f73fd8fdc56c3aa11982834 SHA512 38e8d6be5dc009e1504c91ac877e29a4bdd337d948401663e60e770472f113c4e064868be5e0a89df65b7ce403cafe06662c5ff31cf22f07c5e79270253c5e78
-EBUILD xf86-video-vesa-2.3.4.ebuild 652 BLAKE2B b7d1c3e8d36e38522f36fadc38bf29755345f02f0371c868e41e5813831d012801c7e0b10365d317f23abd5144b4efff8fe57a4bf636f60c2905a3feb59baebb SHA512 3d7f0956cf277b45cc04c534e1952a01682abde2be922d0f1421207691980baf35e58ea6d5f869595b6ff7d7ab22097eadcb46765bb25f8c6a4a94af80f09cf5
-EBUILD xf86-video-vesa-2.4.0.ebuild 653 BLAKE2B 1172fb189dea32969b53cbdf268f0e94659bdad83ed15e110d248a8e1093992347ea15b34a50e088f2fc877b27d5d6df2e78ca65b738f6edc2d64480c75d4286 SHA512 6c69b2fa2f437f85e73a73d8287f7d99c2f7f73a4aaffbdf08a07fd91504c45cf4864bfb5b72b26eb722c312bdb531e08ff60fb3bfe22df740b59c8ce1fdf223
+EBUILD xf86-video-vesa-2.3.3.ebuild 326 BLAKE2B 0f1b0f35a01eef60922432b3dfe723372c51ce478cd67e82d2373b4b5c53d8a9ed0b705b418251109d3f69ba5eed84cb28ba4cd0f7ed93c5050ab0cd79f22139 SHA512 d7edb3060adcea88e68fe1dcad3d35986fe57288e5dc6ca0110397e41cef213096bc52a6371ff406c609b17078b5fce5971f5476dc208f0fe37cd59b0d46d46b
+EBUILD xf86-video-vesa-2.3.4.ebuild 647 BLAKE2B 39caafa70e49bd44397195353517c53b3c6b02a043aaeab8eaae64b89ae2575641d0c7234787ef0a75649a9ac2d039767f2f92c4e8039d3fa17c0fa1ef3b10df SHA512 36a8891367a25a64f13be9b46c500a735e5cecbffadf65ea96e8bb08603c8e2dee8a2bdfa687fad1132564f21b97513251abec173b13d1937dbbc4e6d22bfee3
+EBUILD xf86-video-vesa-2.4.0.ebuild 647 BLAKE2B aa8ae1407f03c7fe44b691c9d5b903ad7ab53dfe8eab12162c8cd71205c587e4ac2efcd361acd77874a85b323f1a267ed6c64fb1da0e8c0ed4c2e41437fd3770 SHA512 b09127c633b34b0d4def87d37e3a1681ed3f1e3c24028f60e1af8178e23df2974d878320287771bdcf39674c8409e4809148428da0e931f12d52b186a92b981c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.3.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.3.ebuild
index f8b4ca62a111..0d534cc2582d 100644
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.3.ebuild
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* alpha amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.4.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.4.ebuild
index 36222ce9cd7e..c0e1de044ce7 100644
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.4.ebuild
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.4.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit linux-info xorg-2
 
 DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* alpha amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild
index cdeac87113f2..540931da416c 100644
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit linux-info xorg-2
 
 DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* alpha amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* alpha amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 89016302244d..382f9b195c3d 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -3,10 +3,8 @@ AUX xf86-video-virtualbox-5-localconfig 996 BLAKE2B 67ce33deaa4073b4d522ec586567
 AUX xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch 1248 BLAKE2B 449981786700fd7c01d1d7346489553afc6959912c882aba750cb062009f773955efb247dc0bfeb4dca298da09393e0cd749c592a580e7509db10a7bea7a3dce SHA512 793a7f937eddf955ae7a2ca48d41675c8a6ec8c34e9f76d3edc8618562c2d0333714d9de7ae5927e16df7bc750e0309a3dd4173f3f9e262aa5c0d80190c98302
 AUX xf86-video-virtualbox-5.1.10-xorg119.patch 3375 BLAKE2B 52b6999cffb8b60ceac7949af1d3bb8452e138a9d6f8d84ac6587a121e1a379f9e69a0b9896c83e63c7ebfec26abe2b46e957a25385d04cc8613aec407483906 SHA512 f84cdbb6b43444eda753f6a31b3fe2514152545a7d75569d88f3b2d22542e5d087dfbd735457155f1463449f4e2138382d6f730978bd8d80280ad609dc826718
 AUX xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch 533 BLAKE2B 3ef40088fb83096c17944609d4fb7c14b7e7bb39ef0bf08d3bcda2795d4ead8801f06e7761804191ca4eec537bc22f45dcd6085407b1e6ef3ed4227a1fd594b0 SHA512 325a7adca76884e40be17d756ebdee3c8e8565d50a872c7cb2e429d046fd91b44acc6b788abb0eb28ab14594687203894ffe0c2d441c38ea5f87a88e76e87997
-DIST VirtualBox-5.1.32.tar.bz2 117268301 BLAKE2B 336df054e3407d7e701d6719258cfcba9beec1439cbe94f137570cfcbdea02df3e34374ac36d3b4387c47ebafd17a0f05c2fb710eb4f140d8200117b505aba98 SHA512 052ac1672515a36c4138e2d52672a466d4c768f219f52eefe98e747a292ebebe04e7de35547eae6803654be5dc937b8e6f4d358a65fd4f49a8333eac8862d138
-DIST VirtualBox-5.1.34.tar.bz2 117291269 BLAKE2B 0eb9b3f778f2d677ac3635fa59dfa6861d0fec3c0331582e5961b78ab55b5ab26bbf286de05a3e87e8a64e2b54861613a8d2c93f70736a07c551dca834786abd SHA512 0f828e58d68678a0a94a39c12313425105f9255ca207d40dd04065d0072857cdc4fc886f944b852c3fb63fed04d70a3449aecd2aab9e27af7f13b506143a4b6f
 DIST VirtualBox-5.1.36.tar.bz2 117244376 BLAKE2B 141048f4fcbb3ce63d236a4127b4bce377e87876c23dc3ff6437b2c0cca5b468bc6a5737899b308bc1ff3252d4e61f7d053ff7574c33c85b56fdd986c31f2af3 SHA512 d1a9322c97c68cc9c21247c3df8ce2084911aded66a63adf5510f9e0f4558b1304dfe924a0c44243adc1ae8f7c45c47782e882baac1bfe995ea6c0a1370fcbd1
-EBUILD xf86-video-virtualbox-5.1.32.ebuild 5048 BLAKE2B e6214b4d223bd87556921fe320b1603de3cd80256254f9db6e8a60a3773b0212b68e5a5a25fe655fadc32e42b906a0f830e12c64c6a43978bee06e14a7b965f6 SHA512 4ed0f341ca74f86b7a41714d3ffeb7e6871a8362f83fe0a5fa6cb27c827fe88a2fa416d74a155fd05f92e10b79d9f8a0cbd7476e0fcaf7cb87a7b5de3d1813e3
-EBUILD xf86-video-virtualbox-5.1.34.ebuild 5050 BLAKE2B 6c3eb6c9b9004e66b338241fc7155e49765353a9989463e08d5fcbc44a9ea5e8b56f29d52e65681cb0421382d198bdb0eda0cab72350dfc390c49eb18135e29f SHA512 5744ff815d05aa550092d7f877f60a3de571bde0ca4d17433a92b2925d524166768542dc126c60116a7726d0fd69f9d10e57d56f42e57f63ef431af2a6cc7406
-EBUILD xf86-video-virtualbox-5.1.36.ebuild 5049 BLAKE2B a77d7fab0640a5faf895b7d43224b9f494d1de3fb0febc41e3d9c10466cc266e8585a60e02058353578199529c63f915ec9a7f7185932bd8f53cd8e2fabe17ac SHA512 270c3e639f85f0c6a08227228816df51bc80aa32ca42c2b58203bcc7909b81f003881cad90b82f389e687589f78b16acf4d878695265f613f0943178561aa5b7
+DIST VirtualBox-5.1.38.tar.bz2 117345233 BLAKE2B 15ed86a1f6730c781a0b4b055dcccfb56ff9c829c90dc4d2aa96cc2bb5bcfa8e442bdd471a7c70c5520bef994592e8f1a5b46831df4039efb5358c2e0ab83413 SHA512 6cf8536c24aa3a6e889214ef6133eb18fdbe1e7c371323cad07aa63b0e1f4414ba13d5fa7b63c12dfefe60e2e544488ced107571f678a06eb094a3e19b377ea8
+EBUILD xf86-video-virtualbox-5.1.36.ebuild 5048 BLAKE2B e6214b4d223bd87556921fe320b1603de3cd80256254f9db6e8a60a3773b0212b68e5a5a25fe655fadc32e42b906a0f830e12c64c6a43978bee06e14a7b965f6 SHA512 4ed0f341ca74f86b7a41714d3ffeb7e6871a8362f83fe0a5fa6cb27c827fe88a2fa416d74a155fd05f92e10b79d9f8a0cbd7476e0fcaf7cb87a7b5de3d1813e3
+EBUILD xf86-video-virtualbox-5.1.38.ebuild 5050 BLAKE2B 6c3eb6c9b9004e66b338241fc7155e49765353a9989463e08d5fcbc44a9ea5e8b56f29d52e65681cb0421382d198bdb0eda0cab72350dfc390c49eb18135e29f SHA512 5744ff815d05aa550092d7f877f60a3de571bde0ca4d17433a92b2925d524166768542dc126c60116a7726d0fd69f9d10e57d56f42e57f63ef431af2a6cc7406
 MISC metadata.xml 343 BLAKE2B 9e18764cb3f6a1df7858366112557de847f14dd2d7415612da0ebe28895a92a7714d0295f3551ddc62711bf84d5be253ddda3146f6121d52c4f86c05a20ad835 SHA512 88eabdec952f2eee2490f23050b39127f500765f6f93adecb9cfdb62776d73e9dddcdb56756b41041ed4727375ffb0e5f729c219a7de5620344bbee10bbc06c9
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.32.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.32.ebuild
deleted file mode 100644
index 451c6f821b90..000000000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.32.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-single-r1 versionator toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox X11 video driver for Gentoo guest"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dri"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=x11-base/xorg-server-1.7:=[-minimal]
-	x11-libs/libXcomposite
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	>=dev-lang/yasm-0.6.2
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	sys-power/iasl
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/resourceproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXext
-	dri? (  x11-proto/xf86driproto
-		>=x11-libs/libdrm-2.4.5 )"
-PDEPEND="dri? ( ~app-emulation/virtualbox-guest-additions-${PV} )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-S="${WORKDIR}/${MY_P}"
-MODULES_SRC_DIR="${S}/src/VBox/Additions/linux/drm"
-
-PATCHES=(
-	# Ugly hack to build the opengl part of the video driver
-	"${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
-	# unset useless/problematic checks in configure
-	"${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
-
-	# xorg-1.19 patch from opensuse (bug #602784)
-	"${FILESDIR}/${PN}-5.1.10-xorg119.patch"
-)
-
-QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
-
-pkg_setup() {
-	if [ "${MERGE_TYPE}" != "binary" ]; then
-		version_is_at_least 4.9 $(gcc-version) || die "Please set gcc 4.9 or higher as active in gcc-config to build ${PN}"
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prepare the vboxvideo_drm Makefiles and build dir
-	eapply "${FILESDIR}"/${PN}-5.1.24-Makefile.module.kms.patch
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	default
-
-	# link with lazy on hardened #394757
-	sed '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' \
-		-i Config.kmk || die
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	local each targets=(
-		Runtime
-		Additions/common/VBoxGuestLib
-		GuestHost/OpenGL
-		Additions/x11/x11stubs
-		Additions/common/crOpenGL
-		Additions/x11/vboxvideo
-	)
-
-	# need to use the upstream build system to create necessary objects properly
-	use dri && targets+=( Additions/linux/drm )
-
-	for each in ${targets[@]} ; do
-		pushd "${S}"/src/VBox/${each} &>/dev/null || die
-		MAKE="kmk" \
-		emake TOOL_YASM_AS=yasm \
-		VBOX_USE_SYSTEM_XORG_HEADERS=1 \
-		KBUILD_PATH="${S}/kBuild" \
-		KBUILD_VERBOSE=2
-		popd &>/dev/null || die
-	done
-
-	if use dri; then
-		local objdir="out/linux.${ARCH}/release/obj/vboxvideo_drm"
-		# We need a Makefile, so use Makefile.module.kms
-		ln -s Makefile.module.kms "${MODULES_SRC_DIR}"/Makefile || die
-		# All of these are expected to be in $(KBUILD_EXTMOD)/ so symlink them into place
-		targets=(
-			include
-			src/VBox/Runtime/r0drv
-			src/VBox/Installer/linux/Makefile.include.{head,foot}er
-			out/linux.${ARCH}/release/{product,version,revision}-generated.h
-		)
-		for each in ${targets[@]} ; do
-			ln -s "${S}"/${each} \
-				"${MODULES_SRC_DIR}"/${each##*/} || die
-		done
-		# see the vboxvideo_drm_SOURCES list in Makefile.kmk for the below,
-		# and replace '..' with 'dt'
-		targets=(
-			dt/dt/common/VBoxVideo/HGSMIBase.o
-			dt/dt/common/VBoxVideo/Modesetting.o
-			dt/dt/common/VBoxVideo/VBVABase.o
-			dt/dt/dt/GuestHost/HGSMI/HGSMICommon.o
-			dt/dt/dt/GuestHost/HGSMI/HGSMIMemAlloc.o
-			dt/dt/dt/Runtime/common/alloc/heapoffset.o
-		)
-		for each in ${targets[@]} ; do
-			ln -s "${S}"/${objdir}/${each} \
-				"${MODULES_SRC_DIR}" || die
-			ln -s "${S}"/${objdir}/${each}.dep \
-				"${MODULES_SRC_DIR}" || die
-		done
-	fi
-}
-
-src_install() {
-	cd "${S}/out/linux.${ARCH}/release/bin/additions" || die
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	newins vboxvideo_drv_system.so vboxvideo_drv.so
-
-	# Guest OpenGL driver
-	insinto /usr/$(get_libdir)
-	doins -r VBoxOGL*
-
-	if use dri ; then
-		dosym /usr/$(get_libdir)/VBoxOGL.so \
-			/usr/$(get_libdir)/dri/vboxvideo_dri.so
-	fi
-}
-
-pkg_postinst() {
-	elog "You need to edit the file /etc/X11/xorg.conf and set:"
-	elog ""
-	elog "  Driver  \"vboxvideo\""
-	elog ""
-	elog "in the Graphics device section (Section \"Device\")"
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild
index ded923b23ee4..451c6f821b90 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="dri"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.34.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.38.ebuild
index 932d9378fad9..932d9378fad9 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.34.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.38.ebuild
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 7ef1e20e3000..6a1fd66977cf 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 1f2e05ed78b5..3d4b1d2989b8 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,5 +1,5 @@
 DIST goffice-0.10.38.tar.xz 2373308 BLAKE2B f270233adbbf300ad41516b1ed988db0772b95940196a6ac92c3090f6e52bc47933bb6bb4c023d7137cbca42adfab17fc41b82042c2e9c0340a6cd84942874e5 SHA512 1d72e30ee0b9f322cd4114d0a024a99e6d9ff7efcaeb9ca40b5fffe94180c232f03935743c15b1c6170f8bfc04fea5bdcc4d12760643c66cffafefbaa562fd62
-DIST goffice-0.10.40.tar.xz 2381416 BLAKE2B 24d1905e41e1eb57be53f8f7598776457a17707412e79f2e314e9d1bdbea97a406b1ec27ee628f7d50e22305cd41d900a588520d2995f8be61021ae9b7de60d7 SHA512 1756ab825afe0d4a6249c351b2713b5397827bf289d1c2af5a6a6ccc21797ff01d8b69c72d83c9d8b941d5c73ad03bbf63bd98e475828787d8bbf8d18ffd0ede
+DIST goffice-0.10.41.tar.xz 2381656 BLAKE2B 7d73b892d91f917e3a47058f508094a16bb50860686dcf33c68ac8028b40e7ba74cc276f276672f29ddafef73b03887cf6280a2812305bd9b24ae3021c319d25 SHA512 d4b6a30b2b5d92e7500a1810626d20a2d4e5f66c1a879c904fe57df384bf4a480de322e9ae0a5fe7a44e73e060d9a33da6d56cd051c3d6cb1ebf0eae09fda2f8
 EBUILD goffice-0.10.38.ebuild 1236 BLAKE2B c76bcf2963ca520fe37ad8b6ba768f3783cde1f764dc8ed6992dae2ba179607a45da2f67ec856980924a62cb7e52c03c5d99da530b3aaf393e6ab55310522ff0 SHA512 7746c69bd8dbb68e207592897711e445f45cc6995452d6b128db24532ec21004fcdd95863561899d78278dc951338d0c6774760eb065249112342ae3ffa95b81
-EBUILD goffice-0.10.40.ebuild 1238 BLAKE2B 3434874fabc86dcaa1b79cbad84b36bc05a75e8d94712c6371ebc19ade6cabfa5523d43eba61e8111d44ec74969d5304aeb1796cdcd7be86f95b941db3bbe856 SHA512 8b212594e4f47b06fb46d086f702acdb89d2968688ebb0865e8e59d5a9d1d2dead48e6e5d6cc037bde5f073f69f858709abc218363a65f4f0068deacd2731def
+EBUILD goffice-0.10.41.ebuild 1238 BLAKE2B 3434874fabc86dcaa1b79cbad84b36bc05a75e8d94712c6371ebc19ade6cabfa5523d43eba61e8111d44ec74969d5304aeb1796cdcd7be86f95b941db3bbe856 SHA512 8b212594e4f47b06fb46d086f702acdb89d2968688ebb0865e8e59d5a9d1d2dead48e6e5d6cc037bde5f073f69f858709abc218363a65f4f0068deacd2731def
 MISC metadata.xml 441 BLAKE2B d1239d813165b887ed43610e0b9a09afd739164ecf52a0b6a94e957550b5dec5e18dbf5777e4b7bf8e1d665edf89bc5777ad90ebd93caeab5af6fc2882eb3469 SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce
diff --git a/x11-libs/goffice/goffice-0.10.40.ebuild b/x11-libs/goffice/goffice-0.10.41.ebuild
index 9bf3bf394d80..9bf3bf394d80 100644
--- a/x11-libs/goffice/goffice-0.10.40.ebuild
+++ b/x11-libs/goffice/goffice-0.10.41.ebuild
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index f75e0a132312..2fddc162af5f 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,12 +1,8 @@
-DIST libdrm-2.4.82.tar.bz2 754053 BLAKE2B 83d0a7203826c093bfb6b3ce4836f3ec6182a75f08f4cecb142e5707eb525cfbba9a123a94235b09370ac53cb7beb443604cb7dfba4cf375e0d0a74f71ce8bb4 SHA512 e69fd8c2b392daabbb3a548179e3a21a555d5174c11d76a288eb2a08850849aa867c7777b67798ec00e026e998a3b128c22698f05a7b44eb24cddc5c8a3a02d0
-DIST libdrm-2.4.88.tar.bz2 796583 BLAKE2B 4130633fea39e12514e6c6e7a926ca7ccca618ecb15a67cd27ee577a4ad56ecf6d09e20a323546a2b9698d7e41bd28377e7e04e8f478a3ca957868e1ac51cf98 SHA512 0d9d4bcc0d9be1fb6b1ca075339b22b0f927288a4c02bbcbf95406b5c095051890f3d2e0d32e529ef9b6952ce1250afd1e0765ad3188c2bac924dda8c33afabb
 DIST libdrm-2.4.89.tar.bz2 792940 BLAKE2B 86c8227a06060e827f39da9f1debae54784e38e34becfb3ace1329f68b0fa4cfb90532606cd3618987af2cb48b53f0277e4032055eccc164f7e6b910d3c055e0 SHA512 380e4e46cd3971a73264bd1b482791fab0503268adb65ac81b674df009662cfb8ef5741e362f19670b2a43b1c46f022d857706c9a4bebed2b1cddaa317b7706d
-DIST libdrm-2.4.90.tar.bz2 822164 BLAKE2B 043428cea0f74b69577f79b3b9422546821945bb1120390d22b01a9e2a6460014eeb3902ee84241da8ba2c7683e76eb81d117a4f312ef3b8eb69647773d09710 SHA512 3d32d60c44ffdcb58667d0926e6af8d375332add1f243d8b2d37567aeef4e4b26d786294aeecf46c3dea94fc002fb73756567c457300703acfc21e32ffbd458c
 DIST libdrm-2.4.91.tar.bz2 815419 BLAKE2B 7df2a4bdb4b2708cc00b71173e7e261ab7f8645a473984a7cbda2c7073f14b7f87d53eb39cc075b743e72e4cda03b2c4fca6b9df6c7d5db2c739398a13f13f35 SHA512 07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772
-EBUILD libdrm-2.4.82.ebuild 1968 BLAKE2B 13f465860e3637b6df37a633e2076336f59ae33caa00a4b1200967ea9874b750706c2341abb5262d7a999d2fb49741c947db4032e200129217be034f110ba63e SHA512 bccc1090ea3c01865b4f39d9a8b83ca00436f7501468c12ed3204fdade362f18cc6a23e0e439b80799d7c189e2f1e367c2cfe22f8a52cdb523c64f18f5dc7164
-EBUILD libdrm-2.4.88.ebuild 1969 BLAKE2B a1c0294d7787b2fcd84a163324fe74a1ffb71f6cd950963c03a5af5dd268a0d761c43d1f4436f7df2b5e6f082d42f80611a1fcbeaecf62b83aff496c1f5eaaaf SHA512 5f6d166c1340c0404d921171ceffb7118fbe12fd726d389a00a790cd4b9d5ff2b9768eb9345a787df0e6445db661b47cf9cac87193466858bcbf04573c3ba1cc
+DIST libdrm-2.4.92.tar.bz2 821789 BLAKE2B 6cb2b98e43eae6a04c333693c20710e6693d218cce3ac255d935093a83e318fe5aeae3ea0a56e6ccfb615a4f917f83cdcc11bcb5fa8bc3f41c2b57a046919dcb SHA512 9b75584d8957d298125884d490b74c0a641725d17088ba47f3dc2ec9d06519d8387eb464c024ee11712b31b17fb84e1a9a52bd4ebc7c316beb7d2f8711dc9eb2
 EBUILD libdrm-2.4.89.ebuild 1969 BLAKE2B 5b8a863b9dde55ce11e28d3830e50e88623b7789094e46e828ce06e7d056516abba2f5d48365b03cbb816fd12426e0c0e974e97c5d37455ce58dc29bb2cb4105 SHA512 437fbd5cd1c7d550891d36034722a80d27a0af030b050d4dcf614f21fc0043a526b036fec1784d8b11330cca995d688af16d9e2fc03fc5e790eda9c0e2110f67
-EBUILD libdrm-2.4.90.ebuild 1978 BLAKE2B a554b2c5762f512145d792d87c172e05a9aa51cce878d5568a33bd6ebed014fc30f173cdb860bfd55d5090cd0339082b1b67000bc1d0c7851859fbdcfec1816c SHA512 502fe8a211d3cb64d7eab03c28454bf79109b1f11ece181d65fc81b84f9a7c29c38ac3a8a394d887530d1d2aca7a434e052400942734b66c4458566bca650283
 EBUILD libdrm-2.4.91.ebuild 2151 BLAKE2B b11486de240babc420ace91a42c6d787d192865dd5b003fe6e91cb3972b6e9c941cd4a14a95999b41e070e96a8910fb674b99e74d667c86bf34b29d3adc47ae1 SHA512 51f1b85a128b15a5ee7b595b60db96bfddfecb7a4af207a134ac39ff35e456e0d3a99b9dd5bedc29ba955c0f232402bd018429425141df3587edd475de900d08
+EBUILD libdrm-2.4.92.ebuild 2158 BLAKE2B 8a1f197800e9e1dae5e3d35848d831a44f965db88b47503bb3496c6c40220bbf9667eea374186758e0651a9cd13cac3cd2b4cda1b934243600e601892d2f1165 SHA512 c6d8e39f09bed1d15bb40540ecb6c4c93e66a2d086281bce790fd67791044d76528843859c7d85d00df0eda7d53690c190bd753e7620bb8e14069c491f632f6d
 EBUILD libdrm-9999.ebuild 2158 BLAKE2B 8a1f197800e9e1dae5e3d35848d831a44f965db88b47503bb3496c6c40220bbf9667eea374186758e0651a9cd13cac3cd2b4cda1b934243600e601892d2f1165 SHA512 c6d8e39f09bed1d15bb40540ecb6c4c93e66a2d086281bce790fd67791044d76528843859c7d85d00df0eda7d53690c190bd753e7620bb8e14069c491f632f6d
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.82.ebuild b/x11-libs/libdrm/libdrm-2.4.82.ebuild
deleted file mode 100644
index 00588bdc7a77..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.82.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
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-fi
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
-	epatch_user
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		# Udev is only used by tests now.
-		--disable-udev
-		--disable-cairo-tests
-		$(use_enable video_cards_amdgpu amdgpu)
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_freedreno freedreno)
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_tegra tegra-experimental-api)
-		$(use_enable video_cards_vc4 vc4)
-		$(use_enable video_cards_vivante etnaviv-experimental-api)
-		$(use_enable video_cards_vmware vmwgfx)
-		$(use_enable libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		--enable-valgrind=$(usex valgrind auto no)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.88.ebuild b/x11-libs/libdrm/libdrm-2.4.88.ebuild
deleted file mode 100644
index 47f126e4ab31..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.88.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
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-fi
-
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
-	epatch_user
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		# Udev is only used by tests now.
-		--disable-udev
-		--disable-cairo-tests
-		$(use_enable video_cards_amdgpu amdgpu)
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_freedreno freedreno)
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_tegra tegra-experimental-api)
-		$(use_enable video_cards_vc4 vc4)
-		$(use_enable video_cards_vivante etnaviv-experimental-api)
-		$(use_enable video_cards_vmware vmwgfx)
-		$(use_enable libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		--enable-valgrind=$(usex valgrind auto no)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.90.ebuild b/x11-libs/libdrm/libdrm-2.4.90.ebuild
deleted file mode 100644
index 7548eee91644..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.90.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
-	epatch_user
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		# Udev is only used by tests now.
-		--disable-udev
-		--disable-cairo-tests
-		$(use_enable video_cards_amdgpu amdgpu)
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_freedreno freedreno)
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_tegra tegra-experimental-api)
-		$(use_enable video_cards_vc4 vc4)
-		$(use_enable video_cards_vivante etnaviv-experimental-api)
-		$(use_enable video_cards_vmware vmwgfx)
-		$(use_enable libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		--enable-valgrind=$(usex valgrind auto no)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.92.ebuild b/x11-libs/libdrm/libdrm-2.4.92.ebuild
new file mode 100644
index 000000000000..13349314bbf6
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.92.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson multilib-minimal
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-util/meson-0.43.0
+	valgrind? ( dev-util/valgrind )"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Udev is only used by tests now.
+		-Dudev=false
+		-Dcairo-tests=false
+		-Damdgpu=$(usex video_cards_amdgpu true false)
+		-Dexynos=$(usex video_cards_exynos true false)
+		-Dfreedreno=$(usex video_cards_freedreno true false)
+		-Dintel=$(usex video_cards_intel true false)
+		-Dnouveau=$(usex video_cards_nouveau true false)
+		-Domap=$(usex video_cards_omap true false)
+		-Dradeon=$(usex video_cards_radeon true false)
+		-Dtegra=$(usex video_cards_tegra true false)
+		-Dvc4=$(usex video_cards_vc4 true false)
+		-Detnaviv=$(usex video_cards_vivante true false)
+		-Dvmwgfx=$(usex video_cards_vmware true false)
+		-Dlibkms=$(usex libkms true false)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		-Dvalgrind=$(usex valgrind auto false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c6e1f6265167..f31d829eb4d5 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index d2981e7535d1..6d453e465c9e 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,4 +1,4 @@
 AUX i3blocks-default-sysconfdir.patch 373 BLAKE2B 4483b6c4e838559997acff86c46a879206decc0e834bd92cf8573eab28f5ce3ec74f186ce53fe3e2a69f8e7006265ce956f677470828f8b3e1bc40b5ab925abe SHA512 db974877a1eadb1b37279dd4e4159b47947958f688aed94dd3e3c49457a94a0e5d803f221dc7a160ed2cfdc915399892d010a1083a49a7ba7a53d49572c16554
 DIST i3blocks-1.4.tar.gz 35943 BLAKE2B 84c1d08d173238ecd875254015dc78cb560cefb1eb11d9628dc8572fb44f9724927e622aecc9888c43fdc435df8b07f6b07e22c4543354edb2d92cc8d5d00321 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578
-EBUILD i3blocks-1.4-r1.ebuild 765 BLAKE2B f78f6c9679177c67850967d807adf81492c6452b6fd33792b2c6e3254ec08d6a57e8447f7feabf88a56f9c0c4e56a702c59efe1ada2edb5250c7cf7145ff34b7 SHA512 20afea069ee5cfafaf46045af8352cfb5c19815df6b4ba13ec851dbd913fa185d32f02e8e6be9eb4c8f59d6d45cb162b3f92b9b034f5f8b12973284a2d2e12ed
+EBUILD i3blocks-1.4-r1.ebuild 765 BLAKE2B 02caadce1f62ed54ee08e5dec2e2d43dd0e0b6ef5d315b9802ab659314c6d997d39f0774f36f07ae61dd0eb45b898395dd5c47a5dc4a371181636025cfc526fa SHA512 f9ba4dbab272cfe526ebee27f9280d33a3bfc930ef1cdd63fed7d340d9aba3cc7c44e2d4b96e9bfc66faade5c37c8cf6dd1f3f1edb926990d9f22ba8cf16e020
 MISC metadata.xml 331 BLAKE2B 4e906b5d485968ff9cc55dca82cbd704cc57a5ecf77c230bb7fd6e2a910c236bc0afa1d457f4b90b758ca5ecba0b2505512fc21f7dd12179d2b275d425430a14 SHA512 2191950260e909fd05a03d80a1f9ccde802e4e3ab890a2e05305f2e3e1c48e4c56200fddc9019b630a9efeaeac92509910e1f9b22f1a2ce85a8d005930cd05af
diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
index e1e28279d73d..426e5ac2b8e4 100644
--- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ DESCRIPTION="highly flexible status line for the i3 window manager"
 HOMEPAGE="https://github.com/vivien/i3blocks"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/vivien/${PN}"
-	KEYWORDS="amd64 x86"
 else
 	SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 x86"
@@ -24,7 +23,7 @@ RDEPEND="app-admin/sysstat
 	media-sound/playerctl
 	sys-apps/lm_sensors
 	sys-power/acpi
-	x11-wm/i3"
+	|| ( x11-wm/i3 x11-wm/i3-gaps )"
 
 DEPEND="app-text/ronn"
 
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 5f6559b96392..ecc11dfa76d5 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,6 +1,6 @@
 DIST i3ipcpp-0.7.1.tar.gz 191417 BLAKE2B 62b76a0921c78f374309d26856c01d1467b8bd181ce922fd47daec406afda9d76eea9a1f473b4899e22f99e2ef36fc70f72db1bb17eb1f3e71a8431c2634b915 SHA512 ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
 DIST polybar-3.1.0.tar.gz 418298 BLAKE2B 1c7394a17ff1ec5b0dec519b7aa58e63cfcec0f104d4302051f6e12753b7074c3d85072a3d78e7ce135c53d4ddd4a6f68ea61ffb7b2ad04997bbf0c836115046 SHA512 6d8759d9f750c2abfa79fe735615b0ed3d1827e3a88561317712c6f02cb32a0a77726f97cb419f3a040ae9085a34a23cb1aad0aacf3f14e56c542977b89036b2
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
-EBUILD polybar-3.1.0.ebuild 1631 BLAKE2B b62ddadaf5523f707314aeb4ab579550cbbd3b0c6187e1d3f5577d9a47c48192c298be1645788dbafbb70e268d0f47cc22338671aeb704f8e71e774577b74fff SHA512 1dd20cb7739e24957d6a59ec53359b2440efcc1ceb74eec73e510b65104f1506dec2a4b005e878435c184902234f311a488825222447935727d2ce81a291a38e
-EBUILD polybar-9999.ebuild 1138 BLAKE2B 50a918fb6b09b958966e0e240b70802bc4859bc9506bd92ff188e02bd82d3e494f16f5993a6b896af1be6480ff716211a65547067a6931a7ea10274eb0716029 SHA512 91482dc564743240d37dae10143a62e6a5d6ae13659cf8f9390918df0f396e7bd2fcb85efcb8e19188844deba567e4df9df1b6e80ab3d7426fb4d39cfbcd9b16
+EBUILD polybar-3.1.0.ebuild 1686 BLAKE2B c33777ea01c09a1314300efc8b6c73407dec67548329c57b33c122c9d1520a5cd918c5598df8de444b1d1563ffabd1938f92088dc6647bf303428e231c99e700 SHA512 2b862b85a3504d23118805d11bdf09201f80fccfde7732f688e823b4be09b0efc33d818403af9bd30b568e2a1f76d72b51640bd3a047baed1c9947286e1221a8
+EBUILD polybar-9999.ebuild 1177 BLAKE2B edd1dcc60f26bd303199f5a9b5a3e631cafd14c959731f36d34b68cbc96f6e19469cadbea788f179682d79f6f635bf22b16923985a16742d8a56b92d705ddb56 SHA512 1fc3f570215ca8569c46c431d83fd5dbc35f12a6ac2dcc8802de2981c54d24b1c83e53a9c4fbcac18fb7b66c3051e7ff1ad7ba2b6261c9fd69858c2483536636
 MISC metadata.xml 696 BLAKE2B 2b2762500174e5b8674161433cc5c862158dc1db4e057b4e92d3c7433e8c286a80111dd311bba04631f71d2a58817ed2c745f024da1a39b5622fafc57525e346 SHA512 a3fbaea3fa687472a671c7b209bcabaf8a3fcab86b53aa357aa776cc3b57a565eae933b50a6238dc73d46659ddd893ad1dbe9f312d828d05c26cf0945818d322
diff --git a/x11-misc/polybar/polybar-3.1.0.ebuild b/x11-misc/polybar/polybar-3.1.0.ebuild
index a04e956a0e9e..f9be038f16c0 100644
--- a/x11-misc/polybar/polybar-3.1.0.ebuild
+++ b/x11-misc/polybar/polybar-3.1.0.ebuild
@@ -26,9 +26,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="
 	${PYTHON_DEPS}
 	x11-base/xcb-proto
+	x11-libs/cairo
 	x11-libs/libxcb
-	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
 	i3wm? ( dev-libs/jsoncpp )
@@ -39,7 +41,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	rmdir "${S}"/lib/xpp || die
 	mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild
index b21888340078..7a1abcf47ee7 100644
--- a/x11-misc/polybar/polybar-9999.ebuild
+++ b/x11-misc/polybar/polybar-9999.ebuild
@@ -21,9 +21,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="
 	${PYTHON_DEPS}
 	x11-base/xcb-proto
+	x11-libs/cairo
 	x11-libs/libxcb
-	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
 	i3wm? ( dev-libs/jsoncpp )
diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest
index 8e89a260f752..42f180679589 100644
--- a/x11-misc/xbattbar/Manifest
+++ b/x11-misc/xbattbar/Manifest
@@ -1,8 +1,5 @@
-AUX xbattbar-1.4.3.patch 1206 BLAKE2B 1d014f0995d6f3ad7826e579c41948663e30d7ad78463dda180916dbf06d7eb6cf1268ef7c45df37eff67e6b89d9508a86a07a08b324efede4f9fe9bd447ba5a SHA512 e8adf912868b6fef383b9c09783c7a74c74e95446c3d4e37555b2b8cec1d7753ad6ba50de308c51f3a536dc19f616e1bf1363e98153d33e87988ba3fe3d2aa5a
 AUX xbattbar-1.4.5.patch 1427 BLAKE2B 06142c445fbce221b8ca871c2717790e1bbe6b56f50d3003e82eb024ad012fc2677cbc4cbebaac7284e3291a9e95754c19f773fc3cfc1dd3ad9ee8c15b4dd451 SHA512 190df4894fcb29f5b2b5387523429947b967e48fb710ad256f8ba31bf33d22e04b4325ba3d6b3228aee14257e241815a5b99c4284d1cedb6b4e977e47a9c54df
 AUX xbattbar-1.4.8-const.patch 303 BLAKE2B d33ff7f8bc273e1ef3e493e2411b4aff025a36316163b31df52299a77c6409023b069a7ef2d2f55a189e2848b8e73d37a54a8957c9f71fdc3e51b6a48a179bda SHA512 987116af9d8e50b6ef96924199e5d348a9910030adbe2b2a8de0425107eee93cfe04740b343542c97edc6ed846bcff05724470b6fff1f5209c92c42e8648af0b
-DIST xbattbar_1.4.3.orig.tar.gz 15722 BLAKE2B 85a6dbce98ec0109360881763fdf57501e0db21ab2d614b583996d2164c0d8aed94f3e20968cb6c91cf34a7181c66efe94a6e6f32007f6dc26dd94c163bb9d46 SHA512 1c809de998cae1dd4652b20d5c8fecf8f674910893fd458115beae8f873452a82c276afeef9b1ce3293498e372a74add190dc6a447ef0de219df98c5c36fae32
 DIST xbattbar_1.4.8.orig.tar.gz 16254 BLAKE2B 3e2215bcee10f140a078266e128ae17185e5900090b057e845f966098c69371ab5115d3cdc620a87e27e2dd223a83ab33e5fef55119cdbac68491c0e88e63585 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191
-EBUILD xbattbar-1.4.3.ebuild 902 BLAKE2B 7c00dd2d955179f5d6c64eb973e839edffb9d85e0b15f3b142aa6857fa2b733115d7f123a9db1d859270daa5ba0e20ae65f49020d3031e19e76ee179b8023efb SHA512 34696dc48ee16955280f979adf447e1622c2436d230852a6bf9021e1e4d98ec978025d273d482079a11de2f996e3690f03af68777ff54113345957ac88c866f2
-EBUILD xbattbar-1.4.8.ebuild 1086 BLAKE2B 44a2366a1d20de10b4da868033e9dd7b493d732afe13a5d22d95ecfbe17048d745d0c663b718fea4589e2ed0594b7b99cc9427cd04bcda08e9ad041b9b6a59ee SHA512 1bc10247f586ac957127a831027de6ea2116dee702aaec642458a02e958df5c0e11360616f4128330244d0e6561af5e36f9171117e51737f562fcb322de3078f
+EBUILD xbattbar-1.4.8.ebuild 1085 BLAKE2B e546287ae2c16206eb9ba5d81ad0950ff82b8cfca610c9ede4b6e511be31cf38cce352bb0d0846f58e06a89e7ef628f90f8ffa1f15c2304241b52258a956f1cd SHA512 f2447d4f3bd865106114fc467828dab08c0940e3de7cc465af046dc203f02f4d2373e97609978d68c741cffd91d9657e34f13c4323abfe9a6ca6979d5661b4de
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch b/x11-misc/xbattbar/files/xbattbar-1.4.3.patch
deleted file mode 100644
index ad5b9e49c1fa..000000000000
--- a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -8,16 +8,16 @@
- all: $(TARGET) $(APM_CHECK)
- 
- $(TARGET): obj/xbattbar.o
--	gcc -o $@ $< -lX11
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lX11
- 
- obj/xbattbar.o: xbattbar.c obj/stamp
--	gcc -MMD -o $@ -c $<
-+	$(CC) $(CFLAGS) -MMD -o $@ -c $<
- 
- $(APM_CHECK): obj/xbattbar-check-apm.o
--	gcc -o $@ $<
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
- 
- obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp
--	gcc -MMD -D$(OS_TYPE) -o $@ -c $<
-+	$(CC) $(CFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
- 
- obj/stamp:
- 	mkdir obj
-@@ -29,11 +29,11 @@
- 
- 
- install: $(TARGET) $(APM_CHECK)
--	install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT)
-+	install -d -m 0755 $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)
- 	install -d -m 0755 $(DESTDIR)/usr/bin
- 	install -d -m 0755 $(DESTDIR)/usr/share/man/man1
--	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/
--	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/
-+	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/
-+	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/
- 	install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/
- 	install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 
- 
diff --git a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
deleted file mode 100644
index 50b76944e6f3..000000000000
--- a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Advanced Power Management battery status display for X"
-HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	x11-libs/libX11"
-RDEPEND="${DEPEND}
-	!ppc? ( >=sys-power/acpi-1.5 )" # ppc has APM
-
-# XXX: Avoiding imake in purpose here.
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-
-	sed -i \
-		-e "s:usr/lib:usr/$(get_libdir):" \
-		xbattbar.c || die
-}
-
-src_compile() {
-	[[ $(tc-arch) == amd64 ]] && export LIB_SUFFIX=64
-	tc-export CC
-	use kernel_linux && append-flags -Dlinux
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
index 8e044840e00e..07f440b75dcb 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index 916c0934e34e..4233714fa08d 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,3 +1,4 @@
+AUX xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch 1747 BLAKE2B 0b638c7884cac5684e85070342e24ffc310645372290b50c3e7c92b536db1c64d2cc2642e353ca88dbd2ebee86898c7f2e6586cf6ea2233c452cfacc37161491 SHA512 119f56f8afb4f8eaa2f739ef06aff06747fedd9036da9a70a57f8e13410d540532378841e9b7c54de1d7e6941cc254ad6927d0f4b83f330623a088866cbd6b5a
 DIST xfe-1.42.tar.gz 2727833 BLAKE2B fbca14c77b04cb367173907dd4ae9c210cd88768276e5b7391338b29dc988288f866419f57d1189db6235941e4e2f91608835351000a42d46ed3e7c4c236c69f SHA512 858dd761e45ff09d32d2a230304be0817eab4b6a772376b08d778bb8e1eef681228e5d88e53c441f9b8722d8b7eeae96980e30f8c5e8bb603d4d9a3b3d267351
-EBUILD xfe-1.42.ebuild 1501 BLAKE2B 762aae1813d757093b1262edabdcf952f6be3d3e217ccb17bab63fa574c4762c20549c1e369fcfb71e59543ff29d7309ce42e08d4a1ee723b5ecbbbcb822f5c9 SHA512 9dfe2f4abf6e1a1b2d04e0d4feee6890b9f2fca96a7ab7332c68449568eb135a2a1b2442e82ab38a3fb17e040a3a5133b9c614a41b2f4a1a4c31a5bacbd9add5
+EBUILD xfe-1.42.ebuild 1602 BLAKE2B 9b2e59f05bf959868b6be3fbc4d819095b153baf87a9bc57fac2bedf2c80ebafe5704f815bdc4a692ad941f96ba67070be42b28c80438814527a8d896f2a21df SHA512 a87c6c76316e9e7f49799b29bb1562c2fc7dafb6688d5e87dbee28de19af542fae385e80eaed4b9d16d842eab93ff797c76a5dc7e5f717603bfa58352416441c
 MISC metadata.xml 349 BLAKE2B 1f855ee2a581396591ea01b3b1d00fe0dba88e564d38186f738d797eb50554593c2d2bf396f8a616329855ebe829b1da5461705965e252b2994545353e26f475 SHA512 08958aec505d6e35611988ed33f184112fecea69197b2f2e5d784d2db216a0b643d27c6ac24ca265fd89d612b67586925d6b768bdf86aa0060919c96ecda48cb
diff --git a/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch b/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch
new file mode 100644
index 000000000000..1394f59abc2c
--- /dev/null
+++ b/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch
@@ -0,0 +1,57 @@
+--- xfe-1.42/configure.ac
++++ xfe-1.42/configure.ac
+@@ -29,6 +29,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
++PKG_PROG_PKG_CONFIG
+ 
+ 
+ # Internationalization
+@@ -109,16 +110,13 @@
+ 	
+ 	echo "checking whether FOX was compiled with Xft support... yes"
+ 
+-	# Check for FreeType2 headers
+-	freetype_config=''
+-	AC_CHECK_PROGS(freetype_config,freetype-config,)
+-	if test -n "$freetype_config"; then
+-	  freetype_cflags=`$freetype_config --cflags`
+-	  freetype_libs=`$freetype_config --libs`
+-	  LIBS="$LIBS $freetype_libs"
+-	  CPPFLAGS="$freetype_cflags $CPPFLAGS"
+-	fi
+-	AC_CHECK_HEADER(config/ftheader.h,,[AC_CHECK_HEADER(freetype/config/ftheader.h,,AC_MSG_ERROR("ftheader.h not found"))])
++	# Check for FreeType2
++	PKG_CHECK_MODULES(FREETYPE, freetype2, [
++		freetype_cflags="$FREETYPE_CFLAGS"
++		freetype_libs="$FREETYPE_LIBS"
++		LIBS="$LIBS $freetype_libs"
++		CPPFLAGS="$freetype_cflags $CPPFLAGS"
++	], AC_MSG_ERROR("freetype not found"))
+ 
+ 	# Check for Xft headers
+ 	xft_config=''
+@@ -131,15 +129,13 @@
+ 	  CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
+ 	else
+ 		# On some systems (e.g. Fedora) xft-config is deprecated and pkg-config should be used instead
+-		pkg_config=''
+-		AC_CHECK_PROGS(pkg_config,pkg-config,)
+-		if test -n "$pkg_config"; then
+-		  xft_cflags=`$pkg_config --cflags xft`
+-		  xft_libs=`$pkg_config --libs xft`
+-		  LIBS="$LIBS $xft_libs"
+-		  CPPFLAGS="$xft_cflags $CPPFLAGS"
+-		  CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
+-		fi
++		PKG_CHECK_MODULES(XFT, xft, [
++			xft_cflags="$XFT_CFLAGS"
++			xft_libs="$XFT_LIBS"
++			LIBS="$LIBS $xft_libs"
++			CPPFLAGS="$xft_cflags $CPPFLAGS"
++			CXXFLAGS="$CXXFLAGS -DHAVE_XFT_H"
++		], AC_MSG_ERROR("Xft not found"))
+ 	fi
+ 	AC_CHECK_HEADER(X11/Xft/Xft.h,,AC_MSG_ERROR("Xft.h not found"))
+ 
diff --git a/x11-misc/xfe/xfe-1.42.ebuild b/x11-misc/xfe/xfe-1.42.ebuild
index df2bd089efc3..dd6e5a79a2de 100644
--- a/x11-misc/xfe/xfe-1.42.ebuild
+++ b/x11-misc/xfe/xfe-1.42.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
@@ -36,6 +36,8 @@ DEPEND="
 
 DOCS=( AUTHORS BUGS ChangeLog README TODO )
 
+PATCHES=( "${FILESDIR}/${PN}-1.42-use_pkgconfig_for_freetype_and_xft.patch" )
+
 src_prepare() {
 	default
 
@@ -62,15 +64,15 @@ src_prepare() {
 		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
 		configure.ac || die
 
-	eapply_user
-
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable startup-notification sn) \
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable startup-notification sn)
 		--enable-minimalflags
+	)
+	econf "${myeconfargs[@]}"
 }
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index 7e7bbc6cde77..492789bfaf27 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -1,3 +1,3 @@
 DIST xflux-gui-1.1.10.tar.gz 18828 BLAKE2B a249533ace4ff6293ff9b99a455943c1f099628bec97c2730473f8a9550ba38e78e775a10a0f77c160180f5f5d354ac8c8ac924c1a2eb9f48861491583c93285 SHA512 5e8057e47fe2cc8a59758e9ab6b3adc6a8281b42f6b517e3e1327e5470c82a326c853d5d389fd62f6d6c439be4ab70a6c8771ece87e5b8c90a33775f8b7cd54d
-EBUILD xflux-gui-1.1.10.ebuild 851 BLAKE2B ae12ae2e1a0e5c837112dc7087af23dc8bbf7f0f0ceb4d65c3bf99137a1503acbaf6c935e0e3304eb989ac0668df275e36a46579e08954078dc796edeb3019b7 SHA512 5f34660fe85e0a916cd05ef39034a89ef116b91cd0bd335f78a0c2f0caf081d673c8faf1972816a579a91140f3ae4fbbc9c57d9986c9f29ec0b6ae25d5a7dbed
+EBUILD xflux-gui-1.1.10.ebuild 850 BLAKE2B dbffba8824bd5afb7a743b902fb549bf692285e1350f2b128fdc6cd9641c73ce5059842569d67d1feb99dda8554e911b76da48d21a30b292593296606416de97 SHA512 5333d53788145b32e13bdbf92ff52fb6e2cd1a3ee80d3a3450e8fd52ffced4380132dee758ea005ea57f71c76a01482902c7e9f6948316c46026e744b7495b7f
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/x11-misc/xflux-gui/xflux-gui-1.1.10.ebuild b/x11-misc/xflux-gui/xflux-gui-1.1.10.ebuild
index af40017b69c0..b3557c1eb8a1 100644
--- a/x11-misc/xflux-gui/xflux-gui-1.1.10.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-1.1.10.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A GUI for f.lux"
 HOMEPAGE="https://justgetflux.com/"
 SRC_URI="https://github.com/xflux-gui/fluxgui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/x11-misc/xflux/Manifest b/x11-misc/xflux/Manifest
index 4b19b543ec61..5c90d5dd1f0e 100644
--- a/x11-misc/xflux/Manifest
+++ b/x11-misc/xflux/Manifest
@@ -1,4 +1,4 @@
 DIST xflux-20130927.tar.gz 335911 BLAKE2B 56e683a6969f129c7dcdfd4b13a23523ca5ce3d19feae947a654ca02437e372bd998a71048d00c5b7bf653eb9fa57c696b8d5bb1b3dfd75a0b17e9213368c1bd SHA512 c35003b9cc6bc95f6ce98efc2e69ea94c99ed31671ec5d1f5919294edd7e504d23aa1df29ec0f1d1c68c4ceafbcd386e1207ef4c9957d7a5079ce96c2ac6d924
 DIST xflux64-20130927.tar.gz 339845 BLAKE2B 15751b75b7c0603044c4e7e98a9b23ceab7e245b12833ed1b6e8bc1d1734c5838777b7561d035bdf6d6d781105cc48dbda6c262895c310cf9710529a088b0a97 SHA512 6204558b8fa1063ee19fe444f740ab4ddfdbc412459b2f5cea94ddbf11818e0c9bff7e066a4958c1ab5c160b1aedcd18fa7fc4cd800a67c5d51ad1206f203e52
-EBUILD xflux-20130927.ebuild 653 BLAKE2B 3e21f3a51af67572b555d9f54e5667078cc8b984c8dc42e51fe9c793091d6582c3216d8c759196fe0308792fe7f101f059ca82e39744c5d0d6defa3a0b7bb6ce SHA512 0f1ed2101461666853302e74d7123d4a0aaf47b01ee60b27da3239c01506e70c3acb871784961aa6ddd7fc7e981f88b0cc97af6d05c2aedfb0201476c4e7a52f
+EBUILD xflux-20130927.ebuild 652 BLAKE2B b0d542127d818f4f99e7f8cdd4dfb8a4dcfa06bb1a5abfd9972c5ed900d4b744cb229246a945fd296a2dc85ac9985be88768226057cb7221e41a5d0e8cb053cf SHA512 25ea901e469797293fcee0db63a415efa6f156c574f2174def009c71e91e9d36cf0560b37c21cc5d814ddf9a71b1a4ee2c124967209e38ad5a25fe4c0dcd73bd
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/x11-misc/xflux/xflux-20130927.ebuild b/x11-misc/xflux/xflux-20130927.ebuild
index 8abc561dc3de..39d471769061 100644
--- a/x11-misc/xflux/xflux-20130927.ebuild
+++ b/x11-misc/xflux/xflux-20130927.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://justgetflux.com/"
 SRC_URI="amd64? ( https://justgetflux.com/linux/${PN}64.tgz -> ${PN}64-${PV}.tar.gz )
 	x86? ( https://justgetflux.com/linux/${PN}-pre.tgz -> ${P}.tar.gz )"
 
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="f.lux"
 SLOT="0"
 
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 8aa272c99310..87fab96e601f 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 8f056d5c8abb..6ecbc81d2bc6 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,7 +1,3 @@
-DIST ctwm-3.7.tar.gz 1139461 BLAKE2B 7c96f6434dea660dcbcc017b89bb9df533b6b26688392ba7baf14b4b701d093f8ff4e0c0c3af61bd5ea32d0b88b336d6958e1d4f524de1cb4d4577e20cfe3380 SHA512 e3c1e4bed68ffbf3efbc6057743889d706ed16e74bd334ebb689c8283f1288778dc368f0a6064aa7e24a6416592f22d1eeffc09c76cb0cd4ea64467718c62cfd
-DIST ctwm-3.8.2.tar.xz 549984 BLAKE2B 90b1d7c872e2ca8960853829d9ad5b19476ca8cdbcda9d3fcb180787aa85ff13b3d63e6c6d19e38193d71c2175c939d65d9581ce2629314c78dc0a56bf8cb139 SHA512 4633b7bf7b8528ecfd2a753f443fd5286fd394df37ebe885138d30a498f0d721076835d135974a2bd11ca9c32ffd288f84788cb0407ae346a29c5f6371dca497
 DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7 SHA512 8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6
-EBUILD ctwm-3.7.ebuild 1212 BLAKE2B 8c4d63738ac7b5c179e4870d44ba1afb9bfc6d63e993a3c00c17cb3fea1b11851b8733dc20f66ea0d88e6f251c92b1085e98464bc813cafd9ad4c66a767a72a5 SHA512 03c706d0d6a8678e6a781ea260bb4faa49399b6e74df46d3b7bb56d810099fbf3a09ac05c1356dbe762c119d7b06873a06e91f3411d2cd7d9094158eb2b8e9e6
-EBUILD ctwm-3.8.2.ebuild 1546 BLAKE2B 037631059eb8ef42eb50d70359574a57e23c17f1a4fe40a2fb1327a50b0c5e6a4c596cdb0da73136958dac726b6c5bc2d20d2c524f0791c76e24b0f33089051d SHA512 4bdc01a3290cc7293d9c38acbb0c2d6dad77b18d6b57c0b72844fe304c42bb5025af98d7e7ce49187079c4f6ec45d3175f12b7b0921ef73bfebe61057fca00d1
-EBUILD ctwm-4.0.1.ebuild 900 BLAKE2B 3f3c744060c15fd226d657d87ee8ca0d85a68d044526a59894aa72ad7cb56b8d455e61500e3ecfbfbe1abfb24beedd886f23992843c515380d8d787704f622fc SHA512 6d49ea92d4490956bc9b6d5ecb1afe6e6097b44b04cecfb844160fb802ce855b381ba9a93430eb9ac2d099a42ac6fb2b9d5e95e907168a63c5c4d31967738c91
+EBUILD ctwm-4.0.1.ebuild 899 BLAKE2B 1fbb14215e8b31096c81fec17b3be053f375f65e43dba22ad9568f2d42f4dfb80f9043ced5cd81b2569f15a2b82e8384e0d0c84f946e96ba9aea403974fdcb1c SHA512 6e93d0b57ea19d2a7cfa329f8dbf75d5d6747f2c63c3bcfeb1f06692d935fefcc6ef0d1cfe3c6e4efc0438dd52a458eb56c85e5703721362bc2ffee5cbe659b5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/ctwm/ctwm-3.7.ebuild b/x11-wm/ctwm/ctwm-3.7.ebuild
deleted file mode 100644
index a558de71004b..000000000000
--- a/x11-wm/ctwm/ctwm-3.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="A clean, light window manager"
-HOMEPAGE="http://ctwm.free.lp.se/"
-SRC_URI="http://ctwm.free.lp.se/dist/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	app-text/rman
-	virtual/jpeg
-	x11-misc/imake
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-src_compile() {
-	sed -i -e "s@\(CONFDIR =\).*@\1 /etc/X11/twm@g" Imakefile \
-		|| die "sed failed"
-
-	cp Imakefile.local-template Imakefile.local
-
-	xmkmf || die "xmkmf failed"
-	make TWMDIR=/usr/share/${PN} || die "make failed"
-}
-
-src_install() {
-	make BINDIR=/usr/bin \
-		MANPATH=/usr/share/man \
-		TWMDIR=/usr/share/${PN} \
-		DESTDIR="${D}" install || die "make install failed"
-
-	make MANPATH=/usr/share/man \
-		DOCHTMLDIR=/usr/share/doc/${PF}/html \
-		DESTDIR="${D}" install.man || die "make install.man failed"
-
-	echo "#!/bin/sh" > ${T}/ctwm
-	echo "/usr/bin/ctwm" >> ${T}/ctwm
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/ctwm
-
-	dodoc CHANGES README* TODO* PROBLEMS
-	dodoc *.ctwmrc*
-}
diff --git a/x11-wm/ctwm/ctwm-3.8.2.ebuild b/x11-wm/ctwm/ctwm-3.8.2.ebuild
deleted file mode 100644
index 050ce634b582..000000000000
--- a/x11-wm/ctwm/ctwm-3.8.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A clean, light window manager"
-HOMEPAGE="http://ctwm.org/"
-SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	app-text/rman
-	virtual/jpeg
-	x11-misc/imake
-	x11-proto/xextproto
-	x11-proto/xproto
-"
-
-src_prepare() {
-	# overflow bug 338180
-	sed -i menus.c -e "/char modStr/ s/5/6/" || die
-
-	# implicit 'isspace'
-	sed -i parse.c -e "/<stdio.h>/ a#include <ctype.h>" || die
-
-	sed -i Imakefile -e "/^CONFDIR/s@=.*@= /etc/X11/twm@g" || die
-
-	cp Imakefile.local-template Imakefile.local
-
-	# TODO: Add GNOME support
-	sed -i Imakefile.local -e '/^#define GNOME/d' || die
-}
-
-src_configure() {
-	append-cppflags -DXPM -DJPEG
-	xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		TWMDIR=/usr/share/${PN}
-}
-
-src_install() {
-	emake BINDIR=/usr/bin \
-		MANPATH=/usr/share/man \
-		TWMDIR=/usr/share/${PN} \
-		DESTDIR="${D}" install
-
-	emake MANPATH=/usr/share/man \
-		DOCHTMLDIR=/usr/share/doc/${PF}/html \
-		DESTDIR="${D}" install.man
-
-	echo "#!/bin/sh" > ${T}/ctwm
-	echo "/usr/bin/ctwm" >> ${T}/ctwm
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/ctwm
-
-	dodoc CHANGES README* TODO* PROBLEMS
-	dodoc *.ctwmrc*
-}
diff --git a/x11-wm/ctwm/ctwm-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.1.ebuild
index f95c140b4236..ecd97a4a914c 100644
--- a/x11-wm/ctwm/ctwm-4.0.1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 RDEPEND="
 	x11-libs/libICE
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index f17d542bc5d2..cdd2fd0edf56 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -6,8 +6,8 @@ DIST enlightenment-0.20.6.tar.xz 25030572 BLAKE2B 7ce9b89ec56a741e81bb6ebae690c8
 DIST enlightenment-0.21.7.tar.xz 25307500 BLAKE2B 54b0bb7f76390d46f7eec40aecafb1b8769ba659acaffe8ade61ef9cd6fcb28d843bc185a3cc6c478fa30f917946d331569a394132c3351215a3d1d051d7d2ac SHA512 9d10116990f83b6a2f066b81fab08a9b49779df22d92b5823bf579d786a3f4602094cf8c4d08b3e23a1cfc0cd7032004b2e389e234a189fb2479d23287bf1277
 EBUILD enlightenment-0.16.9999.ebuild 1841 BLAKE2B 5b10dd80c94ffb9f55ba6211a6c2f214130eae27683382b17bb378943ae40b6c43ab698581c8c96ea8e35aad0b52f4106cca4b262d396da177f440a5e1d696a4 SHA512 e9684440ba5876d0acad750f7f4b9a3dfb3fb77dea17b2963ec623e143f67f049b309e1b4806c19c25eefbfccc282302910673bbd6b7af9c3da425f122887a75
 EBUILD enlightenment-0.17.9999.ebuild 3227 BLAKE2B c37c736f8bc4d681f044a36a355fd5e1ec463b4d6f771d0cf4b32f43b5a5fc682d96291d9c767a6f2920e5b6b3e33a34fbecdfd8521933652e92bcea1f384cf4 SHA512 5eb72120a2448a82bea63ae5a3c817d9474648931564e95d883bada8eef5471e20602a36bbba33a5df84f28d40ab3d5f8d8ea8a9b00ee160f00beda8ebfe0c46
-EBUILD enlightenment-0.20.5.ebuild 3258 BLAKE2B a2b3161215d338a21c8fb7eddc7d06397328157981c68159e2f838aaab7c071b86337974d76452006526a91ee07e9f3094a3ad909e7adb32331ad6ff5d51489f SHA512 00c3c7d77a2a09e4c719e93b8c1a58d720a157a5cf14f4360f21cb1ac80cb082a0d75cdff64dc3347afaa3fcde7d76b61245b4d707e458d3cbdd326147529d8c
-EBUILD enlightenment-0.20.6.ebuild 3261 BLAKE2B 058d1d18523add195a322ab3835fd468187e05d1985f07262a1679b6456bb55b673a2fc201546a601de8d0e7dd911d2d927df812ae25a0b1722e657b97bf754d SHA512 f172b95540799ee1f098fd4ccff6b3ec8a356c2f31aa8ecee62d3eed2928b5141195c9839e2e36fd8ec66cc16287bb577ea8ac2cef2c48df9c46e38e00105b25
+EBUILD enlightenment-0.20.5.ebuild 3582 BLAKE2B d8ca7622c40b90e7eb1326ea5ae6a4a78e71bc7f4de1473403521bedad35e303a8aee37a6e78e498e571b35eca208dca993ef781e018ce862887f6b151fb26be SHA512 af054b708d87e08123888867041eccef68921220650ead5003fa097fecc252a25aa5c26959fb7a1d7af7e257b84291cb44f9183d523569c4548b32a5998df5f7
+EBUILD enlightenment-0.20.6.ebuild 3585 BLAKE2B cebdabb24670587ebb5c5ae96d41c6ba3bf50e9b1737336cfd9f5c397571eb41ae9f63f8c8c96bf85d429230561f3db8167c03b231bcf357a679db960e9c0fef SHA512 4e794929e1792decd901e0ce8f14d51aaca4ee045be3e34df108314e3b48ee620bc3c9efc45729e5a9d4af20c34a8c6ccc51aca424e0627e8f587b61e1744f81
 EBUILD enlightenment-0.21.7.ebuild 3551 BLAKE2B 2888568499c2906ca84924c0d78444e3d9c47370f36eb85355a4b4370fe5abc4bf2f720057489a9973e93c296c5ebe632b104a5db0d69e0355b6c838abd726f7 SHA512 5b5a52d62b9bd68520818e6f225a92cb133ee3ff068a07618e73e01c0f2d25c2bf7af443d1df47d4dc0ef82e614dc26cd5d7e72056a590ad89eb6ca8c553b549
 EBUILD enlightenment-1.0.17.ebuild 1831 BLAKE2B 8cab55f842085e212d695ba8513416eb4d8280be4a0292fa5073f109b33db90bb1a9759dce5f6c889271fda7c9078f516f108ee21d9cd6adc130ea23780f900e SHA512 37308359aec83a4f7b8640646f24263805f1306e9d1b4d8e8dc0f94990bbbe670298711d611f5a30d798bd69c10b3ead951b4b233b3b39dcbfb4fc9e98e831aa
 MISC metadata.xml 7104 BLAKE2B 26bd0a360fe1e49b3f3a4c7e053618d6c431c71fe69221808ee90901691919b3761a27351c65b6ac957ad2dd2ca9358dd43804a676d44c0e2a95819eba729f79 SHA512 7a8432fe55f9afdba600a8ced6e3f761994cda8c0c217278f5600f06aabdacebbda4984505f0b093c6aea4afaf21b56cb69b0202489ddfaeafd216c751868d34
diff --git a/x11-wm/enlightenment/enlightenment-0.20.5.ebuild b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
index 88a5cec9394c..9d9e764576ef 100644
--- a/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ else
 	EKEY_STATE="snap"
 fi
 
-inherit enlightenment
+inherit enlightenment xdg-utils
 
 DESCRIPTION="Enlightenment DR17 window manager"
 
@@ -57,7 +57,10 @@ RDEPEND="
 	>=dev-libs/efl-1.17[X]
 	>=media-libs/elementary-1.17
 	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	sys-devel/automake:1.15
+"
 
 S=${WORKDIR}/${MY_P}
 
@@ -91,7 +94,9 @@ check_modules() {
 }
 
 src_configure() {
-	check_modules
+	# sanity check fails after commit e25cf18ca19463a7d05519aa843cc76a189ab75c
+	# see #648896. Can be restored with future release
+	# check_modules
 
 	E_ECONF=(
 		--disable-install-sysactions
@@ -125,3 +130,13 @@ src_install() {
 	insinto /etc/enlightenment
 	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-wm/enlightenment/enlightenment-0.20.6.ebuild b/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
index 0cd5bfe72614..130c64f8a4c3 100644
--- a/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.20.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"
@@ -13,7 +13,7 @@ else
 	EKEY_STATE="snap"
 fi
 
-inherit enlightenment
+inherit enlightenment xdg-utils
 
 DESCRIPTION="Enlightenment DR17 window manager"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
@@ -57,7 +57,10 @@ RDEPEND="
 	>=dev-libs/efl-1.17[X]
 	>=media-libs/elementary-1.17
 	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	sys-devel/automake:1.15
+"
 
 S=${WORKDIR}/${MY_P}
 
@@ -91,7 +94,9 @@ check_modules() {
 }
 
 src_configure() {
-	check_modules
+	# sanity check fails after commit e25cf18ca19463a7d05519aa843cc76a189ab75c
+	# see #648896. Can be restored with future release
+	# check_modules
 
 	E_ECONF=(
 		--disable-install-sysactions
@@ -125,3 +130,13 @@ src_install() {
 	insinto /etc/enlightenment
 	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
new file mode 100644
index 000000000000..c8808217dd10
--- /dev/null
+++ b/x11-wm/i3-gaps/Manifest
@@ -0,0 +1,4 @@
+AUX i3-gaps-4.15-musl.patch 2473 BLAKE2B acb148b7a7f14f7e75523ade9ae4374d6b18d3397f97d6b639f416f86abfd114bddd97fab19a61385fff5504bcd0f614c53175da4c30cf31e00f6b612dfb3d0d SHA512 8ce7d00371c43b93dabbe0dadf9caf7c58a68f4a0079f5a9b9552c15c55bfa0df16d7e87a281595af2ac5254632ba28ccf82a467cea16159b41490f6f2910299
+DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b SHA512 76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
+EBUILD i3-gaps-4.15.0.1.ebuild 1753 BLAKE2B 95f3e06c6fb70ef53d902f47711500ab1a759b3e0a1b0e5dd57cd35457c4e122280ed0d8f15a3ab3dfb6e42464ada71b5febb5c0c84d7ad266ca8aa175670f57 SHA512 5e7db76be9088f77fd26a3114d38a7ab80b163d5678a99f2252e1d3a170f9bad7d334312c7147e336b061deb2435fe66cb7131b8f917041fbc73f86ded1b1d0e
+MISC metadata.xml 322 BLAKE2B bdba5a4519158f97944784fc4e2813c1b8e8d4f6f90d43b3a935e8b2565ecc5d2444c4b7b4d11266263d25a76b5c2dba55ec6535fdaab03129bb022206abbce2 SHA512 d3ca96f88473d21b81c420795c6eee5dd41f43354de85fd549a9ae8127e46f10d00034730bf850ddd6df8607821d30fce17aa349b1b2575f43fd3303a2da1cf6
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch b/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
new file mode 100644
index 000000000000..82ad6195b8e5
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
@@ -0,0 +1,73 @@
+diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c
+--- i3-4.11/i3bar/src/main.c	2015-09-30 07:55:10.000000000 +0100
++++ i3-4.11.new/i3bar/src/main.c	2016-02-08 20:03:41.777392482 +0000
+@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
+  *
+  */
+ char *expand_path(char *path) {
+-    static glob_t globbuf;
+-    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
+-        ELOG("glob() failed\n");
+-        exit(EXIT_FAILURE);
++    char *home, *expanded;
++
++    if (strncmp(path, "~/", 2) == 0) {
++        home = getenv("HOME");
++        if (home != NULL) {
++            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
++            expanded = scalloc(strlen(home)+strlen(path), 1);
++            strcpy(expanded, home);
++            strcat(expanded, path+1);
++            return expanded;
++        }
+     }
+-    char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+-    globfree(&globbuf);
+-    return result;
++
++    return sstrdup(path);
+ }
+ 
+ void print_usage(char *elf_name) {
+diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
+--- i3-4.11/libi3/resolve_tilde.c	2015-09-30 07:55:10.000000000 +0100
++++ i3-4.11.new/libi3/resolve_tilde.c	2016-02-08 20:03:47.849230953 +0000
+@@ -19,27 +19,18 @@
+  *
+  */
+ char *resolve_tilde(const char *path) {
+-    static glob_t globbuf;
+-    char *head, *tail, *result;
++    char *home, *expanded;
+ 
+-    tail = strchr(path, '/');
+-    head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+-    int res = glob(head, GLOB_TILDE, NULL, &globbuf);
+-    free(head);
+-    /* no match, or many wildcard matches are bad */
+-    if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+-        result = sstrdup(path);
+-    else if (res != 0) {
+-        err(EXIT_FAILURE, "glob() failed");
+-    } else {
+-        head = globbuf.gl_pathv[0];
+-        result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+-        strncpy(result, head, strlen(head));
+-        if (tail)
+-            strncat(result, tail, strlen(tail));
++    if (strncmp(path, "~/", 2) == 0) {
++        home = getenv("HOME");
++        if (home != NULL) {
++            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
++            expanded = scalloc(strlen(home)+strlen(path), 1);
++            strcpy(expanded, home);
++            strcat(expanded, path+1);
++            return expanded;
++        }
+     }
+-    globfree(&globbuf);
+ 
+-    return result;
++    return sstrdup(path);
+ }
diff --git a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
new file mode 100644
index 000000000000..54936b5b78b8
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eapi7-ver
+
+DESCRIPTION="i3 fork with gaps and some more features"
+HOMEPAGE="https://github.com/Airblader/i3"
+SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/libev
+	dev-libs/libpcre
+	dev-libs/yajl
+	x11-libs/cairo[X,xcb]
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS
+	!x11-wm/i3
+"
+
+S=${WORKDIR}/i3-${PV}
+
+DOCS=( RELEASE-NOTES-$(ver_cut 1-2) )
+
+PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" )
+
+src_prepare() {
+	default
+	sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
+	eautoreconf
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+}
+
+src_configure() {
+	# disable sanitizer: otherwise injects -O0 -g
+	local myeconfargs=(
+		--enable-debug=no
+		--disable-sanitizers
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake -C "${CBUILD}"
+}
+
+src_install() {
+	emake -C "${CBUILD}" DESTDIR="${D}" install
+	einstalldocs
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+	einfo "There are several packages that you may find useful with ${PN} and"
+	einfo "their usage is suggested by the upstream maintainers, namely:"
+	einfo "  x11-misc/dmenu"
+	einfo "  x11-misc/i3lock"
+	einfo "  x11-misc/i3status"
+	einfo "Please refer to their description for additional info."
+}
diff --git a/x11-wm/i3-gaps/metadata.xml b/x11-wm/i3-gaps/metadata.xml
new file mode 100644
index 000000000000..1a5dfaf1b54d
--- /dev/null
+++ b/x11-wm/i3-gaps/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Airblader/i3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 1556baa8d545..60efb3adaa85 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index 25299969c3e3..bdb506534c5b 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-sensors-plugin-1.2.6.tar.bz2 454524 BLAKE2B 1dc663f726f6079fc030ef08fc9384fd4ccf3b05786bb899c7028d9adb66d85e3da4d9aed5a29cc5b15c0bb258538fdca31cd2a9430710c1e0a383f8eb8d2353 SHA512 5c520f1c253df1bb9e29855c5ccfc1536034945ca68b43cd8b6d97083e528b2430230d9c51d43953a71c3f0171ae718bf1557714729b1343ebd51f91f3f36d60
 DIST xfce4-sensors-plugin-1.2.98.tar.bz2 477241 BLAKE2B dcb757e7014a159fbba77a24248a0663207aa0031a624d60c899483b608f729e31dafdd2de4e5d6a64122a2abbaa21eaa857afdbfa266203b0639ced7f299d4a SHA512 6437acc17d2719e3deef011c206c8c5593f4b14a8263e82bb3b0e8b1cb7e17e842adf2cb3a479e1a8e2729db744df2778ee04bc9af5e4c918f417e1c8ac4d17e
+DIST xfce4-sensors-plugin-1.3.0.tar.bz2 466468 BLAKE2B 52eadaec22980105fcf4c4e5efb4621b0966e86520e7ded90a1514f7925d76232278ec105785409dbe13f5ab4019363b47b63b5df642319a924fe5a8882b847c SHA512 77f6df354c883f9f0b99856738e0976e7bddd5f16c90a8715777c4f4d6debe116cdc21c2e0efbbe9f371d36f9469797d3e631854c33f8561e3ff32291cdef35a
 EBUILD xfce4-sensors-plugin-1.2.6.ebuild 1863 BLAKE2B db1313175b658c66d6155510f1fa892bb7fc00ee2f736a030d0993a19824c2c6a20d311afee8a618bda0bd5fcbd1b23a7f7c4b97dbc37f4c92776d2c28e3df5c SHA512 9656af8b47c27dbd9021448778fd89e912603f8c8f0237c4cadd3ce611821a90a51dc3605db009949a444543f3d411cd8c950b98baab7f15fd7dcd06d2203745
 EBUILD xfce4-sensors-plugin-1.2.98.ebuild 1450 BLAKE2B aa20ae9de9183d0b9347678bb6a9c253d55174c1f19d782d185010ccd0cbef681c11d161de7e9c00a3c399ccb30079a6c82a25a6408c68968e3b3f6a80ac9160 SHA512 186e8d998f456ee72c93416d75d5c4ad9fbd0fb236d0a0c1be9963579238cf2b872e61f4d99a1d875a9add2daf0bbf439c84df076137d7731e2e00f294eee294
+EBUILD xfce4-sensors-plugin-1.3.0.ebuild 1563 BLAKE2B 556d4ef2d94d7ca9e392dbd5ce3e8cf06da50c90c9def3a5b9c584b162f2121d8b817a321fd48fe19754ab60dcfa609b5d5260b4ddfdfbcd9b7fd6667cfd7db2 SHA512 eedfecc63688f16b452a016b18b3d16d1645a5b9759c60f5a670dbabf35aea6aa4aef0efa258b2b74dac51b0c36e13702c04838e91836dc1b7ced61732f1d412
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild
new file mode 100644
index 000000000000..9c6fafa0d3f9
--- /dev/null
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A panel plug-in for acpi, lm_sensors and hddtemp sensors"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+acpi hddtemp libnotify lm_sensors video_cards_nvidia"
+
+REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
+
+RDEPEND=">=x11-libs/gtk+-3.20:3=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/xfce4-panel-4.12:=
+	hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
+	video_cards_nvidia? (
+		|| (
+			x11-drivers/nvidia-drivers[tools,static-libs]
+			media-video/nvidia-settings
+			)
+	)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NOTES README TODO )
+
+src_configure() {
+	local myconf=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable lm_sensors libsensors)
+		$(use_enable hddtemp)
+		$(use_enable hddtemp netcat)
+		$(use_enable acpi procacpi)
+		$(use_enable acpi sysfsacpi)
+		$(use_enable video_cards_nvidia xnvctrl)
+		$(use_enable libnotify notification)
+		--disable-pathchecks
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-05-11 16:02:49 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-05-11 16:02:49 +0100
commit	88ebe56470c37b02a044e1091cad6b2df0f3be8f (patch)
tree	d80b2d9337c01c4a0fe11a2ef9691fc3153ed6d3
parent	4645b6f17f0da81e9fe84081fb126a37102ba153 (diff)